some generic improvements
Merge branch 'release/v0.3.2'
Merge tag 'vv0.3.2' into develop

v0.3.2