Updated to support Faraday 0.9