Update readme.
Update changelog.
Merge branch 'feature/cleanup' into develop