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