Merge pull request #31 from pengqin/dev

Dev
新testcase
Merge pull request #33 from hopesfish/dev

Dev