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