Merge pull request #165 from leeyt/master

Merge Noah's hotfix for compile error caused by Chinese character
add test case and refix 1381
Merge pull request #28 from huangnoah/new-20121228

New 20121228