Merge pull request #2 from GALLAY/master

New Merge