Fix #6.
Fix #8
Fix #10
Merge pull request #7 from jonross/iss6

Fix #6.
Merge pull request #9 from jonross/iss8

Fix #8
Merge pull request #11 from jonross/iss10

Fix #10