Merge pull request #36 from ecourtenay/master

Update README.md
Merge remote-tracking branch 'upstream/master'