Merge pull request #1 from yelu978/master

1
Merge pull request #3 from yelu958/master

Merge pull request #1 from yelu978/master