Closes #5
Merge branch 'enhancement-#w5' into develop