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