minor refactoring
Merge branch 'travis_ci'