Tidy up before release
Merge branch 'release/v0.1.1' into develop