Merge pull request #3 from xshen4/develop

Develop