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