Fixes #10
Fixes #9
Fixes #8
Fixes #7
Fixes #6
Fixes #5
Fixes #4
Closes #11