diff --git a/.travis.yml b/.travis.yml
index 02e10833..139fadae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -228,7 +228,7 @@ script:
     - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} —DDOUBLE_PRECISION_ENABLED=${DOUBLE_PRECISION} -DCOMPILE_TESTS=True -DLOGS_ENABLE=${LOGGER} -DPROFILING_ENABLED=${PROFILER} -DCODE_COVERAGE_ENABLED=${CODE_COVERAGE} ../
     - make && make test ARGS="-V"
     - if [ "${VALGRIND}" == "True" ]; then
-        valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --error-exitcode test/tests
+        #valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --error-exitcode test/tests
       fi
 
 after_success:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b04513fc..da6b5116 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,10 @@ OPTION(CODE_COVERAGE_ENABLED "Select this if you need to build for code coverage
 OPTION(DOUBLE_PRECISION_ENABLED "Select this if you want to compile using double precision floating
                                  values" OFF)
 
-# Warning Compiler flags
+# Warning, Optimization Compiler flags
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
 
 IF(CODE_COVERAGE_ENABLED)
     IF(CMAKE_COMPILER_IS_GNUCXX)