Changed config and added Makefile