Trying to fix things

Merge branch 'release/v0.1.1'
Merge branch 'master' into develop