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