diff --git a/Makefile b/Makefile
index f79cfc5..dcfa362 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
-SRCS := source/main.cpp
-BUILD_DIR := ./build
-CXXFLAGS += -o0	-std=c++11
+CONFIG ?= release
+SRCS := source/main.cpp source/Rbm.cpp source/noise.c
+	
+	
 LIBS := -larmadillo
+BUILD_DIR := ./build/${CONFIG}
 	
 all: ${BUILD_DIR}/main.elf
-	
 
+CXXFLAGS += -std=c++11
+
+CXXFLAGS_debug := ${CXXFLAGS} -O0 -g
+CXXFLAGS_release := ${CXXFLAGS} -O2
+	
 ${BUILD_DIR}/main.elf: ${BUILD_DIR} ${SRCS}
-	g++ ${CXXFLAGS} ${SRCS} -o $@ ${LIBS}
+	g++ ${CXXFLAGS_${CONFIG}} ${SRCS} -o $@ ${LIBS}
 
 ${BUILD_DIR}:
 	mkdir -p $@