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