Parser modified
Merge pull request #11 from jeth64/master

Modified parser