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