Closes #13
Merge branch 'enhancement-#w13' into develop