update README
Merge remote-tracking branch 'upstream/master'
Merge pull request #34 from fr500/master

Update README