Merge pull request #2 from lgzhang/master

fix merge
Merge pull request #5 from lgzhang/develop

Merge pull request #2 from lgzhang/master