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