Parser Tweaks and Fixes
Merge branch 'master' of https://github.com/grantcp/DaddyEagle