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