Resolvido issue 6, Luiz+Victor