Merge pull request #1683 from xianglin1006/master

Fix minor typo of return value