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