Changes based on Maxi's suggestions
Merge pull request #1 from andresmdo/master

Joya.