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