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