Merged with latest branch. Updated Makefile