latest changes
Merge pull request #1 from nathaliamaro/master

latest changes