diff --git a/.travis.yml b/.travis.yml
index e810d81..aaa3db5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,8 @@ sudo: required
 matrix:
   include:
     ### Coveralls ###
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
@@ -22,48 +23,72 @@ matrix:
         - make clean
         # - coveralls --exclude lib --exclude tests --gcov-options '\-lp'
 
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: g++-4.9
       env: COMPILER=g++-4.9
 
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: g++-5
       env: COMPILER=g++-5
 
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: g++-6
       env: COMPILER=g++-6
 
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: g++-7
       env: COMPILER=g++-7
 
-    - compiler: clang
+    - os: linux
+      compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
           packages: clang-3.6
       env: COMPILER=clang++-3.6
 
-    - compiler: clang
+    - os: linux
+      compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
           packages: clang-3.7
       env: COMPILER=clang++-3.7
 
+    - os: osx
+      osx_image: xcode7.3
+
+    - os: osx
+      osx_image: xcode8
+
+    - os: osx
+      osx_image: xcode8.1
+
+    - os: osx
+      osx_image: xcode8.2
+
+    - os: osx
+      osx_image: xcode8.3
+
+    - os: osx
+      osx_image: xcode9
+
 
 script:
   - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
diff --git a/README.md b/README.md
index ee77ee8..4b58cb7 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![GitHub License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/pantor/inja/master/LICENSE)
 
 
-## Design
+Inja is a template engine for modern C++, loosely inspired by [jinja](http://jinja.pocoo.org).
 
 ```c++
 json data;