Merge pull request #1 from xuhuisheng/master