Merge pull request #10 from Travis-S/develop

Figuring out Travis-CI