sss
Merge branch 'pre-master' into jhoan
combino con pre-master
Merge branch 'master' into jhoan