Merge pull request #1 from Marviszhao/branch1

Branch1 test2