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