Merge branch 'release/0.1'
Merge branch 'master' into develop