Updated machado.
resolved merge conflicts. REMEMBER TO PULL FIRST, JEN