Closes #22
Merge branch 'enhancement-#w22' into develop