diff --git a/README.md b/README.md
index 81458d5..7c1c7d7 100644
--- a/README.md
+++ b/README.md
@@ -226,6 +226,25 @@ See [gray-matter](https://github.com/assemble/gray-matter)
 ![image](https://f.cloud.github.com/assets/383994/2179172/82a6dc1c-9694-11e3-89f1-772bedf02384.png)
 
 
+## LaTeX Math Support in Markdown Extended
+
+All standard LaTeX math environments (including amsmath) are supported. That is, the following enters the latex scope.
+
+```
+$...$
+
+$$...$$
+
+\[...\]
+
+\begin{equation}
+  ...
+\end{equation}
+```
+
+The supported `\begin{}` environments are `equation`, `align`, `gather`, `alignat`, `flalign`, `multiline`, and the corresponding starred version (e.g. `equation*`).
+
+
 ## Authors
 
 **Jon Schlinkert**
diff --git a/Syntaxes/Markdown Extended.sublime-syntax b/Syntaxes/Markdown Extended.sublime-syntax
index e52749a..039642d 100644
--- a/Syntaxes/Markdown Extended.sublime-syntax	
+++ b/Syntaxes/Markdown Extended.sublime-syntax	
@@ -783,7 +783,6 @@ contexts:
           scope: markup.heading.2.markdown
           captures:
             1: punctuation.definition.heading.markdown
-    - include: latex-display
   html_comment:
     - match: <!--
       captures:
@@ -1035,6 +1034,7 @@ contexts:
         6: constant.other.reference.link.markdown
         7: punctuation.definition.constant.markdown
   inline:
+    - include: latex
     - include: escape
     - include: ampersand
     - include: bracket
@@ -1050,7 +1050,6 @@ contexts:
     - include: image-ref
     - include: link-ref-literal
     - include: link-ref
-    - include: latex-inline
   italic:
     - match: |-
         (?x)
@@ -1279,18 +1278,109 @@ contexts:
         - include: link-ref-literal
         - include: link-ref
 
-  latex-inline:
+  latex:
+    # $..$
     - match: '(?=\$)'
       push:
         - meta_scope: text.tex.latex
         - match: '(?<=\$)'
           pop: true
         - include: scope:text.tex.latex
-
-  latex-display:
+    # $$..$$
     - match: '(?=\$\$)'
       push:
         - meta_scope: text.tex.latex
         - match: '(?<=\$\$)'
           pop: true
         - include: scope:text.tex.latex
+    # \[..\]
+    - match: '(?=\\\[)'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\\])'
+          pop: true
+        - include: scope:text.tex.latex
+    # equation
+    - match: '(?=\\begin{equation})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{equation})'
+          pop: true
+        - include: scope:text.tex.latex
+    # equation*
+    - match: '(?=\\begin{equation\*})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{equation\*})'
+          pop: true
+        - include: scope:text.tex.latex
+    # align
+    - match: '(?=\\begin{align})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{align})'
+          pop: true
+        - include: scope:text.tex.latex
+    # align*
+    - match: '(?=\\begin{align\*})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{align\*})'
+          pop: true
+        - include: scope:text.tex.latex
+    # gather
+    - match: '(?=\\begin{gather})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{gather})'
+          pop: true
+        - include: scope:text.tex.latex
+    # gather*
+    - match: '(?=\\begin{gather\*})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{gather\*})'
+          pop: true
+        - include: scope:text.tex.latex
+    # alignat
+    - match: '(?=\\begin{alignat})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{alignat})'
+          pop: true
+        - include: scope:text.tex.latex
+    # alignat*
+    - match: '(?=\\begin{alignat\*})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{alignat\*})'
+          pop: true
+        - include: scope:text.tex.latex
+    # flalign
+    - match: '(?=\\begin{flalign})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{flalign})'
+          pop: true
+        - include: scope:text.tex.latex
+    # flalign*
+    - match: '(?=\\begin{flalign\*})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{flalign\*})'
+          pop: true
+        - include: scope:text.tex.latex
+    # multiline
+    - match: '(?=\\begin{multiline})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{multiline})'
+          pop: true
+        - include: scope:text.tex.latex
+    # multiline*
+    - match: '(?=\\begin{multiline\*})'
+      push:
+        - meta_scope: text.tex.latex
+        - match: '(?<=\\end{multiline\*})'
+          pop: true
+        - include: scope:text.tex.latex