diff --git a/mustang/pom.xml b/mustang/pom.xml
index 6b337cad..d7686705 100644
--- a/mustang/pom.xml
+++ b/mustang/pom.xml
@@ -1,52 +1,60 @@
 <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>
-	<parent>
-		<groupId>com.github.rayman2200</groupId>
-		<artifactId>mustang-sample-project</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
-	</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.rayman2200</groupId>
+        <artifactId>mustang-sample-project</artifactId>
+        <version>1.2.1-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.mustangproject.ZUGFeRD</groupId>
-	<artifactId>mustang</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>org.mustangproject.ZUGFeRD</groupId>
+    <artifactId>mustang</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<name>Mustang</name>
-	<description>The Mustang project is a java library to read and write ZUGFeRD meta data inside your invoice PDFs</description>
-	<url>http://www.mustangproject.org/</url>
+    <name>Mustang</name>
+    <description>The Mustang project is a java library to read and write ZUGFeRD meta data inside your invoice PDFs</description>
+    <url>http://www.mustangproject.org/</url>
 
-	<mailingLists>
-		<mailingList>
-			<name>User List</name>
-			<archive>https://groups.google.com/forum/?hl=de#!forum/mustangproject</archive>
-		</mailingList>
-	</mailingLists>
+    <dependencies>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.2.11</version>
+        </dependency>
+    </dependencies>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-			<comments>A business-friendly OSS license</comments>
-		</license>
-	</licenses>
+    <mailingLists>
+        <mailingList>
+            <name>User List</name>
+            <archive>https://groups.google.com/forum/?hl=de#!forum/mustangproject</archive>
+        </mailingList>
+    </mailingLists>
 
-	<developers>
-		<developer>
-			<name>Jochen Stärk</name>
-			<email>jstaerk@usegroup.de</email>
-				<roles>
-					<role>architect</role>
-					<role>developer</role>
-				</roles>
-		</developer>
-                <developer>
-			<name>Alexander Schmidt</name>
-			<email>schmidt.alexander@mail.de</email>
-				<roles>
-					<role>developer</role>
-				</roles>
-		</developer>
-	</developers>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Jochen Stärk</name>
+            <email>jstaerk@usegroup.de</email>
+            <roles>
+                <role>architect</role>
+                <role>developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Alexander Schmidt</name>
+            <email>schmidt.alexander@mail.de</email>
+            <roles>
+                <role>developer</role>
+            </roles>
+        </developer>
+    </developers>
 
 </project>
diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 77b0c33a..cdbc2ed3 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -11,7 +11,6 @@ package org.mustangproject.ZUGFeRD;
  */
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -24,8 +23,6 @@ import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;