Updated
Merge pull request #1409 from Uro1/master

Updated ChangeLog