Update CHANGELOG.md
Merge branch 'v4'
Update README.md
Merge branch 'master' into v3