Update ChangeLog
Merge pull request #1 from Huaba/master

Update ChangeLog