cambio desde rama fixes
Merge pull request #2 from afloresjpg/fixes

cambio desde rama fixes
Merge pull request #3 from afloresjpg/features

Features