Closes #14
Merge branch 'enhancement-#w14' into develop