Closes #12
Closes #10
Closes #11
Closes #8
Merge branch 'enhancement-#8'