Changes made by Amelie
Merge branch 'amelie'