Merge pull request #1 from louie-liu/master

update
Merge pull request #1 from DiHai/master

Merge pull request #1 from louie-liu/master