diff --git a/CMakeLists.txt b/CMakeLists.txt
index e630250..a1a8506 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,17 +47,17 @@ set(HDRS
 	"include/neocomm/node.hpp")
 
 # Define C++ compiler flags
-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wpedantic -Werror -Wfatal-errors -pedantic-errors -fno-elide-constructors")
+set(CMAKE_CXX_FLAGS "-std=c++14 -Wall -Wextra -Wpedantic -Wfatal-errors -Werror -pedantic-errors -fno-elide-constructors")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3")
 set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
 
-if(CMAKE_BUILD_TYPE STREQUAL "debug" OR CMAKE_BUILD_TYPE STREQUAL "relwithdebinfo")
-	add_definitions(-DDEBUG)
-else()
-	add_definitions(-DNDEBUG)
-endif()
+#if(CMAKE_BUILD_TYPE STREQUAL "debug" OR CMAKE_BUILD_TYPE STREQUAL "relwithdebinfo")
+	#add_definitions(-DDEBUG)
+#else()
+	#add_definitions(-DNDEBUG)
+#endif()
 
 if(WIN32)
 	add_definitions(-DWOE32)