fix full name
merge from master