Merge pull request #10 from mitchellwills/develop

Fixed travis build