Updated machado and api.
Resolved merge conflict.