Started some fixes
Merge pull request #5 from wblankenship/parserFix

Parser fix