diff --git a/History.md b/History.md
index 6d81d803..9d414c22 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,10 @@
+1.4.0
+=====
+2017-05-11
+Switched to ZUGFeRD extended, new all-in-one jar including dependencies, 
+switch to Apache PDFBox 2.0. Some bugfixes. 
+Thanks to AlexanderSchmidt and yankee42. 
+
 1.3.1
 =====
 2016-06-01
diff --git a/mustang/doc/MustangDev.en.odt b/mustang/doc/MustangDev.en.odt
index c9bbe3b7..d33a3b3a 100644
Binary files a/mustang/doc/MustangDev.en.odt and b/mustang/doc/MustangDev.en.odt differ
diff --git a/mustang/doc/MustangWriter.java b/mustang/doc/MustangWriter.java
index 0f440de9..3e83fe34 100644
--- a/mustang/doc/MustangWriter.java
+++ b/mustang/doc/MustangWriter.java
@@ -147,22 +147,22 @@ public class MustangWriter implements IZUGFeRDExportableTransaction {
 
 	@Override
 	public Date getDeliveryDate() {
-		return new GregorianCalendar(2015, Calendar.OCTOBER, 7).getTime();
+		return new GregorianCalendar(2017, Calendar.MAY, 7).getTime();
 	}
 
 	@Override
 	public Date getDueDate() {
-		return new GregorianCalendar(2015, Calendar.OCTOBER, 29).getTime();
+		return new GregorianCalendar(2017, Calendar.MAY, 30).getTime();
 	}
 
 	@Override
 	public Date getIssueDate() {
-		return new GregorianCalendar(2015, Calendar.OCTOBER, 8).getTime();
+		return new GregorianCalendar(2017, Calendar.MAY, 9).getTime();
 	}
 
 	@Override
 	public String getNumber() {
-		return "RE-20151008/504";
+		return "RE-20170509/505";
 	}
 
 	@Override
@@ -245,7 +245,7 @@ public class MustangWriter implements IZUGFeRDExportableTransaction {
 		try {
 			System.out.println("Reading blank PDF");
 			doc = PDDocument
-					.load("/Users/jstaerk/workspace/zugferd/MustangGnuaccountingBeispielRE-20151008_504blanko.pdf");
+					.load("/Users/jstaerk/workspace/zugferd/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
 			ZUGFeRDExporter ze = new ZUGFeRDExporter();
 			System.out.println("Converting to PDF/A-3u");
 			ze.PDFmakeA3compliant(doc, "Mustangproject",
@@ -255,7 +255,7 @@ public class MustangWriter implements IZUGFeRDExportableTransaction {
 			ze.PDFattachZugferdFile(doc, this);
 			System.out.println("Writing ZUGFeRD-PDF");
 
-			doc.save("/Users/jstaerk/workspace/zugferd/MustangGnuaccountingBeispielRE-20151008_504.pdf");
+			doc.save("/Users/jstaerk/workspace/zugferd/MustangGnuaccountingBeispielRE-20170509_505.pdf");
 			System.out.println("Done.");
 		} catch (IOException e) {
 			e.printStackTrace();
diff --git a/mustang/doc/ZugferdDev.de.odt b/mustang/doc/ZugferdDev.de.odt
index e64e86e6..56d7d5b1 100644
Binary files a/mustang/doc/ZugferdDev.de.odt and b/mustang/doc/ZugferdDev.de.odt differ
diff --git a/mustang/doc/ZugferdDev.en.odt b/mustang/doc/ZugferdDev.en.odt
index af671f43..c85f8b2b 100644
Binary files a/mustang/doc/ZugferdDev.en.odt and b/mustang/doc/ZugferdDev.en.odt differ
diff --git a/mustang/doc/konikmustangvergleich.odt b/mustang/doc/konikmustangvergleich.odt
index 4f9a749b..99c02ed5 100644
Binary files a/mustang/doc/konikmustangvergleich.odt and b/mustang/doc/konikmustangvergleich.odt differ