Update README
Update changelog
Bump version
Merge branch 'release-2.1.0' into develop