Merge pull request #15 from HackerPartie/manu_branch

Manu branch
Merge pull request #16 from HackerPartie/manu_branch

Manu branch
Merge branch 'master' into manu_branch