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