Fixed to use Guzzle 3