Updated author
Merged