Closes #20
Merge branch 'enhancement-#w20' into develop