Merge pull request #76 from garzgul/Eddy

merge fin de 1ere semaine