Merge pull request #2 from SimonFromTaiwan/master

Readme-edits, fixes #1
Merge pull request #3 from SimonFromTaiwan/readme-edits

Merge pull request #2 from SimonFromTaiwan/master