Merge pull request #45 from HackerPartie/manu_branch

Manu branch
Merge branch 'master' into manu_branch