cleaning Makefile
Merge branch 'master' into TermWriter

Conflicts:
	Makefile