Merge from upstream
Tweak README.md