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