Merge pull request #1 from fex-team/master

合并代码