"massimo credit implementation"
Proper credit.
Merge branch 'tp4-mz' into tp4-lu

Conflicts:
	lua/forth