diff --git a/CatchAllAgent/Properties/AssemblyInfo.cs b/CatchAllAgent/Properties/AssemblyInfo.cs
index 630c84a..8ccb73b 100644
--- a/CatchAllAgent/Properties/AssemblyInfo.cs
+++ b/CatchAllAgent/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.3")]
-[assembly: AssemblyFileVersion("1.6.3")]
+[assembly: AssemblyVersion("1.6.4")]
+[assembly: AssemblyFileVersion("1.6.4")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.dll
index aa88032..f5288ed 100644
Binary files a/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.pdb
index 040931f..131767b 100644
Binary files a/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2007 SP3/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.dll
index 910a018..c9dd586 100644
Binary files a/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.pdb
index a107bd5..2ad0949 100644
Binary files a/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2010 SP1/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.dll
index 1057ff6..da9f05b 100644
Binary files a/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.pdb
index dcac383..4d97ab2 100644
Binary files a/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2010 SP2/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.dll
index 5bd0de4..964b788 100644
Binary files a/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.pdb
index 2babd4a..182ca82 100644
Binary files a/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2010 SP3/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.dll
index a8bcb00..236fc1a 100644
Binary files a/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.pdb
index df9375e..aa415c8 100644
Binary files a/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2010/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.dll
index 1ecf2dc..ca965df 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.pdb
index 8d543a1..6740d9b 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 CU1/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.dll
index 680ba24..df026d2 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.pdb
index 85b80a1..9570cd5 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 CU2/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.dll
index a3e328f..28c1e5b 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.pdb
index e3493b2..cf1de9d 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 CU3/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.dll
new file mode 100644
index 0000000..17c5189
Binary files /dev/null and b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.dll.config b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.dll.config
new file mode 100644
index 0000000..736d86d
--- /dev/null
+++ b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.dll.config	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+      <section name="domainSection" type="ConfigurationSettings.DomainSection, ExchangeCatchAll"/>
+      <sectionGroup name="customSection">
+        <section name="database" type="ConfigurationSettings.Database, ExchangeCatchAll" allowLocation="true" allowDefinition="Everywhere"/>
+        <section name="general" type="ConfigurationSettings.General, ExchangeCatchAll" allowLocation="true" allowDefinition="Everywhere"/>
+      </sectionGroup>
+    </configSections>
+    <!-- You can edit the settings below this line -->
+    <domainSection>
+      <!-- Domain name comparison and the regex are case insensitive! -->
+      <Domains>
+         <!-- Redirect all E-Mail sent to an address with domain example.com to you@example.org -->
+        <Domain name="example.com" regex="false" address="you@example.org"/>
+        <!-- Use a regex to redirect. Redirects all mails to *@*.cathcall.com to *@example.org 
+        E.g. addr@bar.catchall.com -> bar@example.org
+        or xxx@sub.catchall.com -> sub@example.org        
+        -->
+        <Domain name="^.*@(.*)\.catchall.com$" regex="true" address="$1@example.org"/>
+      </Domains>
+    </domainSection>
+    <customSection>
+      <!-- LogLevel: 0 = off, 1 = error, 2 = error+warn, 3 = all
+          AddOrigToHeader: Enable/Disable 'X-OrigTo' header
+          RejectIfBlocked: If recipient blocked in database, directly send error to sender. Otherwise the address will be handled by Exchange which then decides the action.
+      -->
+      <general LogLevel="3" AddOrigToHeader="true" RejectIfBlocked="false"/>
+      <!-- Database settings.
+      enabled: enable/disable database logging/block checking
+      type: currently only mysql supported  
+      -->
+      <database enabled="true" type="mysql" connectionstrings="SERVER=localhost;PORT=3306;UID=catchall;PWD=catchall;DATABASE=catchall;"/>
+    </customSection>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.pdb
new file mode 100644
index 0000000..5e6d16e
Binary files /dev/null and b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU10/mysql.data.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/mysql.data.dll
new file mode 100644
index 0000000..a94dd3d
Binary files /dev/null and b/CatchAllAgent/bin/Exchange 2013 SP1 CU10/mysql.data.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.dll
index 72f2dac..862176f 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.pdb
index fc8bde1..545f888 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 SP1 CU4/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.dll
index fc90ce0..a73d22c 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.pdb
index 0a638a5..0a14809 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 SP1 CU5/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.dll
index 4a5baaf..8bd3d23 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.pdb
index 876988b..fcb79a9 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 SP1 CU6/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.dll
index 4dd5fc8..567db08 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.pdb
index 0830646..920351b 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 SP1 CU7/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.dll
index 7b751ab..59cc366 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.pdb
index 2981ad7..675a9a2 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 SP1 CU8/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.dll
index 51cac32..994efe9 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.pdb
index f8adc91..90f2039 100644
Binary files a/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013 SP1 CU9/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.dll
index aa17cef..574262b 100644
Binary files a/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.pdb
index c2b0118..5beda8a 100644
Binary files a/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2013/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.dll
index 63f8d34..cc2f556 100644
Binary files a/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.dll and b/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.pdb
index f284595..60da29b 100644
Binary files a/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.pdb and b/CatchAllAgent/bin/Exchange 2016 Preview/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.dll b/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.dll
new file mode 100644
index 0000000..599d369
Binary files /dev/null and b/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.dll differ
diff --git a/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.dll.config b/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.dll.config
new file mode 100644
index 0000000..736d86d
--- /dev/null
+++ b/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.dll.config	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+      <section name="domainSection" type="ConfigurationSettings.DomainSection, ExchangeCatchAll"/>
+      <sectionGroup name="customSection">
+        <section name="database" type="ConfigurationSettings.Database, ExchangeCatchAll" allowLocation="true" allowDefinition="Everywhere"/>
+        <section name="general" type="ConfigurationSettings.General, ExchangeCatchAll" allowLocation="true" allowDefinition="Everywhere"/>
+      </sectionGroup>
+    </configSections>
+    <!-- You can edit the settings below this line -->
+    <domainSection>
+      <!-- Domain name comparison and the regex are case insensitive! -->
+      <Domains>
+         <!-- Redirect all E-Mail sent to an address with domain example.com to you@example.org -->
+        <Domain name="example.com" regex="false" address="you@example.org"/>
+        <!-- Use a regex to redirect. Redirects all mails to *@*.cathcall.com to *@example.org 
+        E.g. addr@bar.catchall.com -> bar@example.org
+        or xxx@sub.catchall.com -> sub@example.org        
+        -->
+        <Domain name="^.*@(.*)\.catchall.com$" regex="true" address="$1@example.org"/>
+      </Domains>
+    </domainSection>
+    <customSection>
+      <!-- LogLevel: 0 = off, 1 = error, 2 = error+warn, 3 = all
+          AddOrigToHeader: Enable/Disable 'X-OrigTo' header
+          RejectIfBlocked: If recipient blocked in database, directly send error to sender. Otherwise the address will be handled by Exchange which then decides the action.
+      -->
+      <general LogLevel="3" AddOrigToHeader="true" RejectIfBlocked="false"/>
+      <!-- Database settings.
+      enabled: enable/disable database logging/block checking
+      type: currently only mysql supported  
+      -->
+      <database enabled="true" type="mysql" connectionstrings="SERVER=localhost;PORT=3306;UID=catchall;PWD=catchall;DATABASE=catchall;"/>
+    </customSection>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
diff --git a/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.pdb b/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.pdb
new file mode 100644
index 0000000..fb90aa6
Binary files /dev/null and b/CatchAllAgent/bin/Exchange 2016 RTM/ExchangeCatchAll.pdb differ
diff --git a/CatchAllAgent/bin/Exchange 2016 RTM/mysql.data.dll b/CatchAllAgent/bin/Exchange 2016 RTM/mysql.data.dll
new file mode 100644
index 0000000..a94dd3d
Binary files /dev/null and b/CatchAllAgent/bin/Exchange 2016 RTM/mysql.data.dll differ