Merge pull request #184 from leeyt/master

Add new testcases
fix 3 cases
Merge pull request #59 from huangnoah/fix-20130403

Fix 20130403