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