cambio 2
Merge pull request #7 from afloresjpg/fixes

cambio 2
Merge pull request #8 from afloresjpg/features

Features