diff --git a/Classes/PHPWord/Settings.php b/Classes/PHPWord/Settings.php
new file mode 100644
index 00000000..67ef697e
--- /dev/null
+++ b/Classes/PHPWord/Settings.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2014 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2014 PHPWord
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    0.7.0
+ */
+
+/**
+ * PHPWord_Settings
+ */
+class PHPWord_Settings {
+    /**
+     * Compatibility option for XMLWriter
+     *
+     * @var boolean
+     */
+    private static $_xmlWriterCompatibility = true;
+
+    /**
+     * Set the compatibility option used by the XMLWriter
+     *
+     * @param boolean $compatibility  This sets the setIndent and setIndentString for better compatibility
+     * @return  boolean Success or failure
+     */
+    public static function setCompatibility($compatibility) {
+        if (is_bool($compatibility)) {
+            self::$_xmlWriterCompatibility = $compatibility;
+            return TRUE;
+        }
+        return FALSE;
+    } // function setCompatibility()
+
+
+    /**
+     * Return the compatibility option used by the XMLWriter
+     *
+     * @return boolean Compatibility
+     */
+    public static function getCompatibility() {
+        return self::$_xmlWriterCompatibility;
+    } // function getCompatibility()
+}
\ No newline at end of file
diff --git a/Classes/PHPWord/Shared/XMLWriter.php b/Classes/PHPWord/Shared/XMLWriter.php
index 1563ab46..91a9d530 100755
--- a/Classes/PHPWord/Shared/XMLWriter.php
+++ b/Classes/PHPWord/Shared/XMLWriter.php
@@ -81,15 +81,15 @@ class PHPWord_Shared_XMLWriter
             }
         }
 
-        // Set default values
-        // proposed to be false in production version
-        $this->_xmlWriter->setIndent(true);
-        //$this->_xmlWriter->setIndent(false);
-
-        // Set indent
-        // proposed to be '' in production version
-        $this->_xmlWriter->setIndentString('  ');
-        //$this->_xmlWriter->setIndentString('');
+        // Set xml Compatibility
+        $compatibility = PHPWord_Settings::getCompatibility();
+        if ($compatibility) {
+            $this->_xmlWriter->setIndent(false);
+            $this->_xmlWriter->setIndentString('');
+        } else {
+            $this->_xmlWriter->setIndent(true);
+            $this->_xmlWriter->setIndentString('  ');
+        }
     }
 
     /**