Merge branch 'QA1'
mens
Merge pull request #5 from bruixotot/qa_es

Qa es