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