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