Merge pull request #6 from ingjaso/master

alters y controladora