Merge feature/travis-fix