Fixed more bugs
Update README.md
Merge pull request #40 from Twibbit/master

Even more corrections