Update history to reflect merge of #40, #39.