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