diff --git a/NOTICE b/NOTICE
index 0591ebb..3c4fdad 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-                 Copyright 2012-2019 OpenSextant.org
+                 Copyright 2012-2021 MITRE Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Software and Noncommercial Computer Software Documentation Clause
  * 252.227-7014 (JUN 1995)
  *
- * (c) 2012-2014 The MITRE Corporation. All Rights Reserved.
+ * (c) 2012-2021 The MITRE Corporation. All Rights Reserved.
  * **************************************************************************
 
 
diff --git a/pom.xml b/pom.xml
index 68886e2..e8eee3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,598 +1,603 @@
 <?xml version="1.0" encoding="UTF-8"?><!-- -*- indent-tabs-mode: nil -*- -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opensextant</groupId>
-  <version>3.4.0</version>
-  <name>XText</name>
-  <artifactId>opensextant-xponents-xtext</artifactId>
-  <description>Content extraction simplified! Retrieve text, data and metadata from binary documents using Tika and
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opensextant</groupId>
+    <version>3.5.0-SNAPSHOT</version>
+    <name>XText</name>
+    <artifactId>opensextant-xponents-xtext</artifactId>
+    <description>Content extraction simplified! Retrieve text, data and metadata from binary documents using Tika and
         similar toolkits
     </description>
-  <inceptionYear>2013</inceptionYear>
-  <url>https://opensextant.github.io/XText</url>
-  <scm>
-    <connection>scm:git:https://github.com/OpenSextant/XText.git</connection>
-    <developerConnection>scm:git:https://github.com/OpenSextant/XText.git</developerConnection>
-    <url>https://github.com/OpenSextant/XText.git</url>
-  </scm>
-  <licenses>
-    <license>
-      <name>Apache 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>Marc Ubaldino</name>
-      <email>ubaldino@mitre.org</email>
-      <organization>MITRE</organization>
-      <roles>
-        <role>Lead</role>
-      </roles>
-    </developer>
-  </developers>
-  <properties>
-    <slf4j.version>1.7.30</slf4j.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.opensextant</groupId>
-      <artifactId>opensextant-xponents-core</artifactId>
-      <version>3.4.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.opensextant</groupId>
-          <artifactId>giscore</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.opensextant</groupId>
-          <artifactId>geodesy</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.norconex.language</groupId>
-          <artifactId>langdetect</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.locationtech.spatial4j</groupId>
-          <artifactId>spatial4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>gnu.getopt</groupId>
-      <artifactId>java-getopt</artifactId>
-      <version>1.0.13</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
-    </dependency>
-    <!-- Override JSON-lib use of old commons-lang 2.5 -->
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.ibm.icu</groupId>
-      <artifactId>icu4j</artifactId>
-      <version>65.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-      <version>1.9</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.15</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.8.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.20</version>
-    </dependency>
-    <!-- Tika Dependencies: lots of fixes from PDFBox and POI; Over millions 
-      of documents converted we have seen lots of Tika parser errors. -->
-    <dependency>
-      <groupId>com.pff</groupId>
-      <artifactId>java-libpst</artifactId>
-      <version>0.9.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>1.24.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-parsers</artifactId>
-      <version>1.24.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.sis.storage</groupId>
-          <artifactId>sis-netcdf</artifactId>
-        </exclusion>
-        <exclusion>
-          <artifactId>pdfbox</artifactId>
-          <groupId>org.apache.pdfbox</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>httpservices</artifactId>
-          <groupId>edu.ucar</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>junrar</artifactId>
-          <groupId>com.github.junrar</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>netcdf4</artifactId>
-          <groupId>edu.ucar</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>grib</artifactId>
-          <groupId>edu.ucar</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>cdm</artifactId>
-          <groupId>edu.ucar</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>cxf-rt-rs-client</artifactId>
-          <groupId>org.apache.cxf</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>vorbis-java-core</artifactId>
-          <groupId>org.gagravarr</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>vorbis-java-tika</artifactId>
-          <groupId>org.gagravarr</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>sis-metadata</artifactId>
-          <groupId>org.apache.sis.core</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>sis-utility</artifactId>
-          <groupId>org.apache.sis.core</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jmatio</artifactId>
-          <groupId>net.sourceforge.jmatio</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>opennlp-tools</artifactId>
-          <groupId>org.apache.opennlp</groupId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.json</groupId>
-          <artifactId>json</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>edu.usc.ir</groupId>
-          <artifactId>sentiment-analysis-parser</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.tallison</groupId>
-          <artifactId>jmatio</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.rometools</groupId>
-          <artifactId>rome</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.uima</groupId>
-          <artifactId>uimafit-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.uima</groupId>
-          <artifactId>uimaj-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>net.htmlparser.jericho</groupId>
-      <artifactId>jericho-html</artifactId>
-      <version>3.4</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.4.01</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>javax.mail</artifactId>
-      <version>1.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pdfbox</groupId>
-      <artifactId>pdfbox</artifactId>
-      <version>2.0.22</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- Logback is nice and simple. -->
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-    <!-- HTTP/HTML collector clients, Web and Sharepoint -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>fluent-hc</artifactId>
-      <version>4.5.13</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient-cache</artifactId>
-      <version>4.5.13</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5.13</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>4.4.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.5.13</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.10.6</version>
-    </dependency>
-    <dependency>
-      <groupId>de.l3s.boilerpipe</groupId>
-      <artifactId>boilerpipe</artifactId>
-      <version>1.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jodd</groupId>
-      <artifactId>jodd-json</artifactId>
-      <version>5.1.5</version>
-    </dependency>
-  </dependencies>
-  <dependencyManagement>
+    <inceptionYear>2013</inceptionYear>
+    <url>https://opensextant.github.io/XText</url>
+    <scm>
+        <connection>scm:git:https://github.com/OpenSextant/XText.git</connection>
+        <developerConnection>scm:git:https://github.com/OpenSextant/XText.git</developerConnection>
+        <url>https://github.com/OpenSextant/XText.git</url>
+    </scm>
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Marc Ubaldino</name>
+            <email>ubaldino@mitre.org</email>
+            <organization>MITRE</organization>
+            <roles>
+                <role>Lead</role>
+            </roles>
+        </developer>
+    </developers>
+    <properties>
+        <slf4j.version>1.7.30</slf4j.version>
+    </properties>
     <dependencies>
