Merge pull request #9 from euw15/Mierda

Merge pull request #8 from euw15/master
Merge pull request #10 from euw15/master

Merge pull request #9 from euw15/Mierda