small bugfixes
bumped version
Merge branch 'release/0.3.1'
Merge tag '0.3.1' into develop

Released-0.3.1 0.3.1