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