erros
Merge pull request #6 from joridos/master

erros