Makefile fixed and template for .env added