Closes #35
Merge branch 'enhancement-#35' into staged-changes