Finished parser
Merge pull request #4 from williamhaw/master

Finished parser