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