Merge pull request #6 from zhallett/master

Fix typo in README
Merge remote-tracking branch 'upstream/master'