Merge pull request #6 from Martin819/master

Update Travis settings