Merge pull request #1 from yangfuhai/master

Pull Request