diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e0deb5..1e154b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,6 @@ jobs:
         # Github Actions requires a single row to be added to the build matrix.
         # See https://help.github.com/en/articles/workflow-syntax-for-github-actions.
         name: [
-          ubuntu-18.04-gcc-4.8,
-          ubuntu-18.04-gcc-4.9,
           ubuntu-18.04-gcc-5,
           ubuntu-18.04-gcc-6,
           ubuntu-18.04-gcc-7,
@@ -42,28 +40,14 @@ jobs:
           windows-2019-clang-cl,
           windows-2019-clang,
           windows-2019-gcc,
-          macOS-10.14-xcode-9.4.1,
-          macOS-10.14-xcode-10.0,
-          macOS-10.14-xcode-10.1,
-          macOS-10.14-xcode-10.2,
-          macOS-10.14-xcode-10.2.1,
-          macOS-10.14-xcode-10.3,
           macOS-10.14-gcc-7,
           macOS-10.14-gcc-8,
           macOS-10.14-gcc-9,
+          macOS-latest-xcode-11.0,
+          macOS-latest-xcode-11.3,
         ]
 
         include:
-          - name: ubuntu-18.04-gcc-4.8
-            os: ubuntu-18.04
-            compiler: gcc
-            version: "4.8"
-
-          - name: ubuntu-18.04-gcc-4.9
-            os: ubuntu-18.04
-            compiler: gcc
-            version: "4.9"
-
           - name: ubuntu-18.04-gcc-5
             os: ubuntu-18.04
             compiler: gcc
@@ -176,36 +160,6 @@ jobs:
             os: windows-2019
             compiler: gcc
 
-          - name: macOS-10.14-xcode-9.4.1
-            os: macOS-10.14
-            compiler: xcode
-            version: "9.4.1"
-
-          - name: macOS-10.14-xcode-10.0
-            os: macOS-10.14
-            compiler: xcode
-            version: "10"
-
-          - name: macOS-10.14-xcode-10.1
-            os: macOS-10.14
-            compiler: xcode
-            version: "10.1"
-
-          - name: macOS-10.14-Xcode-10.2
-            os: macOS-10.14
-            compiler: xcode
-            version: "10.2"
-
-          - name: macOS-10.14-xcode-10.2.1
-            os: macOS-10.14
-            compiler: xcode
-            version: "10.2.1"
-
-          - name: macOS-10.14-xcode-10.3
-            os: macOS-10.14
-            compiler: xcode
-            version: "10.3"
-
           - name: macOS-10.14-gcc-7
             os: macOS-10.14
             compiler: gcc
@@ -221,6 +175,16 @@ jobs:
             compiler: gcc
             version: "9"
 
+          - name: macOS-latest-xcode-11.0
+            os: macOS-latest
+            compiler: xcode
+            version: "11"
+
+          - name: macOS-latest-xcode-11.3
+            os: macOS-latest
+            compiler: xcode
+            version: "11.3"
+
     steps:
       - uses: actions/checkout@v1
 
diff --git a/.github/workflows/vsenv.bat b/.github/workflows/vsenv.bat
new file mode 100644
index 0000000..9f2da0c
--- /dev/null
+++ b/.github/workflows/vsenv.bat
@@ -0,0 +1,17 @@
+@echo off
+
+SET VSWHERE="C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere"
+
+:: See https://github.com/microsoft/vswhere/wiki/Find-VC
+for /f "usebackq delims=*" %%i in (`%VSWHERE% -latest -property installationPath`) do (
+  call "%%i"\Common7\Tools\vsdevcmd.bat %*
+)
+
+:: Loop over all environment variables and make them global using set-env.
+:: See: https://help.github.com/en/articles/development-tools-for-github-actions#set-an-environment-variable-set-env
+:: See: https://stackoverflow.com/questions/39183272/loop-through-all-environmental-variables-and-take-actions-depending-on-prefix
+setlocal
+for /f "delims== tokens=1,2" %%a in ('set') do (
+  echo ::set-env name=%%a::%%b
+)
+endlocal
\ No newline at end of file
diff --git a/README.md b/README.md
index 62e98f5..647b319 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <p align="center">
   <a href="https://github.com/pantor/inja/actions">
-    <img src="https://github.com/pantor/inja/workflows/C++%20CI/badge.svg" alt="CI Status">
+    <img src="https://github.com/pantor/inja/workflows/CI/badge.svg" alt="CI Status">
   </a>
 
   <a href="https://github.com/pantor/inja/actions">