diff --git a/bin/mhc b/bin/mhc
index 5c791bb..4ec859c 100755
--- a/bin/mhc
+++ b/bin/mhc
@@ -131,7 +131,8 @@ class MhcCLI < Thor
         search_range = nil
       end
       next if task.in_category?("done") && !options[:show_all]
-      todos << task.occurrences(range: search_range).first
+      task_first = task.occurrences(range: search_range).first
+      todos << task_first if task_first
     end
     todos.each.sort{|a, b| a.dtstart <=> b.dtstart}.each do |t|
       deadline = t.dtstart
diff --git a/debian/changelog b/debian/changelog
index fb6a736..f49708c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mhc (1.2.4+git20211028.1.67f9596-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * Drop patch 030_expr-compile.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 29 May 2022 10:14:52 -0000
+
 mhc (1.2.4-5) unstable; urgency=medium
 
   * Update no-native-compile handling
diff --git a/debian/patches/010_rubygems.patch b/debian/patches/010_rubygems.patch
index 3b4eef7..7369449 100644
--- a/debian/patches/010_rubygems.patch
+++ b/debian/patches/010_rubygems.patch
@@ -1,20 +1,15 @@
 Subject: Drop rubygems dependency
 Author: Tatsuya Kinoshita <tats@debian.org>
 
-diff --git a/bin/mhc b/bin/mhc
-index f20174b..606e993 100755
---- a/bin/mhc
-+++ b/bin/mhc
-@@ -15,14 +15,14 @@ if File.symlink?(__FILE__) and ENV["RBENV_VERSION"]
+Index: mhc/bin/mhc
+===================================================================
+--- mhc.orig/bin/mhc
++++ mhc/bin/mhc
+@@ -15,14 +15,14 @@ if File.symlink?(__FILE__) and ENV["RBEN
    exec(File.readlink(__FILE__), *ARGV)
  end
  
 -gemfile = File.expand_path("../../Gemfile", __FILE__)
--
--if File.exists?(gemfile + ".lock")
--  ENV["BUNDLE_GEMFILE"] = gemfile
--  require "bundler/setup"
--end
 +#gemfile = File.expand_path("../../Gemfile", __FILE__)
 +#
 +#if File.exists?(gemfile + ".lock")
@@ -22,6 +17,11 @@ index f20174b..606e993 100755
 +#  require "bundler/setup"
 +#end
  
+-if File.exists?(gemfile + ".lock")
+-  ENV["BUNDLE_GEMFILE"] = gemfile
+-  require "bundler/setup"
+-end
+-
 -require "rubygems"
 +#require "rubygems"
  require "thor"
diff --git a/debian/patches/020_rical.patch b/debian/patches/020_rical.patch
index 715a981..f0aa39a 100644
--- a/debian/patches/020_rical.patch
+++ b/debian/patches/020_rical.patch
@@ -1,10 +1,10 @@
 Subject: Import forked ri_cal into lib/mhc
 Origin: upstream, https://github.com/yoshinari-nomura/ri_cal/commit/cdb1f7532f19c6f0ef2f3956dae84e8180ba6c6d
 
-diff --git a/lib/mhc.rb b/lib/mhc.rb
-index ffcdf9f..f400a92 100644
---- a/lib/mhc.rb
-+++ b/lib/mhc.rb
+Index: mhc/lib/mhc.rb
+===================================================================
+--- mhc.orig/lib/mhc.rb
++++ mhc/lib/mhc.rb
 @@ -1,5 +1,5 @@
  require 'tzinfo'
 -require 'ri_cal'
@@ -12,11 +12,10 @@ index ffcdf9f..f400a92 100644
  require "kconv"
  
  ## Monkey patch to the original RiCal https://github.com/rubyredrick/ri_cal
-diff --git a/lib/mhc/ri_cal.rb b/lib/mhc/ri_cal.rb
-new file mode 100644
-index 0000000..b293668
+Index: mhc/lib/mhc/ri_cal.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal.rb
++++ mhc/lib/mhc/ri_cal.rb
 @@ -0,0 +1,187 @@
 +#- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
 +#
@@ -205,11 +204,10 @@ index 0000000..b293668
 +
 +#RiCal.require_all_libs_relative_to(__FILE__)
 +# EOF
-diff --git a/lib/mhc/ri_cal/component.rb b/lib/mhc/ri_cal/component.rb
-new file mode 100644
-index 0000000..a5e1fc5
+Index: mhc/lib/mhc/ri_cal/component.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component.rb
++++ mhc/lib/mhc/ri_cal/component.rb
 @@ -0,0 +1,256 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
@@ -467,11 +465,10 @@ index 0000000..a5e1fc5
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/component/alarm.rb b/lib/mhc/ri_cal/component/alarm.rb
-new file mode 100644
-index 0000000..aa824a1
+Index: mhc/lib/mhc/ri_cal/component/alarm.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/alarm.rb
++++ mhc/lib/mhc/ri_cal/component/alarm.rb
 @@ -0,0 +1,19 @@
 +module RiCal
 +
@@ -493,11 +490,10 @@ index 0000000..aa824a1
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/component/calendar.rb b/lib/mhc/ri_cal/component/calendar.rb
-new file mode 100644
-index 0000000..a327625
+Index: mhc/lib/mhc/ri_cal/component/calendar.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/calendar.rb
++++ mhc/lib/mhc/ri_cal/component/calendar.rb
 @@ -0,0 +1,257 @@
 +module RiCal
 +  class Component
@@ -756,11 +752,10 @@ index 0000000..a327625
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/component/event.rb b/lib/mhc/ri_cal/component/event.rb
-new file mode 100644
-index 0000000..a083cc1
+Index: mhc/lib/mhc/ri_cal/component/event.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/event.rb
++++ mhc/lib/mhc/ri_cal/component/event.rb
 @@ -0,0 +1,58 @@
 +module RiCal
 +  class Component
@@ -821,11 +816,10 @@ index 0000000..a083cc1
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/component/freebusy.rb b/lib/mhc/ri_cal/component/freebusy.rb
-new file mode 100644
-index 0000000..268afeb
+Index: mhc/lib/mhc/ri_cal/component/freebusy.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/freebusy.rb
++++ mhc/lib/mhc/ri_cal/component/freebusy.rb
 @@ -0,0 +1,16 @@
 +module RiCal
 +  class Component
@@ -844,11 +838,10 @@ index 0000000..268afeb
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/component/journal.rb b/lib/mhc/ri_cal/component/journal.rb
-new file mode 100644
-index 0000000..67d28c8
+Index: mhc/lib/mhc/ri_cal/component/journal.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/journal.rb
++++ mhc/lib/mhc/ri_cal/component/journal.rb
 @@ -0,0 +1,27 @@
 +module RiCal
 +  class Component
@@ -877,11 +870,10 @@ index 0000000..67d28c8
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/component/non_standard.rb b/lib/mhc/ri_cal/component/non_standard.rb
-new file mode 100644
-index 0000000..ba7bae4
+Index: mhc/lib/mhc/ri_cal/component/non_standard.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/non_standard.rb
++++ mhc/lib/mhc/ri_cal/component/non_standard.rb
 @@ -0,0 +1,33 @@
 +module RiCal
 +
@@ -917,11 +909,10 @@ index 0000000..ba7bae4
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/component/t_z_info_timezone.rb b/lib/mhc/ri_cal/component/t_z_info_timezone.rb
-new file mode 100644
-index 0000000..d852e24
+Index: mhc/lib/mhc/ri_cal/component/t_z_info_timezone.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/t_z_info_timezone.rb
++++ mhc/lib/mhc/ri_cal/component/t_z_info_timezone.rb
 @@ -0,0 +1,153 @@
 +#- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
 +#
@@ -1077,11 +1068,10 @@ index 0000000..d852e24
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/component/timezone.rb b/lib/mhc/ri_cal/component/timezone.rb
-new file mode 100644
-index 0000000..35f25aa
+Index: mhc/lib/mhc/ri_cal/component/timezone.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/timezone.rb
++++ mhc/lib/mhc/ri_cal/component/timezone.rb
 @@ -0,0 +1,197 @@
 +module RiCal
 +  class Component
@@ -1280,11 +1270,10 @@ index 0000000..35f25aa
 +end
 +
 +
-diff --git a/lib/mhc/ri_cal/component/timezone/daylight_period.rb b/lib/mhc/ri_cal/component/timezone/daylight_period.rb
-new file mode 100644
-index 0000000..91f4f74
+Index: mhc/lib/mhc/ri_cal/component/timezone/daylight_period.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/timezone/daylight_period.rb
++++ mhc/lib/mhc/ri_cal/component/timezone/daylight_period.rb
 @@ -0,0 +1,25 @@
 +module RiCal
 +  class Component
@@ -1312,11 +1301,10 @@ index 0000000..91f4f74
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/component/timezone/standard_period.rb b/lib/mhc/ri_cal/component/timezone/standard_period.rb
-new file mode 100644
-index 0000000..3efd30d
+Index: mhc/lib/mhc/ri_cal/component/timezone/standard_period.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/timezone/standard_period.rb
++++ mhc/lib/mhc/ri_cal/component/timezone/standard_period.rb
 @@ -0,0 +1,23 @@
 +module RiCal
 +  class Component
@@ -1342,11 +1330,10 @@ index 0000000..3efd30d
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/component/timezone/timezone_period.rb b/lib/mhc/ri_cal/component/timezone/timezone_period.rb
-new file mode 100644
-index 0000000..132353d
+Index: mhc/lib/mhc/ri_cal/component/timezone/timezone_period.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/timezone/timezone_period.rb
++++ mhc/lib/mhc/ri_cal/component/timezone/timezone_period.rb
 @@ -0,0 +1,76 @@
 +module RiCal
 +  class Component
@@ -1424,11 +1411,10 @@ index 0000000..132353d
 +  end
 +end
 +
-diff --git a/lib/mhc/ri_cal/component/todo.rb b/lib/mhc/ri_cal/component/todo.rb
-new file mode 100644
-index 0000000..24ce654
+Index: mhc/lib/mhc/ri_cal/component/todo.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/component/todo.rb
++++ mhc/lib/mhc/ri_cal/component/todo.rb
 @@ -0,0 +1,42 @@
 +module RiCal
 +  class Component
@@ -1472,11 +1458,10 @@ index 0000000..24ce654
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/core_extensions.rb b/lib/mhc/ri_cal/core_extensions.rb
-new file mode 100644
-index 0000000..24b40c6
+Index: mhc/lib/mhc/ri_cal/core_extensions.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions.rb
++++ mhc/lib/mhc/ri_cal/core_extensions.rb
 @@ -0,0 +1,11 @@
 +#- ©2009 Rick DeNatale
 +#- All rights reserved. Refer to the file README.txt for the license
@@ -1489,11 +1474,10 @@ index 0000000..24b40c6
 +require "ri_cal/core_extensions/string.rb"
 +require "ri_cal/core_extensions/time.rb"
 +
-diff --git a/lib/mhc/ri_cal/core_extensions/array.rb b/lib/mhc/ri_cal/core_extensions/array.rb
-new file mode 100644
-index 0000000..b3ddd50
+Index: mhc/lib/mhc/ri_cal/core_extensions/array.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/array.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/array.rb
 @@ -0,0 +1,7 @@
 +require "ri_cal/core_extensions/array/conversions.rb"
 +class Array #:nodoc:
@@ -1503,11 +1487,10 @@ index 0000000..b3ddd50
 +  include RiCal::CoreExtensions::Array::Conversions
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/array/conversions.rb b/lib/mhc/ri_cal/core_extensions/array/conversions.rb
-new file mode 100644
-index 0000000..dc947b8
+Index: mhc/lib/mhc/ri_cal/core_extensions/array/conversions.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/array/conversions.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/array/conversions.rb
 @@ -0,0 +1,15 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -1525,11 +1508,10 @@ index 0000000..dc947b8
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/date.rb b/lib/mhc/ri_cal/core_extensions/date.rb
-new file mode 100644
-index 0000000..6186a27
+Index: mhc/lib/mhc/ri_cal/core_extensions/date.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/date.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/date.rb
 @@ -0,0 +1,13 @@
 +require "ri_cal/core_extensions/date/conversions.rb"
 +require "ri_cal/core_extensions/time/week_day_predicates.rb"
@@ -1544,11 +1526,10 @@ index 0000000..6186a27
 +  include RiCal::CoreExtensions::Time::Calculations
 +  include RiCal::CoreExtensions::Date::Conversions
 +end
-diff --git a/lib/mhc/ri_cal/core_extensions/date/conversions.rb b/lib/mhc/ri_cal/core_extensions/date/conversions.rb
-new file mode 100644
-index 0000000..5d70a9d
+Index: mhc/lib/mhc/ri_cal/core_extensions/date/conversions.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/date/conversions.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/date/conversions.rb
 @@ -0,0 +1,56 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -1607,11 +1588,10 @@ index 0000000..5d70a9d
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/date_time.rb b/lib/mhc/ri_cal/core_extensions/date_time.rb
-new file mode 100644
-index 0000000..e5357c7
+Index: mhc/lib/mhc/ri_cal/core_extensions/date_time.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/date_time.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/date_time.rb
 @@ -0,0 +1,15 @@
 +require "ri_cal/core_extensions/date_time/conversions.rb"
 +require "ri_cal/core_extensions/time/tzid_access.rb"
@@ -1629,11 +1609,10 @@ index 0000000..e5357c7
 +  include RiCal::CoreExtensions::DateTime::Conversions
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/date_time/conversions.rb b/lib/mhc/ri_cal/core_extensions/date_time/conversions.rb
-new file mode 100644
-index 0000000..6f0acf2
+Index: mhc/lib/mhc/ri_cal/core_extensions/date_time/conversions.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/date_time/conversions.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/date_time/conversions.rb
 @@ -0,0 +1,50 @@
 +require 'date'
 +module RiCal
@@ -1686,11 +1665,10 @@ index 0000000..6f0acf2
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/object.rb b/lib/mhc/ri_cal/core_extensions/object.rb
-new file mode 100644
-index 0000000..7308af6
+Index: mhc/lib/mhc/ri_cal/core_extensions/object.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/object.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/object.rb
 @@ -0,0 +1,8 @@
 +require "ri_cal/core_extensions/object/conversions.rb"
 +
@@ -1701,11 +1679,10 @@ index 0000000..7308af6
 +  include RiCal::CoreExtensions::Object::Conversions
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/object/conversions.rb b/lib/mhc/ri_cal/core_extensions/object/conversions.rb
-new file mode 100644
-index 0000000..011fa68
+Index: mhc/lib/mhc/ri_cal/core_extensions/object/conversions.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/object/conversions.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/object/conversions.rb
 @@ -0,0 +1,20 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -1728,11 +1705,10 @@ index 0000000..011fa68
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/string.rb b/lib/mhc/ri_cal/core_extensions/string.rb
-new file mode 100644
-index 0000000..65b5b19
+Index: mhc/lib/mhc/ri_cal/core_extensions/string.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/string.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/string.rb
 @@ -0,0 +1,8 @@
 +require "ri_cal/core_extensions/string/conversions.rb"
 +
@@ -1743,11 +1719,10 @@ index 0000000..65b5b19
 +  include RiCal::CoreExtensions::String::Conversions
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/string/conversions.rb b/lib/mhc/ri_cal/core_extensions/string/conversions.rb
-new file mode 100644
-index 0000000..a07f29f
+Index: mhc/lib/mhc/ri_cal/core_extensions/string/conversions.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/string/conversions.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/string/conversions.rb
 @@ -0,0 +1,57 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -1807,11 +1782,10 @@ index 0000000..a07f29f
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/time.rb b/lib/mhc/ri_cal/core_extensions/time.rb
-new file mode 100644
-index 0000000..c7da24a
+Index: mhc/lib/mhc/ri_cal/core_extensions/time.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/time.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/time.rb
 @@ -0,0 +1,14 @@
 +#- ©2009 Rick DeNatale
 +#- All rights reserved. Refer to the file README.txt for the license
@@ -1828,11 +1802,10 @@ index 0000000..c7da24a
 +  include RiCal::CoreExtensions::Time::TzidAccess
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/time/calculations.rb b/lib/mhc/ri_cal/core_extensions/time/calculations.rb
-new file mode 100644
-index 0000000..dffd096
+Index: mhc/lib/mhc/ri_cal/core_extensions/time/calculations.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/time/calculations.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/time/calculations.rb
 @@ -0,0 +1,153 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -1988,11 +1961,10 @@ index 0000000..dffd096
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/time/conversions.rb b/lib/mhc/ri_cal/core_extensions/time/conversions.rb
-new file mode 100644
-index 0000000..2734607
+Index: mhc/lib/mhc/ri_cal/core_extensions/time/conversions.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/time/conversions.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/time/conversions.rb
 @@ -0,0 +1,42 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -2037,11 +2009,10 @@ index 0000000..2734607
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/time/tzid_access.rb b/lib/mhc/ri_cal/core_extensions/time/tzid_access.rb
-new file mode 100644
-index 0000000..962a448
+Index: mhc/lib/mhc/ri_cal/core_extensions/time/tzid_access.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/time/tzid_access.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/time/tzid_access.rb
 @@ -0,0 +1,50 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -2094,11 +2065,10 @@ index 0000000..962a448
 +  RiCal::TimeWithZone.class_eval {include RiCal::TimeWithZoneExtension}
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/core_extensions/time/week_day_predicates.rb b/lib/mhc/ri_cal/core_extensions/time/week_day_predicates.rb
-new file mode 100644
-index 0000000..271acd3
+Index: mhc/lib/mhc/ri_cal/core_extensions/time/week_day_predicates.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/core_extensions/time/week_day_predicates.rb
++++ mhc/lib/mhc/ri_cal/core_extensions/time/week_day_predicates.rb
 @@ -0,0 +1,55 @@
 +module RiCal
 +  module CoreExtensions #:nodoc:
@@ -2156,11 +2126,10 @@ index 0000000..271acd3
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/fast_date_time.rb b/lib/mhc/ri_cal/fast_date_time.rb
-new file mode 100644
-index 0000000..edea091
+Index: mhc/lib/mhc/ri_cal/fast_date_time.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/fast_date_time.rb
++++ mhc/lib/mhc/ri_cal/fast_date_time.rb
 @@ -0,0 +1,234 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale
@@ -2397,11 +2366,10 @@ index 0000000..edea091
 +
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/floating_timezone.rb b/lib/mhc/ri_cal/floating_timezone.rb
-new file mode 100644
-index 0000000..b652645
+Index: mhc/lib/mhc/ri_cal/floating_timezone.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/floating_timezone.rb
++++ mhc/lib/mhc/ri_cal/floating_timezone.rb
 @@ -0,0 +1,32 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale
@@ -2436,11 +2404,10 @@ index 0000000..b652645
 +
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/invalid_property_value.rb b/lib/mhc/ri_cal/invalid_property_value.rb
-new file mode 100644
-index 0000000..1849ea0
+Index: mhc/lib/mhc/ri_cal/invalid_property_value.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/invalid_property_value.rb
++++ mhc/lib/mhc/ri_cal/invalid_property_value.rb
 @@ -0,0 +1,8 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale
@@ -2450,11 +2417,10 @@ index 0000000..1849ea0
 +  class InvalidPropertyValue < StandardError
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/invalid_timezone_identifier.rb b/lib/mhc/ri_cal/invalid_timezone_identifier.rb
-new file mode 100644
-index 0000000..20cc08c
+Index: mhc/lib/mhc/ri_cal/invalid_timezone_identifier.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/invalid_timezone_identifier.rb
++++ mhc/lib/mhc/ri_cal/invalid_timezone_identifier.rb
 @@ -0,0 +1,20 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale
@@ -2476,11 +2442,10 @@ index 0000000..20cc08c
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/occurrence_enumerator.rb b/lib/mhc/ri_cal/occurrence_enumerator.rb
-new file mode 100644
-index 0000000..ed3f0e8
+Index: mhc/lib/mhc/ri_cal/occurrence_enumerator.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/occurrence_enumerator.rb
++++ mhc/lib/mhc/ri_cal/occurrence_enumerator.rb
 @@ -0,0 +1,265 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale
@@ -2748,11 +2713,10 @@ index 0000000..ed3f0e8
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/occurrence_period.rb b/lib/mhc/ri_cal/occurrence_period.rb
-new file mode 100644
-index 0000000..5d417d5
+Index: mhc/lib/mhc/ri_cal/occurrence_period.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/occurrence_period.rb
++++ mhc/lib/mhc/ri_cal/occurrence_period.rb
 @@ -0,0 +1,17 @@
 +module RiCal
 +  class OccurrencePeriod
@@ -2772,11 +2736,10 @@ index 0000000..5d417d5
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/parser.rb b/lib/mhc/ri_cal/parser.rb
-new file mode 100644
-index 0000000..99d3dd1
+Index: mhc/lib/mhc/ri_cal/parser.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/parser.rb
++++ mhc/lib/mhc/ri_cal/parser.rb
 @@ -0,0 +1,145 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale
@@ -2924,11 +2887,10 @@ index 0000000..99d3dd1
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/properties.rb b/lib/mhc/ri_cal/properties.rb
-new file mode 100644
-index 0000000..b91dd44
+Index: mhc/lib/mhc/ri_cal/properties.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties.rb
++++ mhc/lib/mhc/ri_cal/properties.rb
 @@ -0,0 +1,12 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -2943,11 +2905,10 @@ index 0000000..b91dd44
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/properties/alarm.rb b/lib/mhc/ri_cal/properties/alarm.rb
-new file mode 100644
-index 0000000..d2cd16e
+Index: mhc/lib/mhc/ri_cal/properties/alarm.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/alarm.rb
++++ mhc/lib/mhc/ri_cal/properties/alarm.rb
 @@ -0,0 +1,390 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -3339,11 +3300,10 @@ index 0000000..d2cd16e
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/properties/calendar.rb b/lib/mhc/ri_cal/properties/calendar.rb
-new file mode 100644
-index 0000000..dd10e55
+Index: mhc/lib/mhc/ri_cal/properties/calendar.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/calendar.rb
++++ mhc/lib/mhc/ri_cal/properties/calendar.rb
 @@ -0,0 +1,164 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -3509,11 +3469,10 @@ index 0000000..dd10e55
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/properties/event.rb b/lib/mhc/ri_cal/properties/event.rb
-new file mode 100644
-index 0000000..c6e43e9
+Index: mhc/lib/mhc/ri_cal/properties/event.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/event.rb
++++ mhc/lib/mhc/ri_cal/properties/event.rb
 @@ -0,0 +1,1523 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -5038,11 +4997,10 @@ index 0000000..c6e43e9
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/properties/freebusy.rb b/lib/mhc/ri_cal/properties/freebusy.rb
-new file mode 100644
-index 0000000..04eb2e3
+Index: mhc/lib/mhc/ri_cal/properties/freebusy.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/freebusy.rb
++++ mhc/lib/mhc/ri_cal/properties/freebusy.rb
 @@ -0,0 +1,593 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -5637,11 +5595,10 @@ index 0000000..04eb2e3
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/properties/journal.rb b/lib/mhc/ri_cal/properties/journal.rb
-new file mode 100644
-index 0000000..86e5c28
+Index: mhc/lib/mhc/ri_cal/properties/journal.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/journal.rb
++++ mhc/lib/mhc/ri_cal/properties/journal.rb
 @@ -0,0 +1,1237 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -6880,11 +6837,10 @@ index 0000000..86e5c28
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/properties/timezone.rb b/lib/mhc/ri_cal/properties/timezone.rb
-new file mode 100644
-index 0000000..aebc5bf
+Index: mhc/lib/mhc/ri_cal/properties/timezone.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/timezone.rb
++++ mhc/lib/mhc/ri_cal/properties/timezone.rb
 @@ -0,0 +1,150 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -7036,11 +6992,10 @@ index 0000000..aebc5bf
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/properties/timezone_period.rb b/lib/mhc/ri_cal/properties/timezone_period.rb
-new file mode 100644
-index 0000000..77d790d
+Index: mhc/lib/mhc/ri_cal/properties/timezone_period.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/timezone_period.rb
++++ mhc/lib/mhc/ri_cal/properties/timezone_period.rb
 @@ -0,0 +1,416 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -7458,11 +7413,10 @@ index 0000000..77d790d
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/properties/todo.rb b/lib/mhc/ri_cal/properties/todo.rb
-new file mode 100644
-index 0000000..2ffdb28
+Index: mhc/lib/mhc/ri_cal/properties/todo.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/properties/todo.rb
++++ mhc/lib/mhc/ri_cal/properties/todo.rb
 @@ -0,0 +1,1559 @@
 +module RiCal
 +  module Properties #:nodoc:
@@ -9023,11 +8977,10 @@ index 0000000..2ffdb28
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/property_value.rb b/lib/mhc/ri_cal/property_value.rb
-new file mode 100644
-index 0000000..3ecaed4
+Index: mhc/lib/mhc/ri_cal/property_value.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value.rb
++++ mhc/lib/mhc/ri_cal/property_value.rb
 @@ -0,0 +1,159 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
@@ -9188,11 +9141,10 @@ index 0000000..3ecaed4
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/property_value/array.rb b/lib/mhc/ri_cal/property_value/array.rb
-new file mode 100644
-index 0000000..3af86e7
+Index: mhc/lib/mhc/ri_cal/property_value/array.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/array.rb
++++ mhc/lib/mhc/ri_cal/property_value/array.rb
 @@ -0,0 +1,27 @@
 +module RiCal
 +  class PropertyValue
@@ -9222,11 +9174,10 @@ index 0000000..3af86e7
 +
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/cal_address.rb b/lib/mhc/ri_cal/property_value/cal_address.rb
-new file mode 100644
-index 0000000..c17db71
+Index: mhc/lib/mhc/ri_cal/property_value/cal_address.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/cal_address.rb
++++ mhc/lib/mhc/ri_cal/property_value/cal_address.rb
 @@ -0,0 +1,11 @@
 +module RiCal
 +  class PropertyValue
@@ -9240,11 +9191,10 @@ index 0000000..c17db71
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/date.rb b/lib/mhc/ri_cal/property_value/date.rb
-new file mode 100644
-index 0000000..8bbbf63
+Index: mhc/lib/mhc/ri_cal/property_value/date.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/date.rb
++++ mhc/lib/mhc/ri_cal/property_value/date.rb
 @@ -0,0 +1,184 @@
 +require 'date'
 +module RiCal
@@ -9431,11 +9381,10 @@ index 0000000..8bbbf63
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/date_time.rb b/lib/mhc/ri_cal/property_value/date_time.rb
-new file mode 100644
-index 0000000..88327e6
+Index: mhc/lib/mhc/ri_cal/property_value/date_time.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/date_time.rb
++++ mhc/lib/mhc/ri_cal/property_value/date_time.rb
 @@ -0,0 +1,359 @@
 +require 'date'
 +module RiCal
@@ -9797,11 +9746,10 @@ index 0000000..88327e6
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/date_time/additive_methods.rb b/lib/mhc/ri_cal/property_value/date_time/additive_methods.rb
-new file mode 100644
-index 0000000..122bac8
+Index: mhc/lib/mhc/ri_cal/property_value/date_time/additive_methods.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/date_time/additive_methods.rb
++++ mhc/lib/mhc/ri_cal/property_value/date_time/additive_methods.rb
 @@ -0,0 +1,44 @@
 +module RiCal
 +  class PropertyValue
@@ -9848,11 +9796,10 @@ index 0000000..122bac8
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/date_time/time_machine.rb b/lib/mhc/ri_cal/property_value/date_time/time_machine.rb
-new file mode 100644
-index 0000000..61082d8
+Index: mhc/lib/mhc/ri_cal/property_value/date_time/time_machine.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/date_time/time_machine.rb
++++ mhc/lib/mhc/ri_cal/property_value/date_time/time_machine.rb
 @@ -0,0 +1,159 @@
 +module RiCal
 +  class PropertyValue
@@ -10014,11 +9961,10 @@ index 0000000..61082d8
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/date_time/timezone_support.rb b/lib/mhc/ri_cal/property_value/date_time/timezone_support.rb
-new file mode 100644
-index 0000000..ff321a7
+Index: mhc/lib/mhc/ri_cal/property_value/date_time/timezone_support.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/date_time/timezone_support.rb
++++ mhc/lib/mhc/ri_cal/property_value/date_time/timezone_support.rb
 @@ -0,0 +1,100 @@
 +module RiCal
 +  class PropertyValue
@@ -10121,11 +10067,10 @@ index 0000000..ff321a7
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/duration.rb b/lib/mhc/ri_cal/property_value/duration.rb
-new file mode 100644
-index 0000000..c9ef70e
+Index: mhc/lib/mhc/ri_cal/property_value/duration.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/duration.rb
++++ mhc/lib/mhc/ri_cal/property_value/duration.rb
 @@ -0,0 +1,110 @@
 +module RiCal
 +  class PropertyValue
@@ -10238,11 +10183,10 @@ index 0000000..c9ef70e
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/geo.rb b/lib/mhc/ri_cal/property_value/geo.rb
-new file mode 100644
-index 0000000..08b4719
+Index: mhc/lib/mhc/ri_cal/property_value/geo.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/geo.rb
++++ mhc/lib/mhc/ri_cal/property_value/geo.rb
 @@ -0,0 +1,11 @@
 +module RiCal
 +  class PropertyValue
@@ -10256,11 +10200,10 @@ index 0000000..08b4719
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/integer.rb b/lib/mhc/ri_cal/property_value/integer.rb
-new file mode 100644
-index 0000000..53742fe
+Index: mhc/lib/mhc/ri_cal/property_value/integer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/integer.rb
++++ mhc/lib/mhc/ri_cal/property_value/integer.rb
 @@ -0,0 +1,12 @@
 +module RiCal
 +  class PropertyValue
@@ -10275,11 +10218,10 @@ index 0000000..53742fe
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/occurrence_list.rb b/lib/mhc/ri_cal/property_value/occurrence_list.rb
-new file mode 100644
-index 0000000..d9626ca
+Index: mhc/lib/mhc/ri_cal/property_value/occurrence_list.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/occurrence_list.rb
++++ mhc/lib/mhc/ri_cal/property_value/occurrence_list.rb
 @@ -0,0 +1,155 @@
 +# -*- coding: utf-8 -*-
 +module RiCal
@@ -10436,11 +10378,10 @@ index 0000000..d9626ca
 +
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/property_value/period.rb b/lib/mhc/ri_cal/property_value/period.rb
-new file mode 100644
-index 0000000..cf0aeb6
+Index: mhc/lib/mhc/ri_cal/property_value/period.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/period.rb
++++ mhc/lib/mhc/ri_cal/property_value/period.rb
 @@ -0,0 +1,86 @@
 +module RiCal
 +  class PropertyValue
@@ -10529,11 +10470,10 @@ index 0000000..cf0aeb6
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule.rb b/lib/mhc/ri_cal/property_value/recurrence_rule.rb
-new file mode 100644
-index 0000000..e4dbae8
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule.rb
 @@ -0,0 +1,154 @@
 +module RiCal
 +  class PropertyValue
@@ -10690,11 +10630,10 @@ index 0000000..e4dbae8
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb
-new file mode 100644
-index 0000000..7fdfbe5
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb
 @@ -0,0 +1,100 @@
 +module RiCal
 +  class PropertyValue
@@ -10797,11 +10736,10 @@ index 0000000..7fdfbe5
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/enumerator.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/enumerator.rb
-new file mode 100644
-index 0000000..912bfc2
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/enumerator.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/enumerator.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/enumerator.rb
 @@ -0,0 +1,79 @@
 +module RiCal
 +  class PropertyValue
@@ -10882,11 +10820,10 @@ index 0000000..912bfc2
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/initialization_methods.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/initialization_methods.rb
-new file mode 100644
-index 0000000..8611d2f
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/initialization_methods.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/initialization_methods.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/initialization_methods.rb
 @@ -0,0 +1,148 @@
 +module RiCal
 +  class PropertyValue
@@ -11037,11 +10974,10 @@ index 0000000..8611d2f
 +    end
 +  end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb
-new file mode 100644
-index 0000000..b8b660b
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb
 @@ -0,0 +1,53 @@
 +module RiCal
 +  class PropertyValue
@@ -11096,11 +11032,10 @@ index 0000000..b8b660b
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/numbered_span.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/numbered_span.rb
-new file mode 100644
-index 0000000..1e1fc93
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/numbered_span.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/numbered_span.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/numbered_span.rb
 @@ -0,0 +1,31 @@
 +module RiCal
 +  class PropertyValue
@@ -11134,11 +11069,10 @@ index 0000000..1e1fc93
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer.rb
-new file mode 100644
-index 0000000..8f9b435
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer.rb
 @@ -0,0 +1,135 @@
 +module RiCal
 +  class PropertyValue
@@ -11276,11 +11210,10 @@ index 0000000..8f9b435
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb
-new file mode 100644
-index 0000000..e11bee2
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb
 @@ -0,0 +1,86 @@
 +module RiCal
 +  class PropertyValue
@@ -11369,11 +11302,10 @@ index 0000000..e11bee2
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_hour_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_hour_incrementer.rb
-new file mode 100644
-index 0000000..fdb0682
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_hour_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_hour_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_hour_incrementer.rb
 @@ -0,0 +1,31 @@
 +module RiCal
 +  class PropertyValue
@@ -11407,11 +11339,10 @@ index 0000000..fdb0682
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_minute_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_minute_incrementer.rb
-new file mode 100644
-index 0000000..eec23ec
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_minute_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_minute_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_minute_incrementer.rb
 @@ -0,0 +1,32 @@
 +module RiCal
 +  class PropertyValue
@@ -11446,11 +11377,10 @@ index 0000000..eec23ec
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_month_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_month_incrementer.rb
-new file mode 100644
-index 0000000..fb64037
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_month_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_month_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_month_incrementer.rb
 @@ -0,0 +1,52 @@
 +module RiCal
 +  class PropertyValue
@@ -11505,11 +11435,10 @@ index 0000000..fb64037
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb
-new file mode 100644
-index 0000000..95e66d7
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb
 @@ -0,0 +1,31 @@
 +module RiCal
 +  class PropertyValue
@@ -11543,11 +11472,10 @@ index 0000000..95e66d7
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb
-new file mode 100644
-index 0000000..3ac2bc6
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb
 @@ -0,0 +1,38 @@
 +module RiCal
 +  class PropertyValue
@@ -11588,11 +11516,10 @@ index 0000000..3ac2bc6
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_second_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_second_incrementer.rb
-new file mode 100644
-index 0000000..2c09e9d
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_second_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_second_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_second_incrementer.rb
 @@ -0,0 +1,32 @@
 +module RiCal
 +  class PropertyValue
@@ -11627,11 +11554,10 @@ index 0000000..2c09e9d
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb
-new file mode 100644
-index 0000000..750171d
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb
 @@ -0,0 +1,69 @@
 +module RiCal
 +  class PropertyValue
@@ -11703,11 +11629,10 @@ index 0000000..750171d
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_yearday_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_yearday_incrementer.rb
-new file mode 100644
-index 0000000..c0c8bff
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_yearday_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_yearday_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_yearday_incrementer.rb
 @@ -0,0 +1,31 @@
 +module RiCal
 +  class PropertyValue
@@ -11741,11 +11666,10 @@ index 0000000..c0c8bff
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/daily_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/daily_incrementer.rb
-new file mode 100644
-index 0000000..3783c4f
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/daily_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/daily_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/daily_incrementer.rb
 @@ -0,0 +1,28 @@
 +module RiCal
 +  class PropertyValue
@@ -11776,11 +11700,10 @@ index 0000000..3783c4f
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb
-new file mode 100644
-index 0000000..1d38d22
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb
 @@ -0,0 +1,80 @@
 +module RiCal
 +  class PropertyValue
@@ -11862,11 +11785,10 @@ index 0000000..1d38d22
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/hourly_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/hourly_incrementer.rb
-new file mode 100644
-index 0000000..ecf6864
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/hourly_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/hourly_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/hourly_incrementer.rb
 @@ -0,0 +1,23 @@
 +module RiCal
 +  class PropertyValue
@@ -11892,11 +11814,10 @@ index 0000000..ecf6864
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb
-new file mode 100644
-index 0000000..db325bf
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb
 @@ -0,0 +1,106 @@
 +module RiCal
 +  class PropertyValue
@@ -12004,11 +11925,10 @@ index 0000000..db325bf
 +  end
 +end
 +
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/minutely_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/minutely_incrementer.rb
-new file mode 100644
-index 0000000..fb57012
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/minutely_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/minutely_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/minutely_incrementer.rb
 @@ -0,0 +1,23 @@
 +module RiCal
 +  class PropertyValue
@@ -12033,11 +11953,10 @@ index 0000000..fb57012
 +    end
 +  end
 +end
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/monthly_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/monthly_incrementer.rb
-new file mode 100644
-index 0000000..c7f04b5
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/monthly_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/monthly_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/monthly_incrementer.rb
 @@ -0,0 +1,33 @@
 +module RiCal
 +  class PropertyValue
@@ -12073,11 +11992,10 @@ index 0000000..c7f04b5
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/null_sub_cycle_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/null_sub_cycle_incrementer.rb
-new file mode 100644
-index 0000000..e0ce316
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/null_sub_cycle_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/null_sub_cycle_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/null_sub_cycle_incrementer.rb
 @@ -0,0 +1,43 @@
 +module RiCal
 +  class PropertyValue
@@ -12122,11 +12040,10 @@ index 0000000..e0ce316
 +  end
 +end
 +
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/secondly_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/secondly_incrementer.rb
-new file mode 100644
-index 0000000..9ca5d03
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/secondly_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/secondly_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/secondly_incrementer.rb
 @@ -0,0 +1,28 @@
 +module RiCal
 +  class PropertyValue
@@ -12157,11 +12074,10 @@ index 0000000..9ca5d03
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/weekly_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/weekly_incrementer.rb
-new file mode 100644
-index 0000000..17e819f
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/weekly_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/weekly_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/weekly_incrementer.rb
 @@ -0,0 +1,37 @@
 +module RiCal
 +  class PropertyValue
@@ -12201,11 +12117,10 @@ index 0000000..17e819f
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/yearly_incrementer.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/yearly_incrementer.rb
-new file mode 100644
-index 0000000..32820c9
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/yearly_incrementer.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/yearly_incrementer.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/occurrence_incrementer/yearly_incrementer.rb
 @@ -0,0 +1,57 @@
 +module RiCal
 +  class PropertyValue
@@ -12265,11 +12180,10 @@ index 0000000..32820c9
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_day.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_day.rb
-new file mode 100644
-index 0000000..8583a41
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_day.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_day.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_day.rb
 @@ -0,0 +1,131 @@
 +module RiCal
 +  class PropertyValue
@@ -12403,11 +12317,10 @@ index 0000000..8583a41
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_month_day.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_month_day.rb
-new file mode 100644
-index 0000000..d657dbd
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_month_day.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_month_day.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_month_day.rb
 @@ -0,0 +1,64 @@
 +module RiCal
 +  class PropertyValue
@@ -12474,11 +12387,10 @@ index 0000000..d657dbd
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb
-new file mode 100644
-index 0000000..cd528dc
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb
 @@ -0,0 +1,33 @@
 +module RiCal
 +  class PropertyValue
@@ -12514,11 +12426,10 @@ index 0000000..cd528dc
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_year_day.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_year_day.rb
-new file mode 100644
-index 0000000..f19e37f
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_year_day.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_year_day.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/recurring_year_day.rb
 @@ -0,0 +1,53 @@
 +module RiCal
 +  class PropertyValue
@@ -12574,11 +12485,10 @@ index 0000000..f19e37f
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/time_manipulation.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/time_manipulation.rb
-new file mode 100644
-index 0000000..331c8e6
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/time_manipulation.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/time_manipulation.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/time_manipulation.rb
 @@ -0,0 +1,42 @@
 +module RiCal
 +  class PropertyValue
@@ -12623,11 +12533,10 @@ index 0000000..331c8e6
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/recurrence_rule/validations.rb b/lib/mhc/ri_cal/property_value/recurrence_rule/validations.rb
-new file mode 100644
-index 0000000..9105789
+Index: mhc/lib/mhc/ri_cal/property_value/recurrence_rule/validations.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/recurrence_rule/validations.rb
++++ mhc/lib/mhc/ri_cal/property_value/recurrence_rule/validations.rb
 @@ -0,0 +1,125 @@
 +module RiCal
 +  class PropertyValue
@@ -12755,11 +12664,10 @@ index 0000000..9105789
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/text.rb b/lib/mhc/ri_cal/property_value/text.rb
-new file mode 100644
-index 0000000..3abeb44
+Index: mhc/lib/mhc/ri_cal/property_value/text.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/text.rb
++++ mhc/lib/mhc/ri_cal/property_value/text.rb
 @@ -0,0 +1,44 @@
 +module RiCal
 +  class PropertyValue
@@ -12806,11 +12714,10 @@ index 0000000..3abeb44
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/uri.rb b/lib/mhc/ri_cal/property_value/uri.rb
-new file mode 100644
-index 0000000..19a6b6a
+Index: mhc/lib/mhc/ri_cal/property_value/uri.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/uri.rb
++++ mhc/lib/mhc/ri_cal/property_value/uri.rb
 @@ -0,0 +1,11 @@
 +module RiCal
 +  class PropertyValue
@@ -12824,11 +12731,10 @@ index 0000000..19a6b6a
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/utc_offset.rb b/lib/mhc/ri_cal/property_value/utc_offset.rb
-new file mode 100644
-index 0000000..ef62a12
+Index: mhc/lib/mhc/ri_cal/property_value/utc_offset.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/utc_offset.rb
++++ mhc/lib/mhc/ri_cal/property_value/utc_offset.rb
 @@ -0,0 +1,33 @@
 +module RiCal
 +  class PropertyValue
@@ -12864,11 +12770,10 @@ index 0000000..ef62a12
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/property_value/zulu_date_time.rb b/lib/mhc/ri_cal/property_value/zulu_date_time.rb
-new file mode 100644
-index 0000000..037fe7f
+Index: mhc/lib/mhc/ri_cal/property_value/zulu_date_time.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/property_value/zulu_date_time.rb
++++ mhc/lib/mhc/ri_cal/property_value/zulu_date_time.rb
 @@ -0,0 +1,34 @@
 +require 'date'
 +module RiCal
@@ -12905,11 +12810,10 @@ index 0000000..037fe7f
 +  end
 +end
 \ No newline at end of file
-diff --git a/lib/mhc/ri_cal/required_timezones.rb b/lib/mhc/ri_cal/required_timezones.rb
-new file mode 100644
-index 0000000..511262e
+Index: mhc/lib/mhc/ri_cal/required_timezones.rb
+===================================================================
 --- /dev/null
-+++ b/lib/mhc/ri_cal/required_timezones.rb
++++ mhc/lib/mhc/ri_cal/required_timezones.rb
 @@ -0,0 +1,55 @@
 +module RiCal
 +  #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
diff --git a/debian/patches/030_expr-compile.patch b/debian/patches/030_expr-compile.patch
deleted file mode 100644
index e4130f6..0000000
--- a/debian/patches/030_expr-compile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Subject: Prevent warning of unused lexical argument
-Origin: upstream, https://github.com/yoshinari-nomura/mhc/commit/aed3a6f034a0f0d3bd1923d6ee7f33c31160148a
-Bug: https://github.com/yoshinari-nomura/mhc/pull/57
-
---- a/emacs/mhc.el
-+++ b/emacs/mhc.el
-@@ -325,10 +325,11 @@
-         ret))))
- 
- (defun mhc-expr-compile (string)
--  (byte-compile
--   `(lambda (schedule)
--      ,(mhc-expr-parse string)
--      )))
-+  (let ((lexical-binding nil))
-+    (byte-compile
-+     `(lambda (schedule)
-+	,(mhc-expr-parse string)
-+	))))
- 
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;;
diff --git a/debian/patches/series b/debian/patches/series
index 0d7a1bc..fa15732 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 010_rubygems.patch
 020_rical.patch
-030_expr-compile.patch
diff --git a/emacs/mhc.el b/emacs/mhc.el
index cc29e54..c3172f8 100644
--- a/emacs/mhc.el
+++ b/emacs/mhc.el
@@ -325,10 +325,11 @@
         ret))))
 
 (defun mhc-expr-compile (string)
-  (byte-compile
-   `(lambda (schedule)
-      ,(mhc-expr-parse string)
-      )))
+  (let ((lexical-binding nil))
+    (byte-compile
+     `(lambda (schedule)
+	,(mhc-expr-parse string)
+	))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;