Fixed bugs in parser

Signed-off-by: Tushar Pankaj <tushar.s.pankaj@gmail.com>