Changed makefile and Config class