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