Closes #21
Merge branch 'enhancement-#w21' into develop