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