diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb
index 3ba3b795..fcf249a1 100644
--- a/lib/coderay/scanners/html.rb
+++ b/lib/coderay/scanners/html.rb
@@ -99,7 +99,17 @@ def scan_tokens encoder, options
           case state
           
           when :initial
-            if match = scan(/<!--(?:.*?-->|.*)/m)
+            if match = scan(/<!\[CDATA\[/)
+              encoder.begin_group :string
+              encoder.text_token match, :delimiter
+              if match = scan(/.*?\]\]>/m)
+                encoder.text_token match[0..-4], :content
+                encoder.text_token ']]>', :delimiter
+              else
+                encoder.text_token scan(/.*/m), :error
+              end
+              encoder.end_group :string
+            elsif match = scan(/<!--(?:.*?-->|.*)/m)
               encoder.text_token match, :comment
             elsif match = scan(/<!(\w+)(?:.*?>|.*)|\]>/m)
               encoder.text_token match, :doctype
diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
new file mode 100644
index 00000000..7c4adc37
--- /dev/null
+++ b/lib/coderay/scanners/lua.rb
@@ -0,0 +1,186 @@
+# encoding: utf-8
+
+# Scanner for the Lua programming lanuage.
+# This scanner attempts to mimic the syntax defined at:
+# http://www.lua.org/manual/5.2/manual.html
+class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
+
+  register_for :lua
+  file_extension "lua"
+  title "Lua"
+
+  # http://www.lua.org/manual/5.2/manual.html#3.1
+  KEYWORDS = %w[
+    and break do else elseif end
+    for function goto if in
+    local not or repeat return
+    then until while
+  ]
+
+  # http://www.lua.org/manual/5.2/manual.html#3.1
+  CONSTANTS = %w[false true nil]
+
+  # http://www.lua.org/manual/5.2/manual.html#6.1
+  LIBRARY = %w[
+  assert collectgarbage dofile error getmetatable
+  ipairs load loadfile next pairs pcall print
+  rawequal rawget rawlen rawset select setmetatable
+  tonumber tostring type xpcall
+  ]
+
+  SCANNER = /
+    (?<fluff>(?m).*?) # eat content up until something we want
+    (?:
+      (?<funcname>
+        \bfunction\s+[^\(]+
+      )
+      |
+      \b(?<keyword>#{KEYWORDS.join('|')})\b
+      |
+      (?: # strings
+        (?<s1q1>")
+        (?<s1>(?:[^\\"\n]|\\[abfnrtvz\\"']|\\\n|\\\d{1,3}|\\x[\da-fA-F]{2})*)
+        (?<s1q2>")
+        |
+        (?<s2q1>')
+        (?<s2>(?:[^\\'\n]|\\[abfnrtvz\\"']|\\\n|\\\d{1,3}|\\x[\da-fA-F]{2})*)
+        (?<s2q2>')
+        |
+        (?<s3q1>\[(?<stringequals>=*)\[)
+        (?<s3>(?m).*?)
+        (?<s3q2>\]\k<stringequals>\])
+      )
+      |
+      \b(?<number>
+        -? # Allows -2 to be properly highlighted, but makes 10-5 show -5 as a single number
+        (?i:
+          0x
+          (?:
+            [\da-f]+\.?[\da-f]*  # 0xA and 0xA. and 0xA.1
+            |
+            \.[\da-f]+           # 0x.A
+          )
+          (?:p[-+]?\d+)?         # 0xA.1p-3
+          |
+          (?:
+            \d+\.?\d*            # 3 and 3. and 3.14
+            |
+            \.\d+                # .3
+          )
+          (?:e[-+]?\d+)?         # 3.1e-7
+        )
+      )\b
+      |
+      (?:
+        (?<blockstart>--\[(?<blockequals>=*)\[)
+        (?<blockmain>(?m).*?)
+        (?<blockclose>\]\k<blockequals>\])
+      )
+      |
+      (?<comment>
+        --(?!\[).+
+      )
+      |
+      \b(?<constant>#{CONSTANTS.join('|')})\b
+      |
+      \b(?<library>#{LIBRARY.join('|')})\b
+      |
+      (?<operators>
+        (?<!\.)\.{2,3}(?!\.)
+        |
+        (?<!=)={1,2}(?!=)
+        |
+        [+\-*\/%^#]
+        |
+        ~=
+        |
+        [<>]=?
+      )
+      |
+      (?<reserved>
+        \b_[A-Z]+\b                    # _VERSION
+      )
+      |
+      (?<gotolabel>
+        (?i:::[a-z_]\w*::)
+      )
+    )
+  /x
+
+  CAPTURE_KINDS = {
+    reserved:     :reserved,
+    comment:      :comment,
+    blockstart: {
+      _group:     :comment,
+      blockstart: :delimiter,
+      blockmain:  :content,
+      blockclose: :delimiter
+    },
+    keyword:      :keyword,
+    number:       :float,
+    constant:     :"predefined-constant",
+    library:      :predefined,
+    s1q1:         {
+      _group:     :string,
+      s1q1:       :delimiter,
+      s1:         :content,
+      s1q2:       :delimiter,
+    },
+    s2q1:         {
+      _group:     :string,
+      s2q1:       :delimiter,
+      s2:         :content,
+      s2q2:       :delimiter,
+    },
+    s3q1:         {
+      _group:     :string,
+      s3q1:       :delimiter,
+      s3:         :content,
+      s3q2:       :delimiter,
+    },
+    gotolabel:    :label,
+    operators:    :operator,
+  }
+
+  protected
+
+  def scan_tokens(tokens, options)
+    # We use the block form of gsub instead of the StringScanner capabilities because StringScanner does not support named captures in 1.9
+    remainder_index = 0
+
+    add_boring = ->(fluff) do
+      fluff.scan(/((\s+)|(\S+))/).each do |text,ws,nws|
+        tokens.text_token(text, ws ? :space : :plain)
+      end
+    end
+
+    string.gsub(SCANNER) do
+      match = $~
+      remainder_index = match.offset(0).last
+      add_boring[match[:fluff]]
+      if match[:funcname] && !match[:funcname].empty?
+        f,s,n = match[:funcname].split(/(\s+)/)
+        tokens.text_token(f,:keyword)
+        tokens.text_token(s,:space)
+        tokens.text_token(n,:function)
+      end
+      CAPTURE_KINDS.each do |capture,kind|
+        next unless match[capture] && !match[capture].empty?
+        if kind.is_a? Hash
+          tokens.begin_group(kind[:_group])
+          kind.each do |c,k|
+            tokens.text_token( match[c], k ) unless c==:_group
+          end
+          tokens.end_group(kind[:_group])
+        else
+          tokens.text_token( match[capture], kind )
+        end
+      end
+    end
+    unless remainder_index >= string.length
+      add_boring[string[remainder_index..-1]]
+    end
+    tokens
+  end
+
+end
\ No newline at end of file
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb
index 3b8d07e4..d478820c 100755
--- a/lib/coderay/token_kinds.rb
+++ b/lib/coderay/token_kinds.rb
@@ -76,7 +76,7 @@ module CodeRay
     :eyecatcher          => 'eyecatcher',
     
     :ident               => false,
-    :operator            => false,
+    :operator            => 'operator',
     
     :space               => false,
     :plain               => false
diff --git a/lib/coderay/version.rb b/lib/coderay/version.rb
index bfb5f243..4f8384d0 100644
--- a/lib/coderay/version.rb
+++ b/lib/coderay/version.rb
@@ -1,3 +1,3 @@
 module CodeRay
-  VERSION = '1.0.9'
+  VERSION = '1.0.9.1'
 end