Merge pull request #7 from Porquepix/master

Recup
Merge pull request #41 from Ysnir/master

Merge pull request #7 from Porquepix/master