various bugfixes
bumped version
Merge branch 'release/0.1.1'