merge original author update

merge original author update