diff --git a/.decent_ci-Linux.yaml b/.decent_ci-Linux.yaml
index f7a4d1c7..a2d597fd 100644
--- a/.decent_ci-Linux.yaml
+++ b/.decent_ci-Linux.yaml
@@ -1,10 +1,13 @@
 compilers:
+  - name: "clang"
+    version: "3.5"
+    cmake_extra_flags: -DUSE_LIBCXX:BOOL=OFF -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON
   - name: "gcc"
     version: "4.8"
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON  -DCOMMIT_SHA=$COMMIT_SHA
+    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_TESTING:BOOL=ON
   - name: "gcc"
     version: "4.6"
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON  -DCOMMIT_SHA=$COMMIT_SHA
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON
   - name: cppcheck
-    compiler_extra_flags: --enable=all 
+    compiler_extra_flags: --enable=all -I include --inline-suppr
 
diff --git a/.decent_ci-MacOS.yaml b/.decent_ci-MacOS.yaml
index 7e8c6cfa..b68ed8ed 100644
--- a/.decent_ci-MacOS.yaml
+++ b/.decent_ci-MacOS.yaml
@@ -1,7 +1,7 @@
 compilers:
   - name: clang
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=$COMMIT_SHA
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=$COMMIT_SHA
   - name: clang
     build_type: Debug
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=$COMMIT_SHA
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=$COMMIT_SHA
 
diff --git a/.decent_ci-Windows.yaml b/.decent_ci-Windows.yaml
index 6a93f1a7..1f6c0335 100644
--- a/.decent_ci-Windows.yaml
+++ b/.decent_ci-Windows.yaml
@@ -1,12 +1,20 @@
 compilers:
+  - name: Visual Studio
+    version: 14
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
+    compiler_extra_flags: /ANALYZE
+  - name: Visual Studio
+    version: 14
+    architecture: Win64
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
+    compiler_extra_flags: /ANALYZE
   - name: Visual Studio
     version: 12
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
     compiler_extra_flags: /ANALYZE
   - name: Visual Studio
     version: 12
     architecture: Win64
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
     compiler_extra_flags: /ANALYZE
 
-