diff --git a/config.rb b/config.rb
index c434e15..5b0dd82 100644
--- a/config.rb
+++ b/config.rb
@@ -12,10 +12,11 @@ helpers do
     str.unpack("U*").map { |c| "&##{c};"}.join
   end
 
-  def markdown(source=nil, single_line = false, &block)
+  def markdown(source=nil, single_line = nil, &block)
     source = capture(&block) if block_given?
-    html = Tilt['markdown'].new{ source }.render
+    html = Tilt['markdown'].new(markdown_options){ source }.render
 
+    single_line = !source.include?("\n") if single_line.nil?
     if single_line
       doc = Nokogiri::HTML::DocumentFragment.parse(html)
       doc.search('p').each do |node|
@@ -26,6 +27,7 @@ helpers do
 
     html.strip
   end
+  alias_method :md, :markdown
 end
 
 ###