fixed the author name
Merge origin/master