merge

Check & Merge. zhoushx3