Updated parser.
Merge pull request #3 from jlburgos/master

Updated parser to actually work :P