updated @author
Merge origin/master