Merge pull request #7 from ktf/master

Misc cleanups in sight of v0.7...
Typo.