diff --git a/History.txt b/History.txt
index f736e44..84ac527 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,25 @@
+== Version 1.15.2
+
+* Fix for set date (day must go last) (ujifgc)
+* added logic to wrap image in span tag when there is error fields. (Shih-gian Lee)
+* Initial commit of default time implementation. (Shih-gian Lee)
+* default time implementation in form_helpers.rb. (Shih-gian Lee)
+* Fix calendar_date_select helper for searchlogic compatibility (Andrea Frigido)
+* Added Arabic language translations (Abdul-Jabbar Shalabi)
+* rename instance variable. avoid conflict with name (Cyril Mougel)
+* add translation in french (Cyril Mougel)
+* Adding Slovenian sl-sl locale. (Miha Rebernik)
+* Added danish format (Jacob Kjeldahl)
+* translations for NL (Gert van der Spoel)
+* new color scheme 'green' (Gert van der Spoel)
+* Fixed missing translation in polish locales (Witold Rugowski)
+* Added a italian locale (Andrea Frigido)
+* fix time handling (Robert Brown)
+* Added a spanish locale on public/javascripts/calendar_date_select/locale/es.js (kikito)
+* Added description for iso date format (Lars E. Hoeg)
+* Added Danish (da) translation (Lars E. Hoeg)
+* Fixes issue with nil dates and trying to call type on them (Matt Haley)
+
 == Version 1.15.1
  * Bugfix: iso_date fixes (Robert Brown)
 
diff --git a/VERSION b/VERSION
index 3eefcb9..4cda8f1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0
+1.5.2
diff --git a/calendar_date_select.gemspec b/calendar_date_select.gemspec
index 01d0c56..cb25186 100644
--- a/calendar_date_select.gemspec
+++ b/calendar_date_select.gemspec
@@ -1,22 +1,80 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{calendar_date_select}
-  s.version = "1.0.0"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Enrique Garcia Cota (kikito)", "Tim Charper", "Lars E. Hoeg"]
-  s.date = %q{2009-07-29}
+  s.date = %q{2010-03-14}
   s.description = %q{calendar_date_select fork; includes highlighting}
   s.email = %q{egarcia@splendeo.es}
   s.extra_rdoc_files = [
     "README.txt"
   ]
-  s.has_rdoc = true
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "MIT-LICENSE",
+     "Manifest.txt",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "calendar_date_select.gemspec",
+     "init.rb",
+     "js_test/functional/.tmp_cds_test.html",
+     "js_test/functional/cds_test.html",
+     "js_test/functional/format_iso_date_test.html",
+     "js_test/prototype.js",
+     "js_test/test.css",
+     "js_test/unit/cds_helper_methods.html",
+     "js_test/unittest.js",
+     "lib/calendar_date_select.rb",
+     "lib/calendar_date_select/calendar_date_select.rb",
+     "lib/calendar_date_select/form_helpers.rb",
+     "lib/calendar_date_select/includes_helper.rb",
+     "public/blank_iframe.html",
+     "public/images/calendar_date_select/calendar.gif",
+     "public/javascripts/calendar_date_select/calendar_date_select.js",
+     "public/javascripts/calendar_date_select/format_american.js",
+     "public/javascripts/calendar_date_select/format_danish.js",
+     "public/javascripts/calendar_date_select/format_db.js",
+     "public/javascripts/calendar_date_select/format_euro_24hr.js",
+     "public/javascripts/calendar_date_select/format_euro_24hr_ymd.js",
+     "public/javascripts/calendar_date_select/format_finnish.js",
+     "public/javascripts/calendar_date_select/format_hyphen_ampm.js",
+     "public/javascripts/calendar_date_select/format_iso_date.js",
+     "public/javascripts/calendar_date_select/format_italian.js",
+     "public/javascripts/calendar_date_select/locale/ar.js",
+     "public/javascripts/calendar_date_select/locale/da.js",
+     "public/javascripts/calendar_date_select/locale/de.js",
+     "public/javascripts/calendar_date_select/locale/es.js",
+     "public/javascripts/calendar_date_select/locale/fi.js",
+     "public/javascripts/calendar_date_select/locale/fr.js",
+     "public/javascripts/calendar_date_select/locale/it.js",
+     "public/javascripts/calendar_date_select/locale/nl.js",
+     "public/javascripts/calendar_date_select/locale/pl.js",
+     "public/javascripts/calendar_date_select/locale/pt.js",
+     "public/javascripts/calendar_date_select/locale/ru.js",
+     "public/javascripts/calendar_date_select/locale/sl.js",
+     "public/stylesheets/calendar_date_select/blue.css",
+     "public/stylesheets/calendar_date_select/default.css",
+     "public/stylesheets/calendar_date_select/green.css",
+     "public/stylesheets/calendar_date_select/plain.css",
+     "public/stylesheets/calendar_date_select/red.css",
+     "public/stylesheets/calendar_date_select/silver.css",
+     "spec/calendar_date_select/calendar_date_select_spec.rb",
+     "spec/calendar_date_select/form_helpers_spec.rb",
+     "spec/calendar_date_select/includes_helper_spec.rb",
+     "spec/spec_helper.rb"
+  ]
   s.homepage = %q{http://github.com/kikito/calendar_date_select}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{calendar_date_select fork; includes highlighting}
   s.test_files = [
     "spec/calendar_date_select/calendar_date_select_spec.rb",
@@ -27,7 +85,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
diff --git a/lib/calendar_date_select/form_helpers.rb b/lib/calendar_date_select/form_helpers.rb
index 65f5fed..4b6f995 100644
--- a/lib/calendar_date_select/form_helpers.rb
+++ b/lib/calendar_date_select/form_helpers.rb
@@ -86,7 +86,7 @@ module CalendarDateSelect::FormHelpers
   #     :before_close => "log('Calendar closing');" ,
   #     :after_close => "log('Calendar closed');",
   #     :after_navigate => "log('Current month is ' + (param.getMonth()+1) + '/' + (param.getFullYear()));",
-  #     :onchange => "log('value changed to - ' + $F(this));"
+  #     :onchange => "log('value changed to - ' + $F(this));" %>
   # 
   # }}}
   # 
diff --git a/public/javascripts/calendar_date_select/calendar_date_select.js b/public/javascripts/calendar_date_select/calendar_date_select.js
index 7c74713..f026883 100644
--- a/public/javascripts/calendar_date_select/calendar_date_select.js
+++ b/public/javascripts/calendar_date_select/calendar_date_select.js
@@ -360,9 +360,9 @@ CalendarDateSelect.prototype = {
     if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
     if (parts.get("day")) {
       var t_selected_date = this.selected_date, vdc = this.options.get("valid_date_check");
-      for (var x = 0; x<=3; x++) t_selected_date.setDate(parts.get("day"));
       t_selected_date.setYear(parts.get("year"));
       t_selected_date.setMonth(parts.get("month"));
+      t_selected_date.setDate(parts.get("day"));
       
       if (vdc && ! vdc(t_selected_date.stripTime())) { return false; }
       this.selected_date = t_selected_date;