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