diff --git a/History.md b/History.md
index 1ade536c..7f8e73ea 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,6 @@
-1.4.1
+1.5.0
 =====
+<date>
 Now using factory. Export now also possible on OutputStream.
 Further dev improvements: no more need to call PDFattachZugferdFile(null);
 toecount now has options to combine documents and upgrade xml file from ZF1 to ZF2
diff --git a/src/main/java/org/mustangproject/ZUGFeRD/IExporterFactory.java b/src/main/java/org/mustangproject/ZUGFeRD/IExporterFactory.java
index db1c681f..fda5f97b 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/IExporterFactory.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/IExporterFactory.java
@@ -31,6 +31,7 @@ public interface IExporterFactory {
 	public IExporterFactory setCreator(String creator);
 	public IExporterFactory setConformanceLevel(PDFAConformanceLevel newLevel);
 	public IExporterFactory setProducer(String producer) ;
+	public IExporterFactory setZUGFeRDVersion(int version);
 	public IExporterFactory ignorePDFAErrors();
 	public IExporterFactory setZUGFeRDConformanceLevel(ZUGFeRDConformanceLevel zugferdConformanceLevel);
 	public IExporterFactory setAttachZUGFeRDHeaders(final boolean attachZugferdHeaders);
diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java
index d5ef5437..b69e1ca1 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java
@@ -62,10 +62,6 @@ public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
 	}
 	
 	
-	public void setZUGFeRDversion(int version) {
-		ZFVersion=version;
-	}
-
 	public void prepareDocument(PDDocument doc) throws IOException {
 		String fullProducer = producer + " (via mustangproject.org " + org.mustangproject.ZUGFeRD.Version.VERSION + ")";
 
@@ -264,4 +260,11 @@ public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
 		this.producer = producer;
 		return this;
 	}
+
+
+	@Override
+	public IExporterFactory setZUGFeRDVersion(int version) {
+		this.ZFVersion=version;
+		return this;
+	}
 }
diff --git a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java
index d42f5ba2..00e4fc9f 100644
--- a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java
+++ b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java
@@ -192,6 +192,8 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 			zea1.close();
 			String pdfContent=baos.toString("UTF-8");
 			assertFalse(pdfContent.indexOf("(via mustangproject.org")==-1);
+			assertFalse(pdfContent.indexOf("<zf:ConformanceLevel>BASIC</zf:ConformanceLevel>") == -1);
+
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
index 4bea0952..5a6c8cd7 100644
--- a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
+++ b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
@@ -341,7 +341,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 			holder = zi.getHolder();
 			ref = zi.getForeignReference();
 		}
-// this resembles the data written in MustangReaderWriterCustomXMLTest
+		// this resembles the data written in MustangReaderWriterCustomXMLTest
 		assertEquals(amount, "571.04");
 		assertEquals(bic, "COBADEFFXXX");
 		assertEquals(iban, "DE88 2008 0000 0970 3757 00");
@@ -366,9 +366,8 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 		try (InputStream SOURCE_PDF = this.getClass()
 				.getResourceAsStream("/MustangGnuaccountingBeispielRE-20171118_506blanko.pdf");
 
-			ZUGFeRDExporter ze = new ZUGFeRDExporterFromA1Factory().load(SOURCE_PDF)) {
-			ze.setZUGFeRDVersion(2);
-
+				ZUGFeRDExporter ze = new ZUGFeRDExporterFromA1Factory().setZUGFeRDVersion(2).load(SOURCE_PDF)) {
+		
 			ze.PDFattachZugferdFile(this);
 			ze.disableAutoClose(true);
 			ze.export(TARGET_PDF);
@@ -379,8 +378,8 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 			String pdfContent = baos.toString("UTF-8");
 			assertFalse(pdfContent.indexOf("(via mustangproject.org") == -1);
 			// check for pdf-a schema extension
-			assertFalse(pdfContent.indexOf("<fx:DocumentFileName>factur-x.xml</fx:DocumentFileName>")==-1);
-			assertFalse(pdfContent.indexOf("urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended")==-1);
+			assertFalse(pdfContent.indexOf("<fx:ConformanceLevel>EXTENDED</fx:ConformanceLevel>") == -1);
+			assertFalse(pdfContent.indexOf("urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended") == -1);
 		}
 
 		// now check the contents (like MustangReaderTest)