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