Cleaning merge.  Closes #2.