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