Closes #10
Merge branch 'enhancement-#w10' into develop