Merge pull request #27 from HackerPartie/manu_branch

Manu branch