Feature #58, implemented
Merge branch 'feature-58' into develop