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