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