Merge pull request #24 from HackerPartie/manu_branch

Manu branch
Merge pull request #25 from HackerPartie/master

Merge pull request #24 from HackerPartie/manu_branch