Update Changelog
Merge pull request #726 from simnandez/develop

Update Changelog