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