diff --git a/.travis.yml b/.travis.yml
index 3980085..fc9cfd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,24 @@ matrix:
           sources:
              - ubuntu-toolchain-r-test
           packages:
-             - g++-5=5.4.1-2ubuntu1~12.04
-      env: COMPILER=g++-5 CXXSTD=11
+             - g++-6
+      env: COMPILER=g++-6 CXXSTD=11
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+             - ubuntu-toolchain-r-test
+          packages:
+             - g++-7
+      env: COMPILER=g++-7 CXXSTD=11
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+             - ubuntu-toolchain-r-test
+          packages:
+             - g++-8
+      env: COMPILER=g++-8 CXXSTD=11
     - compiler: gcc
       addons:
         apt:
@@ -80,14 +96,61 @@ matrix:
             - clang++-3.9
             - libc++-dev
       env: COMPILER=clang++-3.9 CXXSTD=11
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+             - llvm-toolchain-trusty-4.0
+             - ubuntu-toolchain-r-test
+          packages:
+             - clang++-4.0
+             - libc++-dev
+      env: COMPILER=clang++-4.0 CXXSTD=11
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+             - llvm-toolchain-trusty-5.0
+             - ubuntu-toolchain-r-test
+          packages:
+             - clang++-5.0
+             - libc++-dev
+      env: COMPILER=clang++-5.0 CXXSTD=11             
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+             - llvm-toolchain-trusty-6.0
+             - ubuntu-toolchain-r-test
+          packages:
+             - clang++-6.0
+             - libc++-dev
+      env: COMPILER=clang++-6.0 CXXSTD=11             
+      
     - compiler: gcc
       addons:
         apt:
           sources:
              - ubuntu-toolchain-r-test
           packages:
-             - g++-5
-      env: COMPILER=g++-5 CXXSTD=14
+             - g++-6
+      env: COMPILER=g++-6 CXXSTD=14
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+             - ubuntu-toolchain-r-test
+          packages:
+             - g++-7
+      env: COMPILER=g++-7 CXXSTD=14
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+             - ubuntu-toolchain-r-test
+          packages:
+             - g++-8
+      env: COMPILER=g++-8 CXXSTD=14      
     - compiler: clang
       addons:
         apt:
@@ -139,6 +202,37 @@ matrix:
             - clang++-3.9
             - libc++-dev
       env: COMPILER=clang++-3.9 CXXSTD=14
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+             - llvm-toolchain-trusty-4.0
+             - ubuntu-toolchain-r-test
+          packages:
+             - clang++-4.0
+             - libc++-dev
+      env: COMPILER=clang++-4.0 CXXSTD=14
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+             - llvm-toolchain-trusty-5.0
+             - ubuntu-toolchain-r-test
+          packages:
+             - clang++-5.0
+             - libc++-dev
+      env: COMPILER=clang++-5.0 CXXSTD=14      
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+             - llvm-toolchain-trusty-6.0
+             - ubuntu-toolchain-r-test
+          packages:
+             - clang++-6.0
+             - libc++-dev
+      env: COMPILER=clang++-6.0 CXXSTD=14      
+      
 
 install:
     - if [ "$CXX" = "clang++" ]; then export CXX="$COMPILER -stdlib=libc++"; fi
diff --git a/README.md b/README.md
index 306647e..7a5dfbe 100644
--- a/README.md
+++ b/README.md
@@ -60,21 +60,25 @@ The interface is the same as `std::expected` as proposed in [p0323r3](http://www
 
 Tested on:
 
-- Linux CI
+- Linux
+  * clang 6.0.1
+  * clang 5.0.2
+  * clang 4.0.1
   * clang 3.9
   * clang 3.8
   * clang 3.7
   * clang 3.6
   * clang 3.5
-  * g++ 5.0
+  * g++ 8.0.1  
+  * g++ 7.3  
+  * g++ 6.4
   * g++ 4.9
   * g++ 4.8
-- Windows CI
+- Windows
   * MSVC 2015
   * MSVC 2017
-- Linux manual
-  * g++ 7.2
-  * g++ 5.4
+
+Unfortunately GCC5.5 has a compiler bug which I have not worked around yet. All other GCC5 versions should work.
 
 ### Dependencies