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