modificcaion varios
Merge origin/master