merge from github
change author name