Makefile adjustments

Conflicts:
	Makefile