Closes #12
Merge branch 'enhancement-#w12' into develop