Merge pull request #56 from Martin819/master

Fix Travis tests