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