more fixes
Merge branch 'release/v0.1.1.1'