Fixed makefile
update site
merged