Update README
Merge pull request #14 from chliny/upstream

Update README
Merge remote-tracking branch 'zhen/master'