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