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