Fixed config and added Makefile