Closes #21
Merge branch 'enhancement-#21' into develop