Merge pull request #4 from guanmei/master

Merge pull request #1 from ts7fx/master
Merge pull request #2 from ts7fx/master

parser