Merge pull request #2 from dillonHe/master

Merge pull request #1 from dillonHe/chinese
Merge pull request #3 from dillonHe/chinese

Merge pull request #2 from dillonHe/master