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