CS fixes
Update changelog
Merge remote-tracking branch 'origin/master'
Update changelog/readme
Update CHANGELOG
Update tests and changelog