Closes #25
Merge branch 'enhancement-#w25' into develop