Improvement/#6 completed
Merge branch 'improvement/#6' into develop