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