vcambios juan 2.0
Merge origin/master