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