Update ChangeLog
Merge pull request #737 from simnandez/develop

Update ChangeLog