Atualizacao geral
Merge https://github.com/dmachadojr/sheriff