Merge pull request #9 from 11693-01/master

kanghuang pull