change termination string
fix & test parser
add test files
update Makefile