Update CHANGELOG for changes related to #36