Merge pull request #6 from mvdriel/master

Fix travis builds.