commit funcional
Merge origin/master