Merge pull request #242 from trevorbernard/master

Fix issue #241 - Fix travis-ci build