-      <!-- JUnit -->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.1</version>
-        <scope>test</scope>
-      </dependency>
-      <!-- Logging -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.2.3</version>
-      </dependency>
+        <dependency>
+            <groupId>org.opensextant</groupId>
+            <artifactId>opensextant-xponents-core</artifactId>
+            <version>3.5.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.opensextant</groupId>
+                    <artifactId>giscore</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.opensextant</groupId>
+                    <artifactId>geodesy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.norconex.language</groupId>
+                    <artifactId>langdetect</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.locationtech.spatial4j</groupId>
+                    <artifactId>spatial4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>gnu.getopt</groupId>
+            <artifactId>java-getopt</artifactId>
+            <version>1.0.13</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <!-- Override JSON-lib use of old commons-lang 2.5 -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>70.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.21</version>
+        </dependency>
+        <!-- Tika Dependencies: lots of fixes from PDFBox and POI; Over millions
+          of documents converted we have seen lots of Tika parser errors. -->
+        <dependency>
+            <groupId>com.pff</groupId>
+            <artifactId>java-libpst</artifactId>
+            <version>0.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>1.27</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-parsers</artifactId>
+            <version>1.27</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.sis.storage</groupId>
+                    <artifactId>sis-netcdf</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>pdfbox</artifactId>
+                    <groupId>org.apache.pdfbox</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpservices</artifactId>
+                    <groupId>edu.ucar</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>junrar</artifactId>
+                    <groupId>com.github.junrar</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>netcdf4</artifactId>
+                    <groupId>edu.ucar</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>grib</artifactId>
+                    <groupId>edu.ucar</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>cdm</artifactId>
+                    <groupId>edu.ucar</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>cxf-rt-rs-client</artifactId>
+                    <groupId>org.apache.cxf</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>vorbis-java-core</artifactId>
+                    <groupId>org.gagravarr</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>vorbis-java-tika</artifactId>
+                    <groupId>org.gagravarr</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>sis-metadata</artifactId>
+                    <groupId>org.apache.sis.core</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>sis-utility</artifactId>
+                    <groupId>org.apache.sis.core</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jmatio</artifactId>
+                    <groupId>net.sourceforge.jmatio</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>opennlp-tools</artifactId>
+                    <groupId>org.apache.opennlp</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>edu.usc.ir</groupId>
+                    <artifactId>sentiment-analysis-parser</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.tallison</groupId>
+                    <artifactId>jmatio</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.rometools</groupId>
+                    <artifactId>rome</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.uima</groupId>
+                    <artifactId>uimafit-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.uima</groupId>
+                    <artifactId>uimaj-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.htmlparser.jericho</groupId>
+            <artifactId>jericho-html</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.4.01</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>2.0.24</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Logback is nice and simple. -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <!-- HTTP/HTML collector clients, Web and Sharepoint -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>fluent-hc</artifactId>
+            <version>4.5.13</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-cache</artifactId>
+            <version>4.5.13</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.14</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10.13</version>
+        </dependency>
+        <dependency>
+            <groupId>de.l3s.boilerpipe</groupId>
+            <artifactId>boilerpipe</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jodd</groupId>
+            <artifactId>jodd-json</artifactId>
+            <version>5.1.5</version>
+        </dependency>
     </dependencies>
