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