CHANGELOG updated
Merge pull request #876 from zefciu/develop

CHANGELOG updated