Update README.
Merge remote-tracking branch 'upstream/master'
Merge pull request #21 from ufosky/master

Update README.