Merge pull request #1 from jiangmin9/master

jin