Closes #9
Merge branch 'enhancement-#w9' into develop