Merge pull request #4 from brian978/develop

Merge from dev
Updated travis file