Closes #33 and also closes #34
Merge branch 'enhancement-#33' into develop