some bugfixes
Merge branch 'release/0.2.2' into develop