Parser refactored and fixed
Merge branch 'master' into parthnaik_refactor_parser
Merge pull request #49 from nairys/parthnaik_refactor_parser

parthnaik_refactor_parser