diff --git a/Guardfile b/Guardfile
index eceaac9c..2c60c3dc 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,11 +1,12 @@
 require 'asciidoctor'
 require 'erb'
+require './src/main/ruby/readme.rb'
 
 options = {:mkdirs => true, :safe => :unsafe, :attributes => 'linkcss'}
 
 guard 'shell' do
-  watch(/^[A-Za-z].*\.adoc$/) {|m|
-    Asciidoctor.render_file('src/main/asciidoc/README.adoc', options.merge(:to_file => './README.md'))
+  watch(/^src\/[A-Za-z].*\.adoc$/) {|m|
+    SpringCloud::Build.render_file('src/main/asciidoc/README.adoc', :to_file => './README.adoc')
     Asciidoctor.render_file('src/main/asciidoc/spring-cloud-netflix.adoc', options.merge(:to_dir => 'target/generated-docs'))
   }
 end
diff --git a/src/main/ruby/readme.rb b/src/main/ruby/readme.rb
index 083a3b8d..9526f778 100644
--- a/src/main/ruby/readme.rb
+++ b/src/main/ruby/readme.rb
@@ -41,8 +41,9 @@ module SpringCloud
         unless options[:to_file]
           puts out
         else
-          writer = File.new(options[:to_file],'w+')
-          out.each { |line| writer.write(line) }
+          File.open(options[:to_file],'w+') do |file|
+            out.each { |line| file.write(line) }
+          end
         end
 
       end