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