Merge pull request #91 from garzgul/Eddy

merge mardi soir