diff --git a/Gemfile b/Gemfile
index 48f84b9..1012e6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,4 +16,5 @@ if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
   gem 'rb-fchange',   '~> 0.0.2', :require => false
   gem 'rb-notifu',    '~> 0.0.4', :require => false
 end
+gem 'rb-readline'
 
diff --git a/Guardfile b/Guardfile
index 0bf82fa..0dbf833 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,5 +1,7 @@
+
 guard 'minitest' do
-  watch(%r|^spec/(.*)_spec\.rb$|)
-  watch(%r|^lib/(.*)\.rb$|)            { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')         { "spec" }
+  watch(%r|^spec/(.*)_spec\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r|^spec/spec_helper\.rb|)    { 'spec' }
 end
+