Feature 42, added some enhacements
Merge branch 'feature-42' into develop
Merge branch 'develop'