Further improvements
Merge branch 'improvement/#9' into develop