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