pulled from original repo + ajout critères
Merge pull request #3 from f-lopes/master

pulled from original repo + ajout critères