Merge branch 'master' into dev
Merge pull request #3 from yuyangame/dev

Merge branch 'master' into dev