Fix a comment typo
Fix some code typos
Merge pull request #5 from rrthomas/master

Fix an apparent bug