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