Merge pull request #48 from joeldrapper/master

Fix Travis