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