Spelling mistake in comment
Merge pull request #36 from dfstrauss/patch-1

Spelling mistake in comment
Merge pull request #5 from matyb/master

Pull in the latest upstream changes from matyb