Z's branch
FIX menu COMPLETE
Merge branch 'z0' and 'lmaresz'

Conflicts:
	program.py