Added heap
Updated Makefile