Merge pull request #6 from shunwen/master

Minor correction.
Merge pull request #2 from jyunfan/master

Sync