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