Closes #34
Merge branch 'enhancement-#w34' into develop