Closes #17
Merge branch 'enhancement-#w17' into develop