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