diff --git a/mustang/dependency-reduced-pom.xml b/mustang/dependency-reduced-pom.xml
index 2c9eec48..4417996f 100644
--- a/mustang/dependency-reduced-pom.xml
+++ b/mustang/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.mustangproject.ZUGFeRD</groupId>
   <artifactId>mustang</artifactId>
   <name>Mustang</name>
-  <version>2.0.0.0</version>
+  <version>1.4.0.0</version>
   <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>
diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
index ef3f78e2..8a12c9a0 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
@@ -24,25 +24,25 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
   @Override
   public Date getDeliveryDate()
   {
-    return new GregorianCalendar(2014, Calendar.JULY, 3).getTime();
+    return new GregorianCalendar(2017, Calendar.MAY, 7).getTime();
   }
 
   @Override
   public Date getDueDate()
   {
-    return new GregorianCalendar(2014, Calendar.JULY, 24).getTime();
+    return new GregorianCalendar(2017, Calendar.MAY, 30).getTime();
   }
 
   @Override
   public Date getIssueDate()
   {
-    return new GregorianCalendar(2014, Calendar.JULY, 3).getTime();
+    return new GregorianCalendar(2017, Calendar.MAY, 9).getTime();
   }
 
   @Override
   public String getNumber()
   {
-    return "RE-20151008/504";
+    return "RE-20170509/505";
   }
 
   @Override
@@ -128,9 +128,9 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
   public IZUGFeRDExportableItem[] getZFItems()
   {
     Item[] allItems = new Item[3];
-    Product designProduct = new Product("", "Künstlerische Gestaltung (Stunde): Einer Beispielrechnung", "HUR", new BigDecimal("7.000000"));
+    Product designProduct = new Product("", "Künstlerische Gestaltung (Stunde): Einer Beispielrechnung", "HUR", new BigDecimal("7.000000"));
     Product balloonProduct = new Product("", "Luftballon: Bunt, ca. 500ml", "C62", new BigDecimal("19.000000"));
-    Product airProduct = new Product("", "Heiße Luft pro Liter", "LTR", new BigDecimal("19.000000"));
+    Product airProduct = new Product("", "Heiße Luft pro Liter", "LTR", new BigDecimal("19.000000"));
 
     allItems[0] = new Item(new BigDecimal("160"), new BigDecimal("1"), designProduct);
     allItems[1] = new Item(new BigDecimal("0.79"), new BigDecimal("400"), balloonProduct);
@@ -140,7 +140,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
 
     @Override
     public String getOwnPaymentInfoText() {
-        return "Überweisung";
+        return "Ãœberweisung";
     }
 
     @Override
@@ -360,7 +360,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
   public void testAImport() throws IOException
   {
     ZUGFeRDImporter zi = new ZUGFeRDImporter();
-    zi.extractLowLevel(this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20151008_504.pdf"));
+    zi.extractLowLevel(this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505.pdf"));
     // Reading ZUGFeRD
 
     String amount = null;
@@ -386,7 +386,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
     assertEquals(iban, getOwnIBAN());
     assertEquals(holder, getOwnOrganisationName());
 
-    assertEquals(dueDate, "20141029");
+    assertEquals(dueDate, "20170530");
     assertEquals(ref, getNumber());
 
   }
@@ -401,8 +401,8 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
   public void testZExport()
   {
 
-    final InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20151008_504blanko.pdf");
-    final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20151008_504newEdge.pdf";
+    final InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
+    final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505newEdge.pdf";
     // the writing part
 
     try
diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
index c0d6b1ea..1942bf29 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
@@ -25,25 +25,25 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
   @Override
   public Date getDeliveryDate()
   {
-    return new GregorianCalendar(2014, Calendar.JULY, 3).getTime();
+    return new GregorianCalendar(2017, Calendar.MAY, 7).getTime();
   }
 
   @Override
   public Date getDueDate()
   {
-    return new GregorianCalendar(2014, Calendar.JULY, 24).getTime();
+    return new GregorianCalendar(2017, Calendar.MAY, 30).getTime();
   }
 
   @Override
   public Date getIssueDate()
   {
-    return new GregorianCalendar(2014, Calendar.JULY, 3).getTime();
+    return new GregorianCalendar(2017, Calendar.MAY, 9).getTime();
   }
 
   @Override
   public String getNumber()
   {
-    return "RE-20151008/504";
+    return "RE-20170509/505";
   }
 
   @Override
@@ -129,7 +129,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
   {
     Item[] allItems = new Item[3];
     Product designProduct = new Product("", "Künstlerische Gestaltung (Stunde)", "HUR", new BigDecimal("7.000000"));
-    Product balloonProduct = new Product("", "Luftballon", "C62", new BigDecimal("19.000000"));
+    Product balloonProduct = new Product("", "Luftballon: Bunt, ca. 500ml", "C62", new BigDecimal("19.000000"));
     Product airProduct = new Product("", "Heiße Luft pro Liter", "LTR", new BigDecimal("19.000000"));
 
     allItems[0] = new Item(new BigDecimal("160"), new BigDecimal("1"), designProduct);
@@ -324,9 +324,9 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
       return VATPercent;
     }
 
-    public void setVATPercent(BigDecimal vATPercent)
+    public void setVATPercent(BigDecimal VATPercent)
     {
-      VATPercent = vATPercent;
+      VATPercent = VATPercent;
     }
 
   }
@@ -363,7 +363,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
   public void testAImport() throws IOException
   {
     ZUGFeRDImporter zi = new ZUGFeRDImporter();
-    InputStream inputStream = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20151008_504.pdf");
+    InputStream inputStream = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505.pdf");
     zi.extractLowLevel(inputStream);
     // Reading ZUGFeRD
 
@@ -400,8 +400,8 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
    */
   public void testZExport()
   {
-    final InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20151008_504blanko.pdf");
-    final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20151008_504new.pdf";
+    final InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
+    final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505new.pdf";
 
     // the writing part
     try
diff --git a/pom.xml b/pom.xml
index 161fb086..4b0f2828 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.rayman2200</groupId>
 	<artifactId>mustang-sample-project</artifactId>
-	<version>1.3.3-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<scm>
-		<connection>scm:git:https://github.com/jstaerk/mustangproject.git</connection>
-		<developerConnection>scm:git:https://github.com/jstaerk/mustangproject.git</developerConnection>
-		<url>https://github.com/jstaerk/mustangproject</url>
+		<connection>scm:git:https://github.com/ZUGFeRD/mustangproject.git</connection>
+		<developerConnection>scm:git:https://github.com/ZUGFeRD/mustangproject.git</developerConnection>
+		<url>https://github.com/ZUGFeRD/mustangproject</url>
 		<tag>HEAD</tag>
 	</scm>
 
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>
-			<version>1.8.8</version>
+			<version>2.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>