diff --git a/init.rb b/init.rb
index 15f4b8a..a37ae16 100644
--- a/init.rb
+++ b/init.rb
@@ -32,8 +32,8 @@ Redmine::Plugin.register :redmine_wiki_notes do
   author 'Daniel Seifert'
   description 'Allows adding different kinds of notes into a wiki page'
   url "http://www.github.com/dseifert/redmine_wiki_notes" if respond_to?(:url)
-  version '0.0.1'
-  requires_redmine :version_or_higher => '0.9.0'
+  version '0.0.2'
+  requires_redmine :version_or_higher => '2.3.0'
 
   RedCloth3::ALLOWED_TAGS << "div"
 end
diff --git a/lib/wiki_notes_macros.rb b/lib/wiki_notes_macros.rb
index 6ec885d..8145186 100644
--- a/lib/wiki_notes_macros.rb
+++ b/lib/wiki_notes_macros.rb
@@ -6,30 +6,30 @@ module WikiNotesMacro
       " @!{{important(text)}}@\n"
       " @!{{warning(text)}}@\n"
 
-    macro :note do |obj, args|
+    macro :note, :parse_args => false do |obj, args|
       o = '<div class="noteclassic">'
-      o << args.join(",")
+      o << textilizable(args)
       o << '</div>'
       o.html_safe
     end
 
-    macro :tip do |obj, args|
+    macro :tip, :parse_args => false do |obj, args|
       o = '<div class="notetip">'
-      o << args.join(",")
+      o << textilizable(args)
       o << '</div>'
       o.html_safe
     end
 
-    macro :important do |obj, args|
+    macro :important, :parse_args => false do |obj, args|
       o = '<div class="noteimportant">'
-      o << args.join(",")
+      o << textilizable(args)
       o << '</div>'
       o.html_safe
     end
 
-    macro :warning do |obj, args|
+    macro :warning, :parse_args => false do |obj, args|
       o = '<div class="notewarning">'
-      o << args.join(",")
+      o << textilizable(args)
       o << '</div>'
       o.html_safe
     end