Update CHANGELOG and Version bump