Update CHANGELOG.md
Merge pull request #519 from lovenunu/patch-2

Update CHANGELOG.md
Merge remote-tracking branch 'remotes/upstream/master'