Merge pull request #209 from sprowell/master

New Parser