diff --git a/lib/frank/base.rb b/lib/frank/base.rb
index 1e7deb6..994a3f1 100644
--- a/lib/frank/base.rb
+++ b/lib/frank/base.rb
@@ -269,7 +269,13 @@ def self.new(&block)
 
     builder = Rack::Builder.new do
       use Frank::Middleware::Statik, :root => Frank.static_folder
-      use Frank::Middleware::Refresh, :watch => [ Frank.dynamic_folder, Frank.static_folder, Frank.layouts_folder ]
+      watch_dirs = [ Frank.dynamic_folder, Frank.static_folder, Frank.layouts_folder ]
+      unless ENV['FRANK_REFRESH_DIRS'].nil?
+        watch_dirs.concat ENV['FRANK_REFRESH_DIRS'].split(/,/) unless ENV['FRANK_REFRESH_DIRS'].nil?
+        watch_dirs.uniq!
+        puts "Watching directories #{watch_dirs.join(', ')}"
+      end
+      use Frank::Middleware::Refresh, :watch => watch_dirs
       run base
     end
 
diff --git a/lib/frank/template_helpers.rb b/lib/frank/template_helpers.rb
index 99a0519..9995813 100644
--- a/lib/frank/template_helpers.rb
+++ b/lib/frank/template_helpers.rb
@@ -49,10 +49,30 @@ def refresh
           <script type="text/javascript">
           (function(){
             var when = #{Time.now.to_i};
+            var loading = false
+            function addLoadingIndicator() {
+              var body = document.getElementsByTagName("body")[0]
+              var div = document.createElement('div')
+              div.innerHTML = '<p style="margin: 2px 0; padding: 2px 0"><div style="cursor: pointer; background: #f00; color: #faa;' + 
+                                             'float: right; margin-right: 5px;width: 1em; height; 1ex"' + 
+                                      'onclick="this.parentNode.style.display=\\'none\\'; return false">x</div>' + 
+                                  'Frank has detected changes at ' + new Date() +
+                              '</p><p style="margin: 2px 0; padding: 2px 0">Reloading. Please wait ...</p>'
+              div.setAttribute('style', 'z-index: 1000; position: fixed; top: 0; right: 40%;width: 460px; height: 110px;' +
+                                        'background: #308030; color: white; opacity: 0.8; ' +
+                                        'font-family: sans; font-weight: bold; font-size: 16px;' +
+                                        'text-align: center; padding: 2px 5px 5px 5px' +
+                                        'border: 10px solid #104010')
+              body.appendChild(div)
+            }
 
             function process( raw ){
               if( parseInt(raw) > when ) {
-                window.location.reload();
+                if (!loading) {
+                  loading = true
+                  addLoadingIndicator();
+                  window.location.reload();
+                }
               }
             }
             
@@ -65,7 +85,8 @@ def refresh
               };
               req.open('GET', '/__refresh__', true);
               req.send( null );
-              setTimeout( arguments.callee, 1000 );
+              if (!loading && !window.stop_refresh_check)
+                setTimeout( arguments.callee, 1000 );
             })();
 
           })();
diff --git a/spec/template_helpers_spec.rb b/spec/template_helpers_spec.rb
index c21e460..570c5d4 100644
--- a/spec/template_helpers_spec.rb
+++ b/spec/template_helpers_spec.rb
@@ -27,6 +27,16 @@ def app
     template = @app.render('refresh.haml')
     template.should include("<script type=\"text/javascript\">\n            (function(){")
   end
+
+  it 'should have provision for a loading indicator in the refresh javascript' do
+    template = @app.render('refresh.haml')
+    template.should include("addLoadingIndicator()")
+  end
+
+  it 'should have provision for stopping automatic refresh in the refresh javascript' do
+    template = @app.render('refresh.haml')
+    template.should include("!window.stop_refresh_check")
+  end
   
   it 'renders content_for haml in the layout' do
     template = @app.render('content_for_haml.haml')