-  </dependencyManagement>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.1.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>3.2.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.0.0-M1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
-          <executions>
-              <execution>
-                <id>attach-tests</id>
-                <goals>
-                  <goal>test-jar</goal>
-                </goals>
-              </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>findbugs-maven-plugin</artifactId>
-          <version>3.0.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.sonarsource.scanner.maven</groupId>
-          <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.8.0.2131</version>
-        </plugin>        
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <header>&lt;img alt='[OpenSextant Logo]' height='36'
-            width='36'
-            src='doc-files/opensextant-manual-logo.png'/&gt;&lt;br&gt;copyright
-            OpenSextant.org, 2013-2020
-          </header>
-          <version>true</version>
-          <windowtitle>XText - Content Extraction Simplified</windowtitle>
-          <detectJavaApiLink>false</detectJavaApiLink>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadoc</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <useReleaseProfile>true</useReleaseProfile>
-          <releaseProfiles>release</releaseProfiles>
-          <goals>deploy</goals>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <compilerVersion>1.8</compilerVersion>
-          <compilerArgument>-Xlint:all,-path</compilerArgument>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>true</showDeprecation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- run explicitly with: mvn checkstyle:check -->
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>checkstyle.xml</configLocation>
-          <propertyExpansion>checkstyle.indentChars=4</propertyExpansion>
-          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>false</failOnViolation>
-        </configuration>
-      </plugin>
-      <!-- run explicitly with: mvn findbugs:check -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <configuration>
-          <xmlOutput>true</xmlOutput>
-          <!--<threshold>High</threshold> -->
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-cli</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase></phase> <!-- Only execute from the command line. -->
-            <configuration>
-              <outputDirectory>lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <includeScope>test</includeScope>
-            </configuration>
-          </execution>
-          <execution>
-            <id>dependency-analysis</id>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <phase>verify</phase>
-            <configuration>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <additionalClasspathElements>
-            <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement>
-          </additionalClasspathElements>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <!-- slow: -->
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-              <!--<report>test-javadoc</report> -->
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
+    <dependencyManagement>
+        <dependencies>
+            <!-- JUnit -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.1</version>
+                <scope>test</scope>
+            </dependency>
+            <!-- Logging -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.0.0-M1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <executions>
+                        <execution>
+                            <id>attach-tests</id>
+                            <goals>
+                                <goal>test-jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.0.0-M4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>findbugs-maven-plugin</artifactId>
+                    <version>3.0.5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.8.0.2131</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>3.0.0-M4</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
-          <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- Automate GnuPG -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.7</version>
-            <extensions>true</extensions>
-            <configuration>
-              <serverId>ossrh</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
-            </configuration>
-          </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <header>&lt;img alt='[OpenSextant Logo]' height='36'
+                        width='36'
+                        src='doc-files/opensextant-manual-logo.png'/&gt;&lt;br&gt;copyright
+                        OpenSextant.org, 2013-2021
+                    </header>
+                    <version>true</version>
+                    <windowtitle>XText - Content Extraction Simplified</windowtitle>
+                    <detectJavaApiLink>false</detectJavaApiLink>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadoc</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <useReleaseProfile>true</useReleaseProfile>
+                    <releaseProfiles>release</releaseProfiles>
+                    <goals>deploy</goals>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <compilerVersion>1.8</compilerVersion>
+                    <compilerArgument>-Xlint:all,-path</compilerArgument>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- run explicitly with: mvn checkstyle:check -->
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>checkstyle.xml</configLocation>
+                    <propertyExpansion>checkstyle.indentChars=4</propertyExpansion>
+                    <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+                    <consoleOutput>true</consoleOutput>
+                    <failOnViolation>false</failOnViolation>
+                </configuration>
+            </plugin>
+            <!-- run explicitly with: mvn findbugs:check -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <configuration>
+                    <xmlOutput>true</xmlOutput>
+                    <!--<threshold>High</threshold> -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase></phase> <!-- Only execute from the command line. -->
+                        <configuration>
+                            <outputDirectory>lib</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                            <includeScope>test</includeScope>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>dependency-analysis</id>
+                        <goals>
+                            <goal>analyze-only</goal>
+                        </goals>
+                        <phase>verify</phase>
+                        <configuration>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <additionalClasspathElements>
+                        <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement>
+                    </additionalClasspathElements>
+                </configuration>
+            </plugin>
         </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <!-- OSS Sonatype instructions: list repositories -->
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-    </repository>
-  </distributionManagement>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <!-- slow: -->
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc</report>
+                            <!--<report>test-javadoc</report> -->
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Automate GnuPG -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.7</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <!-- OSS Sonatype instructions: list repositories -->
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
+    </distributionManagement>
 </project>
