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