Update fork to Nadège's latest version

Everything is in the title...