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