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