Additional Makefile amendments
Updated composer.lock