Merge pull request #1 from 11693-01/master

kanghuang pull