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