diff --git a/Makefile b/Makefile
index 8a57c67..2d522e0 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ VPATH = $(SPATH) $(IPATH) $(DPATH) $(OPATH)
 
 # compiler and compiler flags
 CC = g++
-CFLAGS = -I$(IPATH) -pthread -lrt -std=c++11
+CFLAGS = -I$(IPATH) -std=c++11
 
 # list of object files
 SOURCES = $(wildcard $(SPATH)/*.$(STYPE))
@@ -55,7 +55,7 @@ $(DPATH) $(OPATH):
 
 # Make the executable(s)
 %.out: $(OBJECTS)
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) -o "$@" $^
 # Make the object and dependency files
 $(OPATH)/%.o: $(SPATH)/%.$(STYPE)
 	$(CC) $(CFLAGS) -MMD -MF "$(DPATH)/$(@F:.o=.d)" -o "$@" -c "$<"