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