Merge pull request #8 from Porquepix/master

Recup