Merge pull request #220 from norox/master

Updated CHANGELOG.rst