New one with the latest changes

hello
Merge pull request #1 from joannem/patch-1

New one with the latest changes