Fixed Makefile
Undo some bad cleanup
Adding demo