diff --git a/src/main/java/org/opensextant/xtext/XText.java b/src/main/java/org/opensextant/xtext/XText.java
index 4f04ecb..f0f29c8 100644
--- a/src/main/java/org/opensextant/xtext/XText.java
+++ b/src/main/java/org/opensextant/xtext/XText.java
@@ -1,20 +1,3 @@
-/*
- *
- *      Copyright 2012-2013 The MITRE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|
 //
 // _____                                ____                     __                       __
@@ -28,6 +11,7 @@
 //             \/_/
 //
 //   OpenSextant XText
+//   Copyright 2012-2021 MITRE
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|
 // 
 package org.opensextant.xtext;
@@ -63,6 +47,7 @@
 import org.opensextant.xtext.converters.TextTranscodingConverter;
 import org.opensextant.xtext.converters.TikaHTMLConverter;
 import org.opensextant.xtext.converters.WebArchiveConverter;
+import org.opensextant.xtext.converters.OfficeConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -126,16 +111,16 @@ public PathManager getPathManager() {
     private final int maxHTMLBuffer = 5 * maxBuffer;
     private long maxFileSize = FILE_SIZE_LIMIT;
 
-    protected Set<String> archiveFileTypes = new HashSet<String>();
+    protected Set<String> archiveFileTypes = new HashSet<>();
 
     /**
      *
      */
-    public static Map<String, Converter> converters = new HashMap<String, Converter>();
+    public static Map<String, Converter> converters = new HashMap<>();
     private Converter defaultConversion;
     private Converter embeddedConversion;
