Merge pull request #1 from yuefei-zhu/develop

Develop