Merge the author update

Merge the author update