Update history to reflect merge of #1 [ci skip]