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