Update history to reflect merging of #122.