diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb
index fe828ac..ca6f6d6 100644
--- a/plugins/pygments_code.rb
+++ b/plugins/pygments_code.rb
@@ -39,9 +39,11 @@ module HighlightCode
     linenos = options[:linenos]
     start   = options[:start]
 
+    code = code.gsub(/{{/, '{{').gsub(/{%/, '{%')
+
     if lang == 'plain'
       # Escape html tags
-      code = code.gsub('<','&lt;').gsub('>','&gt;')
+      code = code.gsub('<','&lt;')
     elsif lang.include? "-raw"
       output  = "``` #{$1.sub('-raw', '')}\n"
       output += code