Merge pull request #24 from HackerPartie/manu_branch

Manu branch