Updated changelog
Merge pull request #689 from zefciu/develop

Updated changelog