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