Closes #26
Merge branch 'enhancement-#w26' into develop