Updated machado.
Resolved merge conflicts.