Merge pull request #64 from kyle921/master

Fix issue 51 and update readme.md
Merge remote-tracking branch 'upstream/master'