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