Merge pull request #4 from afloresjpg/aflores

cambio desde aflores
cambio desde fchalabe
Merge pull request #6 from afloresjpg/develop

Develop