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