Merge pull request #1 from egret-labs/master

合并更新