Added Makefile, fixed Definitions