Merge branch 'release/0.0.1'
Edit .travis.yml
Merge branch 'hotfix/1394230516-travis' into develop