Closes #27
Merge branch 'enhancement-#w27' into develop