diff --git a/lib/comment_paragraph_plugin.rb b/lib/comment_paragraph_plugin.rb
index 692c2be..252debc 100644
--- a/lib/comment_paragraph_plugin.rb
+++ b/lib/comment_paragraph_plugin.rb
@@ -16,14 +16,14 @@ class CommentParagraphPlugin < Noosfero::Plugin
     comment = args[:comment]
     paragraph_id = comment.paragraph_id || args[:paragraph_id]
     proc {
-      arr = []    
+      arr = []
       arr << hidden_field_tag('comment[id]', comment.id)
       arr << hidden_field_tag('comment[paragraph_id]', paragraph_id) if paragraph_id
-      arr << hidden_field_tag('comment[comment_paragraph_selected_area]', comment.comment_paragraph_selected_area) if comment.comment_paragraph_selected_area          
+      arr << hidden_field_tag('comment[comment_paragraph_selected_area]', comment.comment_paragraph_selected_area) if comment.comment_paragraph_selected_area
       arr
     }
   end
- 
+
   def comment_extra_contents(args)
     comment = args[:comment]
     proc {
@@ -39,6 +39,41 @@ class CommentParagraphPlugin < Noosfero::Plugin
     true
   end
 
+  def cms_controller_filters
+    block = proc do
+      if params['commit'] == 'Save'
+        unless @article.id.blank?
+
+          parsed_paragraphs = []
+          paragraph_id = 0
+
+          doc = Hpricot(@article.body)
+          paragraphs = doc.search("/[\r\n]").each do |paragraph|
+            parsed_paragraphs << (paragraph.to_html =~ /(.*)paragraph_comment_spacer(.*)|<div(.*)paragraph_comment(.*)/ ? paragraph.to_html : CommentParagraphPlugin.parse_paragraph(paragraph.to_html, paragraph_id))
+            paragraph_id += 1
+          end
+
+          @article.body = parsed_paragraphs.join()
+          @article.save
+
+        end
+      end
+    end
+
+    { :type => 'after_filter',
+      :method_name => 'new',
+      :block => block }
+  end
+
+  private
+
+  def self.parse_paragraph( paragraph_content, paragraph_id )
+      "<div class='macro article_comments paragraph_comment' " +
+           "data-macro='comment_paragraph_plugin/allow_comment' " +
+           "data-macro-paragraph_id='#{paragraph_id}'>#{paragraph_content}</div>\r\n" +
+      "<p class='paragraph_comment_spacer'></p>\r\n"
+  end
+
 end
 
 require_dependency 'comment_paragraph_plugin/macros/allow_comment'
--
libgit2 0.21.2