Changes in prototypes
Merge branch 'mathilde'