Closes #11
Merge branch 'enhancement-#w11' into develop