Finished with minor changes in discussion
Merge branch 'mathilde'