Updated with CHANGELOG.md