Version bump and changelog edit