Merge pull request #18 from Porquepix/master

Recup