Merge pull request #3 from ruzickap/feature/travis_fix

TravisCI fixes