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