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