diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86ae5546a1dd5ebb4f03bc4b2624429f2a9363b3..25e6d24930951f21ad5bfdd10b222c040a2e4ae8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,7 @@
-# Windows 10 with Boost, Exprtk and Turtle
-# downloaded and compiled locally as
-# submodules and linked statically
-win_visual_studio_static_local_deps:
-    tags:
-        - Win
-
-    before_script:
-        - call VsDevCmd.bat
-        - cd build_scripts\windows
-        - call win_download_dependencies.bat
-        - cd ..\..
-        - cd build_scripts\windows
-        - set DEPENDENCIES_LINK_TYPE=static
-        - set clean_after=yes
-        - call win_VS_build_x64_debug.bat
-        - cd ..\..
-
-    script:
-        - cd build_scripts\windows
-        - call win_run_tests.bat
-        - cd ..\..
-
-# Windows 10 with Boost, Exprtk and Turtle
-# downloaded and compiled locally as
-# submodules and link dynamically
-#
-#win_visual_studio_shared_deps:
+## Windows 10 with Boost, Exprtk and Turtle
+## downloaded and compiled locally as
+## submodules and linked statically
+#win_visual_studio_static_local_deps:
 #    tags:
 #        - Win
 #
@@ -33,7 +9,10 @@ win_visual_studio_static_local_deps:
 #        - call VsDevCmd.bat
 #        - cd build_scripts\windows
 #        - call win_download_dependencies.bat
-#        - set DEPENDENCIES_LINK_TYPE=shared
+#        - cd ..\..
+#        - cd build_scripts\windows
+#        - set DEPENDENCIES_LINK_TYPE=static
+#        - set clean_after=yes
 #        - call win_VS_build_x64_debug.bat
 #        - cd ..\..
 #
@@ -42,115 +21,136 @@ win_visual_studio_static_local_deps:
 #        - call win_run_tests.bat
 #        - cd ..\..
 #
+## Windows 10 with Boost, Exprtk and Turtle
+## downloaded and compiled locally as
+## submodules and link dynamically
+##
+##win_visual_studio_shared_deps:
+##    tags:
+##        - Win
+##
+##    before_script:
+##        - call VsDevCmd.bat
+##        - cd build_scripts\windows
+##        - call win_download_dependencies.bat
+##        - set DEPENDENCIES_LINK_TYPE=shared
+##        - call win_VS_build_x64_debug.bat
+##        - cd ..\..
+##
+##    script:
+##        - cd build_scripts\windows
+##        - call win_run_tests.bat
+##        - cd ..\..
+##
+##
+##win_visual_studio_shared_local_deps:
+##    tags:
+##        - Win
+##
+##    before_script:
+##        - call VsDevCmd.bat
+##        - cd build_scripts\windows
+##        - call win_download_dependencies.bat
+##        - set DEPENDENCIES_LINK_TYPE=shared
+##        - call win_VS_build_x64_debug.bat
+##        - cd ..\..
+##
+##    script:
+##        - cd build_scripts\windows
+##        - call win_run_tests.bat
+##        - cd ..\..
 #
-#win_visual_studio_shared_local_deps:
+#
+## Latest Ubuntu with Boost, Exprtk and Turtle
+## in system directories, Boost
+## installed from the official repository
+## => only dynamical linking possible
+#ubuntu_boost_system:
 #    tags:
-#        - Win
+#        - centos7
+#
+#    image: martinbeseda/dockertest:latest
 #
 #    before_script:
-#        - call VsDevCmd.bat
-#        - cd build_scripts\windows
-#        - call win_download_dependencies.bat
-#        - set DEPENDENCIES_LINK_TYPE=shared
-#        - call win_VS_build_x64_debug.bat
-#        - cd ..\..
+#        - rm -rf external_dependencies/boost/*
+#        - rm -rf external_dependencies/exprtk/*
+#        - rm -rf exprtk
+#        - export TERM=xterm
+#        - cd build_scripts/linux
+#        - export DEPENDENCIES_LINK_TYPE=shared
+#        - export CLEAN_AFTER=yes
+#        - ./linux_gcc_build_x64_debug_system.sh
+#        - cd ../..
 #
 #    script:
