Merge pull request #46 from HackerPartie/manu_branch

Manu branch
Merge pull request #47 from HackerPartie/manu_branch

Manu branch