diff --git a/.travis.yml b/.travis.yml
index b85ac53..04e8b01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
-language: cpp
+language:
+  - cpp
+
+sudo: false
 
 compiler:
   - clang
@@ -8,21 +11,28 @@ os:
   - linux
   - osx
 
-before_script:
-  - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi
+branches:
+  only:
+    - master
+    - dev
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.9
 
 install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq g++-4.9
-  - sudo apt-get install -qq libstdc++-4.9-dev
-  - 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
+  - pip install --user lutin
 
-script: 
-  - lutin -C -P -c$BUILDER -mdebug -p date
+before_script:
+  - cd ..
+  - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi
+  - if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi
+
+script:
+  - lutin -C -P -c$BUILDER $COMPILATOR_OPTION -mdebug -p date
 
 notifications:
   email: