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