Merge pull request #2 from yuefei-zhu/master

Merge pull request #1 from yuefei-zhu/develop
Merge pull request #3 from yuefei-zhu/develop

Merge pull request #2 from yuefei-zhu/master