Merge pull request #1 from c88lopez/dev

First pull request (testing)
Merge pull request #2 from c88lopez/master

Merge pull request #1 from c88lopez/dev