Updated History to reflect merge of #806