Charlesworth extends contract at Gloucestershire