Pull request from Amelie

Comment: Pull request from Amelie