Alteracoes
Merge https://github.com/manaweb/TrocaKi