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