Merge pull request #74 from Ysnir/master

Merge pull request #36 from Porquepix/master
Merge pull request #75 from Ysnir/master

Commentaires
Merge pull request #37 from Porquepix/master

Recup