Feature #69, implemented improvings
Merge branch 'feature-69' into develop