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