Update CHANGELOG
Merge pull request #37 from locochris/update_changelog

Update CHANGELOG