diff --git a/.travis.yml b/.travis.yml
index fab5de3d..5dcb3618 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,47 @@
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install cmake
 
 # Enable C++ support
 language: cpp
 
+os:
+  - linux
+  - osx
+
+
+
 # Compiler selection
 compiler:
   - clang
   - gcc
 
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.8
+    - g++-4.8
+    - clang
+
+matrix:
+    exclude:
+    - os: osx
+      compiler: gcc
+
+
+install:
+# Linux Setup 
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget --no-check-certificate http://cmake.org/files/v3.1/cmake-3.1.3-Linux-x86_64.tar.gz   ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar -xzf cmake-3.1.3-Linux-x86_64.tar.gz                                                  ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8" ;fi                         ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$PWD/cmake-3.1.3-Linux-x86_64/bin:$PATH                                       ;fi 
+# OSX Setup 
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then wget --no-check-certificate http://cmake.org/files/v3.1/cmake-3.1.3-Darwin-x86_64.tar.gz  ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then tar -xzf cmake-3.1.3-Darwin-x86_64.tar.gz                                                 ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then export PATH=$PWD/cmake-3.1.3-Darwin-x86_64/CMake.app/Contents/bin:$PATH                   ;fi 
+
+
+
+
 # Build steps
 script:
   - cd apps/tridecimator