diff --git a/.travis.yml b/.travis.yml
index ece0787a..7b1df03b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,11 +25,12 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
+            - llvm-toolchain-precise-3.8
           packages:
-            - clang-3.6
+            - clang-3.8
+            - g++-7
       env:
-        - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
+        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
 
     # OS X / Clang
     - os: osx
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2edbdf1..dcec9f53 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 	ENDIF()
 ENDIF()
 
+# Use libc++ with Clang
 #IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 #    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 #ENDIF()