Closes #3
Merge branch 'enhancement-#w3' into develop