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