Merge pull request #13 from tsandras/tristan2

Dernier dernier commit