diff --git a/Gemfile b/Gemfile
index b2c0f3f..099ae23 100755
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,8 @@ group :development do
   gem 'mysql'
   gem 'mysql2'
   gem 'pg'
+
+  gem 'guard-rspec'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index b8258e8..bf3226e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -94,9 +94,15 @@ GEM
     erubis (2.7.0)
     extlib (0.9.15)
     fastercsv (1.5.5)
+    ffi (1.1.4)
     gherkin (2.11.1)
       json (>= 1.4.6)
     git (1.2.5)
+    guard (1.3.0)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (1.2.1)
+      guard (>= 1.1)
     hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.8.4)
@@ -109,6 +115,10 @@ GEM
     json_pure (1.4.6)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
+    listen (0.4.7)
+      rb-fchange (~> 0.0.5)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
     mime-types (1.19)
     mongo (1.6.4)
       bson (~> 1.6.4)
@@ -145,6 +155,11 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
+    rb-fchange (0.0.5)
+      ffi
+    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rbx-require-relative (0.0.9)
     rcov (1.0.0)
     rdoc (3.12)
@@ -197,6 +212,7 @@ DEPENDENCIES
   datamapper (= 1.0.0)
   dm-migrations (= 1.0.0)
   dm-sqlite-adapter (= 1.0.0)
+  guard-rspec
   jeweler
   json_pure
   mongo_ext
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..767287d
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+