update CHANGELOG
Merge pull request #504 from gordon/changelog

update CHANGELOG