Merge pull request #9 from Porquepix/master

Recup
Merge pull request #43 from Ysnir/master

Merge pull request #9 from Porquepix/master