work on Travis CI support
Merge branch 'travis'
travis