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