fucking fucking
Merge branch 'alteracoes_ka'