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