by daifeng
Merge pull request #1 from BruceDai/master

merge the patch by daifeng