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