master - updated makefile