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