Added memory.h, modified makefile