Closes #10
Merge branch 'enhancement-#10' into enhancement-#6