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

Update CHANGELOG