Merge pull request #1 from juanma1989dev/master

lala
Merge pull request #2 from itan187/master

Merge pull request #1 from juanma1989dev/master