Update CHANGELOG
Merge pull request #272 from sschaef/issue/changelog-update

Update CHANGELOG