Fixed makefile and Config