Initial commit
Merge branch 'developer'
Merge pull request #1 from lanryZhang/master

Merge