Closes #19
Merge branch 'enhancement-#w19' into develop