updates to work with Guzzle ~3