Merge pull request #46 from brocktimus/master

Fixing Travis CI Builds