bump and fix
Merge branch 'release/0.1.1' into development