diff --git a/lib/geocoder.rb b/lib/geocoder.rb
index 18ca79480f79e6b51e6e76fface9cf6c7b77d483..692551e8998938ad58aaa4adf3583664c99ccb39 100644
--- a/lib/geocoder.rb
+++ b/lib/geocoder.rb
@@ -70,10 +70,6 @@ module Geocoder
 
   private # -----------------------------------------------------------------
 
-  def config # :nodoc
-    Configuration.instance
-  end
-
   ##
   # Get a Lookup object (which communicates with the remote geocoding API).
   # Takes a search query and returns an IP or street address Lookup
@@ -135,4 +131,3 @@ if defined?(Rails)
   require "geocoder/railtie"
   Geocoder::Railtie.insert
 end
-
diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb
index 17404c109429505da5f60281ab6ad7f78397ca49..f6435283965b6eb6dae9198ff8ad5f21b471ca04 100644
--- a/lib/geocoder/configuration.rb
+++ b/lib/geocoder/configuration.rb
@@ -7,7 +7,7 @@ module Geocoder
   #
   def self.configure(&block)
     if block_given?
-      module_eval(&block)
+      block.call(Configuration.instance)
     else
       Configuration.instance
     end
diff --git a/test/calculations_test.rb b/test/calculations_test.rb
index b1451dd4b6ea3b9bef8343b4ddc4d05e6d25604c..c1be1d58280ced545ae3d65259bee42a64e6d453 100644
--- a/test/calculations_test.rb
+++ b/test/calculations_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 
 class CalculationsTest < Test::Unit::TestCase
   def setup
-    Geocoder.configure do
+    Geocoder.configure do |config|
       config.units  = :mi
       config.distances = :linear
     end
diff --git a/test/configuration_test.rb b/test/configuration_test.rb
index 0b03814374677971dea88ebf3a0c51887feadb73..4137fbf44bf2a8fc6f7e8561f17234944f70e107 100644
--- a/test/configuration_test.rb
+++ b/test/configuration_test.rb
@@ -39,7 +39,7 @@ class ConfigurationTest < Test::Unit::TestCase
   # --- Geocoder#configure distances configuration ---
   def test_geocoder_configuration
     # DSL
-    Geocoder.configure do
+    Geocoder.configure do |config|
       config.units  = :mi
       config.distances = :linear
     end