mod varias
Merge origin/master