Reajuste de diagramacao
Merge origin/master