clean compilator and add Makefile
fix merge