Updated daemon with Makefile