Closes #18
Merge branch 'enhancement-#w18' into develop