Merge branch 'feature-38' into develop
Implementing feature #38, fixed some issues