Updated for compatibility with guzzle 3.5.0