Merge pull request #1 from magomimmo/master

Catch up with upstream from magomimmo
Fix tiny typo.
Merge pull request #87 from deg/master

Fix one word typo