diff --git a/.travis.yml b/.travis.yml
index 6960e41..f4454e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,32 @@
-# language type:
 language:
-- cpp
-- Objective-c
+  - cpp
+
+sudo: false
 
-# compilator system:
 compiler:
-- clang
-- gcc
+  - clang
+  - gcc
+
+os:
+  - linux
+  - osx
 
-# build branch requested
 branches:
   only:
     - master
     - dev
 
-# previous actions:
-before_script: 
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.9
+
+install:
+  - pip install --user lutin
+
+before_script:
   - cd ..
   - mkdir bin
   - curl https://storage.googleapis.com/git-repo-downloads/repo > bin/repo
@@ -33,22 +44,11 @@ before_script:
   - pwd
   - ls -l
   - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi
+  - if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi
 
-install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libstdc++-4.9-dev
-  - sudo apt-get install -qq g++-4.9
-  - sudo rm /usr/bin/gcc /usr/bin/g++
-  - sudo ln -s /usr/bin/gcc-4.9 /usr/bin/gcc
-  - sudo ln -s /usr/bin/g++-4.9 /usr/bin/g++
-  - sudo pip install lutin
+script:
+  - lutin -C -P -c$BUILDER $COMPILATOR_OPTION -mdebug -p ege egeCameraPosition egeCollision egeDoubleView egeMeshCreator egeRayTest
 
-# build sequence with Lutin :
-script: 
-  - lutin -C -P -c$BUILDER -mdebug -p ege egeCameraPosition egeCollision egeDoubleView egeMeshCreator egeRayTest
-
-#send e-mail on compilation result:
 notifications:
   email:
     - yui.heero@gmail.com