Merge pull request #960 from openMF/develop

Update CHANGELOG.md