Merge pull request #5 from rrthomas/master

Fix an apparent bug
Merge pull request #6 from rrthomas/master

Fix a couple of typos