Merge branch 'release/v0.1.0'
Merge branch 'hotfix/travis' into develop