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