Rewrote parser
Added debug option to makefile