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