Update CHANGELOG and bump version