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