Update CHANGELOG.md
Update README.md
Merge branch 'develop'