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