Merge branch 'release/1.0.1' into develop
Travis stuffs
Merge branch 'feature/travis' into develop