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