CHANGELOG updated
Merge pull request #1153 from zefciu/develop

CHANGELOG updated
Merge pull request #1154 from andrzej-jankowski/develop

changes rst
Updated changelog.
Updated changelog part 2.