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