Some refactoring
Release v0.9.1
Merge branch 'release/v0.9.1'
Merge tag 'v0.9.1' into develop

v0.9.1