fix many bugs.
Merge branch 'master' of https://github.com/Petitnomad/nomad

Conflicts:
	log.roo