added basic parser
merge