Merge pull request #22 from Chocobo1/travis

TravisCI: Improvements