Merge pull request #24 from sarkasm/master

Test of fixing broken TravisCI build