fixed changes from Jannicke
Merge branch 'mathilde'