manual merge and rebased:
1.update my code(teropi) to empatzero's code.
2.apply the rellla's code to avoid conflict.
3.rebased the empat0-teropi to the last rellla's code.