Update README for CHANGELOG
Merge upstream