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