Parser algorithm improved and bug fix
Parser algorithm improved and bug fix
test case improved