just poking through leaving comments
parser simplification
Merge pull request #9 from grobertson/parser2

Simplification of the parser. Should be a bit more accurate.