diff --git a/T4Editor/Common/Constants.cs b/T4Editor/Common/Constants.cs
index f1acf32..689642b 100644
--- a/T4Editor/Common/Constants.cs
+++ b/T4Editor/Common/Constants.cs
@@ -4,8 +4,8 @@ internal static class Constants
     {
         #region RegularExpressions
 
-        internal const string StatementBlockRegex = "(?<!\")<#((?!\"|=|@|\\+))((?!(?!)<#(?!\\+|\\=)|#>)[\\s|\\w|\\d|\n|().,<>\\-:;@#$%^&=*\\[\\]\"'+\\/\\\\®°⁰!?{}|`~\\u2000-\\u206F\\u2E00-\\u2E7F])*(?=\\s?|\\w?|\n?)(?<!\")#>(?!\")";
-        internal const string OutputBlockRegex = "(?<=#>)(((?!<#(?!\\+|\\=|\")|#>)[\\s|\\w|\\d|\n|().,<>\\-:;@#$%^&=*\\[\\]\"'+\\/\\\\®°⁰!?{}|`~\\u2000-\\u206F\\u2E00-\\u2E7F])*(?=\\s|\\w|\\n?))(?=<#)";
+        internal const string StatementBlockRegex = "(?<!\")<#((?!\"|=|@|\\+))((?!(?!)<#(?!\\+|\\=)|#>)[\\s|\\w|\\d|\n|().,<>\\-:;@#$%^&=*\\[\\]\"'+\\/\\\\®°⁰!?{}|`~\\u2000-\\u206F\\u2E00-\\u2E7F])*(?=\\s?|\\w?|\\n?)(?<!\")#>(?!\")";
+        internal const string OutputBlockRegex = "(?<=#>)(((?!<#(?!\\+|\\=|\")|#>)[\\s|\\w|\\d|\n|().,<>\\-:;@#$%^&=*\\[\\]\"'+\\/\\\\®°⁰!?{}|`~\\u2000-\\u206F\\u2E00-\\u2E7F])*(?=\\s|\\w|\\n?))(?=(<#)|$(?![\\r\\n]))";
         internal const string ClassFeatureBlockRegex = "<#\\+((?!<#(?!\\+|\\=)|#>)[\\s|\\w|\\d|\n|().,<>\\-:;@#$%^&=*\\[\\]\"'+\\/\\\\®°⁰!?{}|`~\\u2000-\\u206F\\u2E00-\\u2E7F])*(?=\\s|\\w|\\n?)#>";
         internal const string DirectiveRegex = "(?<=<#@)((?!<#(?!\\+|\\=)|#>)[\\s|\\w|\\d|\n|().,<>\\-:;@#$%^&=*\\[\\]\"'+\\/\\\\®°⁰!?{}|`~\\u2000-\\u206F\\u2E00-\\u2E7F])*(?=\\s|\\w|\\n?)(?=#>)";
         internal const string ExpressionBlockRegex = "<#=((?!<#(?!\\+|\\=)|#>)[\\s|\\w|\\d|\n|().,<>\\-:;@#$%^&=*\\[\\]\"'+\\/\\\\®°⁰!?{}|`~\\u2000-\\u206F\\u2E00-\\u2E7F])*(\\s?)#>";
diff --git a/T4Editor/source.extension.vsixmanifest b/T4Editor/source.extension.vsixmanifest
index cdb7366..3760c74 100644
--- a/T4Editor/source.extension.vsixmanifest
+++ b/T4Editor/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="T4Editor.abda42ab-5257-4c25-b35a-39b39709332b" Version="2.1" Language="en-US" Publisher="Tim Maes" />
+        <Identity Id="T4Editor.abda42ab-5257-4c25-b35a-39b39709332b" Version="2.2" Language="en-US" Publisher="Tim Maes" />
         <DisplayName>T4Editor</DisplayName>
         <Description xml:space="preserve">Configurable colored editor for *.tt, *.t4 and *.ttinclude files with code completion, outlining and brace matching. </Description>
         <MoreInfo>http://www.github.com/Tim-Maes/T4Editor</MoreInfo>