Merge pull request #1 from lanryZhang/master

Merge
Merge pull request #2 from lanryZhang/master

Merge
Merge pull request #3 from lanryZhang/developer

Developer