Merge pull request #6 from kalabox/travis

Travis
Merge branch 'master' into travis