Merge pull request #1 from Marviszhao/branch1

Branch1
Merge pull request #2 from Marviszhao/master

Merge pull request #1 from Marviszhao/branch1