Updated contributor information.
completing the merge