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