Fix parsing errors and Add test cases.
update version