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