Partial improvements #1
Merge branch 'improvement/#1' into develop