-#        - cd build_scripts\windows
-#        - call win_run_tests.bat
-#        - cd ..\..
-
-
-# Latest Ubuntu with Boost, Exprtk and Turtle
-# 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/boost/*
-        - rm -rf external_dependencies/exprtk/*
-        - rm -rf exprtk
-        - export TERM=xterm
-        - cd build_scripts/linux
-        - export DEPENDENCIES_LINK_TYPE=shared
-        - export CLEAN_AFTER=yes
-        - ./linux_gcc_build_x64_debug_system.sh
-        - cd ../..
-
-    script:
-        - cd build_scripts/linux
-        - './linux_run_tests.sh'
-        - cd ../..
-
-# Latest Ubuntu with Boost, Exprtk and Turtle
-# compiled locally as submodules and
-# linked statically
-ubuntu_boost_local_static_deps:
-    tags:
-        - centos7
-
-    image: martinbeseda/ubuntu-ci:latest
-
-    before_script:
-        - export TERM=xterm
-        - cd build_scripts/linux
-        - ./download_dependencies.sh
-        - cd ../..
-        - cd build_scripts/linux
-        - export DEPENDENCIES_LINK_TYPE=static
-        - export CLEAN_AFTER=yes
-        - ./linux_gcc_build_x64_debug_local.sh
-        - cd ../..
-
-    script:
-        - cd build_scripts/linux
-        - './linux_run_tests.sh'
-        - cd ../..
-
-# Latest Ubuntu with Boost, Exprtk and Turtle
-# compiled locally as submodules and
-# linked dynamically
-ubuntu_boost_local_dynamic_deps:
-    tags:
-        - centos7
-
-    image: martinbeseda/ubuntu-ci:latest
-
-    before_script:
-        - export TERM=xterm
-        - cd build_scripts/linux
-        - ./download_dependencies.sh
-        - cd ../..
-        - cd build_scripts/linux
-        - export DEPENDENCIES_LINK_TYPE=shared
-        - export CLEAN_AFTER=yes
-        - ./linux_gcc_build_x64_debug_local.sh
-        - cd ../..
-
-    script:
-        - cd build_scripts/linux
-        - './linux_run_tests.sh'
-        - cd ../..
-
-
-#code_quality:
-#  image: docker:stable
-#  variables:
-#    DOCKER_DRIVER: overlay2
-#  allow_failure: true
-#  services:
-#    - docker:stable-dind
-#  script:
-#    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-#    - docker run
-#        --env SOURCE_CODE="$PWD"
-#        --volume "$PWD":/code
-#        --volume /var/run/docker.sock:/var/run/docker.sock
-#        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-#  artifacts:
-#    paths: [gl-code-quality-report.json]
+#        - cd build_scripts/linux
+#        - './linux_run_tests.sh'
+#        - cd ../..
+#
+## Latest Ubuntu with Boost, Exprtk and Turtle
+## compiled locally as submodules and
+## linked statically
+#ubuntu_boost_local_static_deps:
+#    tags:
+#        - centos7
+#
+#    image: martinbeseda/ubuntu-ci:latest
+#
+#    before_script:
+#        - export TERM=xterm
+#        - cd build_scripts/linux
+#        - ./download_dependencies.sh
+#        - cd ../..
+#        - cd build_scripts/linux
+#        - export DEPENDENCIES_LINK_TYPE=static
+#        - export CLEAN_AFTER=yes
+#        - ./linux_gcc_build_x64_debug_local.sh
+#        - cd ../..
+#
+#    script:
+#        - cd build_scripts/linux
+#        - './linux_run_tests.sh'
+#        - cd ../..
+#
+## Latest Ubuntu with Boost, Exprtk and Turtle
+## compiled locally as submodules and
+## linked dynamically
+#ubuntu_boost_local_dynamic_deps:
+#    tags:
+#        - centos7
+#
+#    image: martinbeseda/ubuntu-ci:latest
+#
+#    before_script:
+#        - export TERM=xterm
+#        - cd build_scripts/linux
+#        - ./download_dependencies.sh
+#        - cd ../..
+#        - cd build_scripts/linux
+#        - export DEPENDENCIES_LINK_TYPE=shared
+#        - export CLEAN_AFTER=yes
+#        - ./linux_gcc_build_x64_debug_local.sh
+#        - cd ../..
+#
+#    script:
+#        - cd build_scripts/linux
+#        - './linux_run_tests.sh'
+#        - cd ../..
+#
+#
+##code_quality:
+##  image: docker:stable
+##  variables:
+##    DOCKER_DRIVER: overlay2
+##  allow_failure: true
+##  services:
+##    - docker:stable-dind
+##  script:
+##    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+##    - docker run
+##        --env SOURCE_CODE="$PWD"
+##        --volume "$PWD":/code
+##        --volume /var/run/docker.sock:/var/run/docker.sock
+##        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+##  artifacts:
+##    paths: [gl-code-quality-report.json]