made some changes
Merge branch 'mathilde'