Update Makefile with additions from me & @swissmanu