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