Updating changelog
Merge pull request #538 from dcoeurjo/changelogEdit

Updating changelog