Merge pull request #8 from jdelight/master

Fix travis build