Chinese -> English
Chinese -> English
Chinese -> English
Chinese -> English
Chinese -> English
Merge pull request #9 from zhongwen/hotfixes

Hotfixes Fix Issue #5