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