Closes #38
Merge branch 'enhancement-#w38' into develop