Update CHANGELOG.md

#303 #323