Update history to reflect merge of #27. Closes #27.