diff --git a/src/Makefile b/src/Makefile
index fd101c7..f0cd401 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ CLASSOBJS=$(CLASSSRCS:.cpp=.o)
 
 INCLUDE=../include
 
-CFLAGS=-larmadillo -llapack -std=c++11
+CFLAGS=-larmadillo -llapack -std=c++11 -O2
 OPENMP=-fopenmp
 
 # Add a debug flag when compiling (For the DEBUG macro in utils.hpp)
@@ -24,7 +24,7 @@ endif
 all: test_suite main
 
 # Rules for executables
-main: main.o $(LIBOBJS)
+main: main.o $(LIBOBJS) $(CLASSOBJS)
 	$(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) -I$(INCLUDE) $(OPENMP)
 
 test_suite: test_suite.o $(LIBOBJS)
@@ -32,7 +32,7 @@ test_suite: test_suite.o $(LIBOBJS)
 
 # Rule for object files
 %.o: %.cpp
-	$(CC) -c $^ -o $@ $(DBGFLAG) -I$(INCLUDE) $(OPENMP)
+	$(CC) -c $^ -o $@ $(CFLAGS) $(DBGFLAG) -I$(INCLUDE) $(OPENMP)
 
 clean:
 	rm *.o