Merge pull request #8 from Porquepix/master

Recup
Merge pull request #42 from Ysnir/master

Merge pull request #8 from Porquepix/master