Merge pull request #11 from palichis/master

actualizacion, palichis
Merge pull request #5 from Katarisoft/master

Merge pull request #11 from palichis/master