Updated and tested other makefiles,including the Demonstration one.