Version bump and CHANGELOG update