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