Merge pull request #8 from shrikeh/development

Travis CI fixes
Merge pull request #9 from shrikeh/development

Development