erros
Merge pull request #7 from joridos/master

errosx2