diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1c4491..91d0a78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,8 @@ set(LUPPP_VERSION_PATCH "1")
 
 set(LUPPP_VERSION "${LUPPP_VERSION_MAJOR}.${LUPPP_VERSION_MINOR}.${LUPPP_VERSION_PATCH}")
 
-option(BUILD_TESTS "Build test version" ON)
+option(BUILD_TESTS   "Build test version" OFF)
+option(RELEASE_BUILD "Build Release (stage use) version" ON)
 
 
 #set(CMAKE_VERBOSE_MAKEFILE on)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb22df8..8d75692 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,9 +36,10 @@ IF(BUILD_TESTS)
   ADD_DEFINITIONS(-DBUILD_TESTS)
   ADD_DEFINITIONS(-DBUILD_COVERAGE_TEST)
   
-  SET(CMAKE_CXX_FLAGS "-g -Wall -Wextra -Wno-unused-variable -fsanitize=address -fno-omit-frame-pointer -fprofile-arcs -ftest-coverage")
+  #  -fsanitize=address -fprofile-arcs -ftest-coverage
+  SET(CMAKE_CXX_FLAGS "-g -Wall -Wextra -Wno-unused-variable -fno-omit-frame-pointer ")
   SET(CMAKE_C_FLAGS "-g -Wall -Wextra -W -Wno-unused-variable -fno-omit-frame-pointer -fprofile-arcs -ftest-coverage")
-  SET(CMAKE_EXE_LINKER_FLAGS "-fprofile-arcs -ftest-coverage")
+  #SET(CMAKE_EXE_LINKER_FLAGS "-fprofile-arcs -ftest-coverage")
 ENDIF(BUILD_TESTS)
 
 IF(RELEASE_BUILD)