Merge pull request #2 from ts7fx/master

parser