updated by the comments from wubai zhou.
Merge branch 'origin/master'