Updated contributer information.
merge