Gianfranco's changes

from #24