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