Commit of the last version by N. Heiniger