updated template and makefile
updated makefile