diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index dc04efbdc8b455d924e52b0d72f808097341f6ae..72259fef2215494c9caa5bc11916d46e222495ea 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -2,11 +2,16 @@
 
 Per-release changes to Geocoder.
 
+== 1.0.4 (2011 Sep 18)
+
+* Remove klass method from rake task, which could conflict with app methods (thanks github.com/mguterl).
+
 == 1.0.3 (2011 Sep 17)
 
-* Fix: rake assets:precompile (Rails 3.1) not working in some situations.
+* Add support for Google Premier geocoding service (thanks github.com/steveh).
 * Update Google API URL (thanks github.com/soorajb).
 * Allow rescue from timeout with FreeGeoIP (thanks github.com/lukeledet).
+* Fix: rake assets:precompile (Rails 3.1) not working in some situations.
 * Fix: stop double-adjusting units when using kilometers (thanks github.com/hairyheron).
 
 == 1.0.2 (2011 June 25)
diff --git a/lib/geocoder/version.rb b/lib/geocoder/version.rb
index 82a96deded33b815bc3f144bf812a90d435a2dbc..f8b1aecb240934f1a5888ede69ef02492eaaa845 100644
--- a/lib/geocoder/version.rb
+++ b/lib/geocoder/version.rb
@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end
diff --git a/lib/tasks/geocoder.rake b/lib/tasks/geocoder.rake
index b621b0592ce28542c75784f63cfd3d6d7d1acd3f..f235e1b51b2cb047021042a5d4719f3e4233ab40 100644
--- a/lib/tasks/geocoder.rake
+++ b/lib/tasks/geocoder.rake
@@ -1,13 +1,10 @@
-def klass
-  class_name = ENV['CLASS'] || ENV['class']
-  raise "Please specify a CLASS (model)" unless class_name
-  Object.const_get(class_name)
-end
-
 namespace :geocode do
-
   desc "Geocode all objects without coordinates."
   task :all => :environment do
+    class_name = ENV['CLASS'] || ENV['class']
+    raise "Please specify a CLASS (model)" unless class_name
+    klass = Object.const_get(class_name)
+
     klass.not_geocoded.each do |obj|
       obj.geocode; obj.save
     end