Update docblock
Update CHANGELOG.md