Merge pull request #4 from sumedhghaisas/parser_changes

Parser changes