diff --git a/Gemfile b/Gemfile
index 18a173e47..77a6e401f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,10 @@ source 'http://gemcutter.org'
 
 gem 'rake'
 gem 'excon', '>= 0.0.21'
-gem 'excon', ">= 0.0.21"
 gem 'formatador', ">= 0.0.10"
 gem 'json', ">= 0"
 gem 'mime-types', ">= 0"
 gem 'nokogiri', ">= 0"
 gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
+gem 'shindo', '>= 0'
diff --git a/lib/fog.rb b/lib/fog.rb
index 845b70f5c..fb8b8674d 100644
--- a/lib/fog.rb
+++ b/lib/fog.rb
@@ -34,9 +34,9 @@ module Fog
       @delay
     end
 
-    def self.set_delay(delay)
-      raise ArgumentError, "delay must be non-negative" unless delay >= 0
-      @delay = delay
+    def self.delay=(new_delay)
+      raise ArgumentError, "delay must be non-negative" unless new_delay >= 0
+      @delay = new_delay
     end
   end