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