diff --git a/History.md b/History.md
index 81409ef8..ef8b5c0d 100644
--- a/History.md
+++ b/History.md
@@ -3,6 +3,7 @@
 ### New Features
 
  * Added MIT licence in gemspec ([#261] (https://github.com/cucumber/cucumber-rails/issues/261#issuecomment-23260956) Benjamin Fleischer)
+ * Ensure dependency on DatabaseCleaner is not required ([#276] (https://github.com/cucumber/cucumber-rails/pull/276) Matthew O'Riordan)
 
 ### Removed Features
  * Mongo step definition ([#263] (https://github.com/cucumber/cucumber-rails/issues/263) Aslak Hellesøy )
@@ -25,6 +26,7 @@
  * Added recommendation in README.md for running install scripts after upgrading (Joost Baaij)
  * Describe configuration option 'autorun_database_cleaner' in README ([#255](https://github.com/cucumber/cucumber-rails/pull/255) Martin Eismann)
 
+
 ### Changed Features
 
  * Gemspec in 1.3.1 doesn't allow usage with rails 4 ([#244](https://github.com/cucumber/cucumber-rails/issues/244) Fabian Schwahn)
diff --git a/features/install_cucumber_rails.feature b/features/install_cucumber_rails.feature
index 4e92f4b7..fbaed4e2 100644
--- a/features/install_cucumber_rails.feature
+++ b/features/install_cucumber_rails.feature
@@ -9,5 +9,6 @@ Feature: Rails
       | config/cucumber.yml                    |
       | script/cucumber                        |
       | features/support/env.rb                |
+      | features/step_definitions/.gitkeep     |
       | lib/tasks/cucumber.rake                |
     And the file "features/support/env.rb" should contain "require 'cucumber/rails'"
diff --git a/lib/cucumber/rails/capybara/select_dates_and_times.rb b/lib/cucumber/rails/capybara/select_dates_and_times.rb
index 1c31e4bb..3b6823dc 100644
--- a/lib/cucumber/rails/capybara/select_dates_and_times.rb
+++ b/lib/cucumber/rails/capybara/select_dates_and_times.rb
@@ -3,7 +3,7 @@ module Rails
     module Capybara
       # This module defines methods for selecting dates and times
       module SelectDatesAndTimes
-        # Select a Rails date. Options has must include :from => +label+
+        # Select a Rails date. Options hash must include :from => +label+
         def select_date(date, options)
           date        = Date.parse(date)
           base_dom_id = get_base_dom_id_from_label_tag(options[:from])
@@ -13,7 +13,7 @@ def select_date(date, options)
           find(:xpath, ".//select[@id='#{base_dom_id}_3i']").select(date.day.to_s)
         end
 
-        # Select a Rails time. Options has must include :from => +label+
+        # Select a Rails time. Options hash must include :from => +label+
         def select_time(time, options)
           time        = Time.zone.parse(time)
           base_dom_id = get_base_dom_id_from_label_tag(options[:from])
@@ -22,7 +22,7 @@ def select_time(time, options)
           find(:xpath, ".//select[@id='#{base_dom_id}_5i']").select(time.min.to_s.rjust(2,  '0'))
         end
 
-        # Select a Rails datetime. Options has must include :from => +label+
+        # Select a Rails datetime. Options hash must include :from => +label+
         def select_datetime(datetime, options)
           select_date(datetime, options)
           select_time(datetime, options)
diff --git a/lib/generators/cucumber/install/install_generator.rb b/lib/generators/cucumber/install/install_generator.rb
index ef9b8417..4d622fd4 100644
--- a/lib/generators/cucumber/install/install_generator.rb
+++ b/lib/generators/cucumber/install/install_generator.rb
@@ -20,6 +20,7 @@ def create_scripts
 
     def create_step_definitions
       empty_directory 'features/step_definitions'
+      create_file 'features/step_definitions/.gitkeep'
     end
 
     def create_feature_support