Closes #7
Merge branch 'enhancement-#w7' into develop