fix issue 225. improve parser
Merge pull request #233 from xuwei-k/issue-225

fix issue 225. improve parser