Merge pull request #3 from Harrandom/master

Another Pull Request, fixes #1
Another update
Merge pull request #4 from Harrandom/readme-edits

Readme edits, fixes #1