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