Updated machado and wpapi.
Pulling in master branch of machado.