Feature #42, fixed design bug
Merge branch 'feature-42' into develop
Merge branch 'develop'