Merge com master
Resolvendo problemas com o branch ciro