Updated contributor information.
merging