-    private final Set<String> requestedFileTypes = new HashSet<String>();
-    private final Set<String> ignoreFileTypes = new HashSet<String>();
+    private final Set<String> requestedFileTypes = new HashSet<>();
+    private final Set<String> ignoreFileTypes = new HashSet<>();
     private boolean allowNoExtension = false;
 
     /**
@@ -682,14 +667,8 @@ public ConvertedDocument convertFile(File input, ConvertedDocument parent) throw
             long t2 = System.currentTimeMillis();
             int duration = (int) (t2 - t1);
             if (textDoc != null) {
-                // Buffer can be null. If you got this far, you are interested
-                // in the file, as it passed
-                // all filters above. Return the document with whatever metadata
-                // it found.
-                // if (textDoc.buffer == null) {
-                // throw new
-                // IOException("Engineering error: Doc converted, but converter failed to setText()");
-                // }
+                // Buffer can be null. If you got this far, you are interested in the file, as it passed
+                // all filters above. Return the document with whatever metadata it found.
                 if (paths.isSaving() && textDoc.is_converted) {
                     // Get Parent info in there.
                     if (parent != null) {
@@ -935,7 +914,9 @@ public void setup() throws IOException {
             requestedFileTypes.add("xhtml");
         }
 
-        MessageConverter emailParser = new MessageConverter();
+        boolean useMSOffice = false;
+        Converter emailParser = useMSOffice ? new OfficeConverter() : new MessageConverter();
+
         mimetype = "eml";
         if (requestedFileTypes.contains(mimetype)) {
             converters.put(mimetype, emailParser);
diff --git a/src/main/java/org/opensextant/xtext/converters/OfficeConverter.java b/src/main/java/org/opensextant/xtext/converters/OfficeConverter.java
new file mode 100644
index 0000000..5b5445e
--- /dev/null
+++ b/src/main/java/org/opensextant/xtext/converters/OfficeConverter.java
@@ -0,0 +1,64 @@
+package org.opensextant.xtext.converters;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.microsoft.OfficeParser;
+import org.apache.tika.sax.BodyContentHandler;
+import org.opensextant.xtext.ConvertedDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class OfficeConverter extends ConverterAdapter {
+
+    
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+    private OfficeParser parser = new OfficeParser();
+
+    public OfficeConverter() { }
+    
+    
+    /**
+     * 
+     * @param input input stream
+     * @param doc File
+     * @return ConvertedDocument
+     * @throws IOException on IO failure with stream or conversion of content
+     */
+    @Override
+    protected ConvertedDocument conversionImplementation(InputStream input, java.io.File doc)
+            throws IOException {
+        Metadata metadata = new Metadata();  
+        ParseContext ctx = new ParseContext();
+        BodyContentHandler handler = new BodyContentHandler();
+
+        try {
+            parser.parse(input, handler, metadata, ctx);
+        } catch (NoClassDefFoundError classErr){
+            throw new IOException("Unable to parse content due to Tika misconfiguration", classErr);
+        } catch (Exception xerr) {
+            throw new IOException("Unable to parse content", xerr);
+        } finally {
+            input.close();
+        }
+
+        /* Construct a response */
+        ConvertedDocument textdoc = new ConvertedDocument(doc);
+
+        /* Add essential metadata */
+        textdoc.addTitle(metadata.get(TikaCoreProperties.TITLE));
+        textdoc.setEncoding(metadata.get(Metadata.CONTENT_ENCODING));
+        textdoc.addCreateDate(metadata.getDate(TikaCoreProperties.CREATED));
+        textdoc.addAuthor(metadata.get(TikaCoreProperties.CREATOR));
+
+        /* Mark the document as converted */
+        textdoc.is_converted = true;
+        return textdoc;
+    }
+       
+
+}
diff --git a/src/test/java/OfficeParserTool.java b/src/test/java/OfficeParserTool.java
new file mode 100644
index 0000000..34d4721
--- /dev/null
+++ b/src/test/java/OfficeParserTool.java
@@ -0,0 +1,44 @@
+
+import org.opensextant.xtext.ConvertedDocument;
+import org.opensextant.xtext.converters.MessageConverter;
+import org.opensextant.xtext.converters.OfficeConverter;
+
+public class OfficeParserTool {
+
+    /*
+     * TODO: Both MessageConverter and OfficeConverter are failing in basic .EML and .MSG files.
+     *  no standards....
+     */
+
+
+    public static void main(String[] args) {
+        OfficeConverter converter = new OfficeConverter();
+
+        String msMsg, mimeMsg = null;
+        ConvertedDocument msdoc = null, mimedoc = null;
+        try {
+            msdoc = converter.convert(args[0]);
+            msMsg = "success - " + msdoc.getProperty("title");
+        } catch (Exception err) {
+            //err.printStackTrace();
+            msMsg = err.getMessage();
+        }
+
+        try {
+            mimedoc = new MessageConverter().convert(args[0]);
+            mimeMsg = "success - " + mimedoc.getProperty("title");
+        } catch (Exception err) {
+            mimeMsg = err.getMessage();
+        }
+
+        System.out.println("MS OfficeConverter\n\tResult:" + msMsg);
+        if (msdoc != null) {
+            System.out.println("\tDoc " + msdoc.toString());
+        }
+
+        System.out.println("MIME MessageConverter\n\tResult:" + mimeMsg);
+        if (mimedoc != null) {
+            System.out.println("\tDoc " + mimedoc.toString());
+        }
+    }
+}
diff --git a/src/test/java/org/opensextant/xtext/converters/test/TestOfficeMail.java b/src/test/java/org/opensextant/xtext/converters/test/TestOfficeMail.java
new file mode 100644
index 0000000..f091991
--- /dev/null
+++ b/src/test/java/org/opensextant/xtext/converters/test/TestOfficeMail.java
@@ -0,0 +1,40 @@
+package org.opensextant.xtext.converters.test;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.opensextant.xtext.ConvertedDocument;
+import org.opensextant.xtext.converters.OfficeConverter;
+
+public class TestOfficeMail {
+
+    @ClassRule
+    public static final TemporaryFolder TEMP_DIR = new TemporaryFolder();
+    private static File TEST_FILE = null;
+
+    @BeforeClass
+    public static void setupTemporaryFolder() throws IOException {
+        TEST_FILE = TEMP_DIR.newFile("mimeEmailWithAttachmentsTest.eml");
+        FileUtils.copyInputStreamToFile(
+                MessageConverterTest.class.getResourceAsStream("mimeEmailWithAttachmentsTest.eml"), TEST_FILE);
+    }
+
+    // @Test
+    public void testMailMessageParser() {
+        OfficeConverter converter = new OfficeConverter();
+
+        try {
+            ConvertedDocument doc = converter.convert(TEST_FILE);
+        } catch (Exception err) {
+            err.printStackTrace();
+            fail("EML conversion failed");
+        }
+    }
+}