Add Makefile recipe in target directory
Merge branch 'master' into fullwidth

Conflicts:
	Makefile