Updates changelog
Merge pull request #269 from twokul/updates-changelog

Updates changelog