code refactor done
code fix all done
error handled for parser
fix to check exception
Merge branch 'master' into shrey-refactor