refactor bugfixes
bumped version
Merge branch 'release/0.3.3'
Merge tag '0.3.3' into develop

Released-0.3.3 0.3.3