Merge pull request #1 from narcissusdu/master

Yes I do
Merge pull request #1 from chwang1986/master

Merge pull request #1 from narcissusdu/master