Global + maureen
bug corrige
Merging master