Also an Makefile for the Master added