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