Merge pull request #6 from ingjaso/master

alters y controladora
Merge pull request #24 from penajose10/master

Merge pull request #6 from ingjaso/master