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