Merge pull request #5 from kalabox/travis

Travis
Merge branch 'master' into travis