Makefile updated
Main updated
Defines added