Fixes #8
Did some more work.
Merge pull request #10 from benfoster/features/blah

Fixes #8