diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d0ff53aa1aa3e5660b28c2d1e163cced605c34d..ce1e6d94cf8b288294bfcf6fce823a6889ff40e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,65 +39,65 @@ win_visual_studio_static_deps:
 #        - call win_run_tests.bat
 #
 #
-## Latest Ubuntu with Boost and Exprtk
-## in system directories, Boost
-## installed from the official repository
-## => only dynamical linking possible
-#ubuntu_boost_system:
-#    tags:
-#        - centos7
-#
-#    image: martinbeseda/dockertest:latest
-#
-#    before_script:
-#        - rm -rf external_dependencies
-#        - git clone https://github.com/ArashPartow/exprtk.git
-#        - cp exprtk/exprtk.hpp /usr/include
-#        - export TERM=xterm
-#        - cd build_scripts/linux
-#        - export DEPENDENCIES_LINK_TYPE=shared
-#        - ./linux_gcc_build_x64_debug_system.sh
-#
-#    script:
-#        - './linux_run_tests.sh'
-#
-## Latest Ubuntu with Boost and Exprtk
-## compiled locally as submodules and
-## linked statically
-#ubuntu_boost_local_static_deps:
-#    tags:
-#        - centos7
-#
-#    image: martinbeseda/ubuntu-ci:latest
-#
-#    before_script:
-#        - cd build_scripts/linux
-#        - ./download_dependencies.sh
-#        - cd ../..
-#        - cd build_scripts/linux
-#        - export DEPENDENCIES_LINK_TYPE=static
-#        - ./linux_gcc_build_x64_debug_local.sh
-#
-#    script:
-#        - './linux_run_tests.sh'
-#
-## Latest Ubuntu with Boost and Exprtk
-## compiled locally as submodules and
-## linked dynamically
-#ubuntu_boost_local_dynamic_deps:
-#    tags:
-#        - centos7
-#
-#    image: martinbeseda/ubuntu-ci:latest
-#
-#    before_script:
-#        - cd build_scripts/linux
-#        - ./download_dependencies.sh
-#        - cd ../..
-#        - cd build_scripts/linux
-#        - export DEPENDENCIES_LINK_TYPE=shared
-#        - ./linux_gcc_build_x64_debug_local.sh
-#
-#    script:
-#        - './linux_run_tests.sh'
+# Latest Ubuntu with Boost and Exprtk
+# in system directories, Boost
+# installed from the official repository
+# => only dynamical linking possible
+ubuntu_boost_system:
+    tags:
+        - centos7
+
+    image: martinbeseda/dockertest:latest
+
+    before_script:
+        - rm -rf external_dependencies
+        - git clone https://github.com/ArashPartow/exprtk.git
+        - cp exprtk/exprtk.hpp /usr/include
+        - export TERM=xterm
+        - cd build_scripts/linux
+        - export DEPENDENCIES_LINK_TYPE=shared
+        - ./linux_gcc_build_x64_debug_system.sh
+
+    script:
+        - './linux_run_tests.sh'
+
+# Latest Ubuntu with Boost and Exprtk
+# compiled locally as submodules and
+# linked statically
+ubuntu_boost_local_static_deps:
+    tags:
+        - centos7
+
+    image: martinbeseda/ubuntu-ci:latest
+
+    before_script:
+        - cd build_scripts/linux
+        - ./download_dependencies.sh
+        - cd ../..
+        - cd build_scripts/linux
+        - export DEPENDENCIES_LINK_TYPE=static
+        - ./linux_gcc_build_x64_debug_local.sh
+
+    script:
+        - './linux_run_tests.sh'
+
+# Latest Ubuntu with Boost and Exprtk
+# compiled locally as submodules and
+# linked dynamically
+ubuntu_boost_local_dynamic_deps:
+    tags:
+        - centos7
+
+    image: martinbeseda/ubuntu-ci:latest
+
+    before_script:
+        - cd build_scripts/linux
+        - ./download_dependencies.sh
+        - cd ../..
+        - cd build_scripts/linux
+        - export DEPENDENCIES_LINK_TYPE=shared
+        - ./linux_gcc_build_x64_debug_local.sh
+
+    script:
+        - './linux_run_tests.sh'
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3473f3d614cb488d6ff93a6cf0d34e59a4432ab6..668504c795a39ebac5107fc5d3f660d1e3ef6f48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ message("Looking for external libraries...")
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(Boost_USE_MULTITHREADED ON)
+set(Boost_DEBUG ON)
 
 set(CMAKE_INCLUDE_PATH ${BOOST_INCLUDEDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost" ${CMAKE_INCLUDE_PATH})
 set(CMAKE_LIBRARY_PATH ${BOOST_LIBRARYDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost/stage/lib" ${CMAKE_LIBRARY_PATH})