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