Resolvendo 1157.
Refatorando 1021.
Resolvendo 1041.