fix writing chars with padding and some clean up
diff --git a/build.gradle b/build.gradle
index f79499d..050b85b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,11 +8,10 @@
 
 description = 'MDF Sorter'
 group = 'org.eclipse.mdm'
-version = '1.0.1'
+version = '1.0.2'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'maven'
 
 repositories {
     mavenCentral()
@@ -22,3 +21,8 @@
     // testing
     testCompile 'junit:junit:4.12'
 }
+
+tasks.withType(JavaCompile) {
+    sourceCompatibility = '1.7'
+    targetCompatibility = '1.7'
+}
\ No newline at end of file
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/MDFAbstractParser.java b/src/main/java/org/eclipse/mdm/mdfsorter/MDFAbstractParser.java
index 92564cc..94be62e 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/MDFAbstractParser.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/MDFAbstractParser.java
@@ -39,7 +39,7 @@
 	protected long lasthandled = 0;
 
 	// Debug purposes
-	protected int fileruns = 0, foundblocks = 0;;
+	protected int fileruns = 0, foundblocks = 0;
 
 	/**
 	 * This map contains all MDFGenBlocks that have not been parsed, but their
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/MDFParser.java b/src/main/java/org/eclipse/mdm/mdfsorter/MDFParser.java
index a555f6f..bb3a5d1 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/MDFParser.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/MDFParser.java
@@ -83,7 +83,7 @@
 	 * @throws IOException
 	 *             If an input error occurs.
 	 */
-	public static byte[] readBytes(int bytes, FileChannel in)
+	private static byte[] readBytes(int bytes, FileChannel in)
 			throws IOException {
 		ByteBuffer chunk = ByteBuffer.allocate(bytes);
 		int bytesread = 0;
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java b/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java
index ee1491c..a4e7b71 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java
@@ -36,7 +36,7 @@
 	/**
 	 * Version of this tool as String. (Used in the file Header)
 	 */
-	public static final String VERSIONSTRING = "1.0.1";
+	public static final String VERSIONSTRING = "1.0.2";
 
 	/**
 	 * The logger for this application
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CCBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CCBLOCK.java
index 301c71c..08b72b2 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CCBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CCBLOCK.java
@@ -84,11 +84,6 @@
 		parent.setPrec(this);
 	}
 
-	public CCBLOCK(boolean bigendian) {
-		super(bigendian);
-		setId("CC");
-	}
-
 	public boolean isKnownPhysValue() {
 		return knownPhysValue;
 	}
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CDBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CDBLOCK.java
index c567450..9f8de94 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CDBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CDBLOCK.java
@@ -22,17 +22,17 @@
 	/**
 	 * Dependency Type
 	 */
-	int dependancyType;
+	private int dependancyType;
 
 	/**
 	 * UINT16: The number of dependencies.
 	 */
-	int noDependencies;
+	private int noDependencies;
 
 	/**
 	 * INT16[]: Size of each dimension, only valid for N-dimensional dependency.
 	 */
-	int dimensionsSize[];
+	private int dimensionsSize[];
 
 	/**
 	 * Parse a CDBLOCK from an existing MDF3GenBlock
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CGBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CGBLOCK.java
index 66f2743..b7fc3b4 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CGBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CGBLOCK.java
@@ -59,14 +59,6 @@
 		parent.setPrec(this);
 	}
 
-	public CGBLOCK(boolean bigendian) {
-		super(bigendian);
-		// always the same for a CGBlock
-		setLength(30);
-		setLinkCount(4);
-		setId("CG");
-	}
-
 	public MDF3GenBlock getLnkCgNext() {
 		return links[0];
 	}
@@ -202,16 +194,6 @@
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
-
-	@Override
 	public void updateLinks(RandomAccessFile r) throws IOException {
 		// set position to start of Block link section
 		r.seek(getOutputpos() + 4L);
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CNBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CNBLOCK.java
index caa62ad..488dad6 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CNBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/CNBLOCK.java
@@ -85,13 +85,6 @@
 		parent.setPrec(this);
 	}
 
-	public CNBLOCK(boolean bigendian) {
-		super(bigendian);
-		setId("##DG");
-		setLength(26);
-		setLinkCount(4);
-	}
-
 	public MDF3GenBlock getLnkNextCnBlock() {
 		return links[0];
 	}
@@ -368,14 +361,4 @@
 		return b.array();
 
 	}
-
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/DGBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/DGBLOCK.java
index 544d45f..e0f9596 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/DGBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/DGBLOCK.java
@@ -123,14 +123,4 @@
 		return ret;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
-
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/HDBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/HDBLOCK.java
index e8e6342..a639204 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/HDBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/HDBLOCK.java
@@ -85,13 +85,6 @@
 		parent.setPrec(this);
 	}
 
-	public HDBLOCK(boolean bigendian) {
-		super(bigendian);
-		setId("HD");
-		setLength(26);
-		setLinkCount(4);
-	}
-
 	public MDF3GenBlock getLnkFirstFileGroup() {
 		return links[0];
 	}
@@ -292,14 +285,4 @@
 		return b.array();
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
-
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3GenBlock.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3GenBlock.java
index c15068a..2bd41b2 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3GenBlock.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3GenBlock.java
@@ -10,15 +10,11 @@
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.SeekableByteChannel;
 
 import org.eclipse.mdm.mdfsorter.ArgumentStruct;
 import org.eclipse.mdm.mdfsorter.MDFCompatibilityProblem;
 import org.eclipse.mdm.mdfsorter.MDFGenBlock;
 import org.eclipse.mdm.mdfsorter.MDFProblemType;
-import org.eclipse.mdm.mdfsorter.mdf4.MDF4Util;
 
 public class MDF3GenBlock extends MDFGenBlock
 implements Comparable<MDF3GenBlock> {
@@ -51,7 +47,7 @@
 	/**
 	 * True, if this block is part of an bigendian file. False if not.
 	 */
-	protected boolean bigendian = false;;
+	protected boolean bigendian = false;
 
 	public MDF3GenBlock(long pos, boolean bigendian) {
 
@@ -258,28 +254,6 @@
 	}
 
 	/**
-	 * Returns the block type string at given position.
-	 *
-	 * @param channel
-	 *            The channel to read from.
-	 * @param pos
-	 *            The position within the channel.
-	 * @return The block type as string.
-	 * @throws IOException
-	 *             Error reading block type.
-	 */
-	protected static String getBlockType(SeekableByteChannel channel, long pos)
-			throws IOException {
-		// read block header
-		ByteBuffer bb = ByteBuffer.allocate(4);
-		bb.order(ByteOrder.LITTLE_ENDIAN);
-		channel.position(pos);
-		channel.read(bb);
-		bb.rewind();
-		return MDF4Util.readCharsISO8859(bb, 4);
-	}
-
-	/**
 	 * Parses the body section of a block. For a subclass of MDFGenBlock, this
 	 * method should fill all other fields with the correct values. DataBlock's
 	 * content should normally not be included in content, because the amount of
@@ -333,11 +307,6 @@
 		return ret;
 	}
 
-	public byte[] getBytes() {
-		throw new RuntimeException(
-				"getBytes cannot be invoked on a general Block.");
-	}
-
 	/**
 	 * Replaces each block with its more precise precedessor stored in
 	 * precedessor.
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3ProcessWriter.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3ProcessWriter.java
index 811633e..fc8decb 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3ProcessWriter.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf3/MDF3ProcessWriter.java
@@ -55,7 +55,7 @@
 		writtenblocks = new LinkedList<MDF3GenBlock>();
 	}
 
-	public int numberOfDatagroups = 0;
+	private int numberOfDatagroups = 0;
 
 	/**
 	 * Main Function of this class.
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CGBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CGBLOCK.java
index e1c33f0..2f95332 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CGBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CGBLOCK.java
@@ -90,14 +90,6 @@
 		parent.setPrec(this);
 	}
 
-	public CGBLOCK() {
-		super();
-		// always the same for a CGBlock
-		setLength(104L);
-		setLinkCount(6);
-		setId("##CG");
-	}
-
 	public MDF4GenBlock getLnkCgNext() {
 		return links[0];
 	}
@@ -280,14 +272,4 @@
 		return ret;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
-
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CHBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CHBLOCK.java
index 1677f79..5f95208 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CHBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/CHBLOCK.java
@@ -117,7 +117,4 @@
 		setHirarchyType(MDF4Util.readUInt8(bb));
 	}
 
-
-
-
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DGBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DGBLOCK.java
index 9c1b306..3917f40 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DGBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DGBLOCK.java
@@ -111,13 +111,4 @@
 		return ret;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DLBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DLBLOCK.java
index 7ba573d..72af43b 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DLBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DLBLOCK.java
@@ -178,16 +178,6 @@
 		return ret;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
-
 	/**
 	 * Checks if this list can be improved by merging blocks.
 	 *
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DTBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DTBLOCK.java
index 8acb481..0a091dc 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DTBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DTBLOCK.java
@@ -22,13 +22,6 @@
 public class DTBLOCK extends MDF4GenBlock {
 
 	/**
-	 * Constructor.
-	 */
-	public DTBLOCK() {
-		super(0);
-	}
-
-	/**
 	 * Parse a HLBLOCK from an existing MDFGenBlock
 	 *
 	 * @param parent
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DZBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DZBLOCK.java
index 4ce6413..e6f2e3a 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DZBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/DZBLOCK.java
@@ -157,13 +157,4 @@
 		return ret;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/FHBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/FHBLOCK.java
index 98270ce..52e9f5e 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/FHBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/FHBLOCK.java
@@ -125,14 +125,4 @@
 		return ret;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
-
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HDBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HDBLOCK.java
index 2563391..9cfdf53 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HDBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HDBLOCK.java
@@ -267,14 +267,4 @@
 
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
-
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HLBLOCK.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HLBLOCK.java
index 0c31b4a..d403897 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HLBLOCK.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/HLBLOCK.java
@@ -99,13 +99,4 @@
 		return ret;
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		return super.equals(o);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
 }
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4GenBlock.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4GenBlock.java
index 092f474..ff3bbd9 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4GenBlock.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4GenBlock.java
@@ -9,9 +9,6 @@
 package org.eclipse.mdm.mdfsorter.mdf4;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.SeekableByteChannel;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -234,28 +231,6 @@
 	}
 
 	/**
-	 * Returns the block type string at given position.
-	 *
-	 * @param channel
-	 *            The channel to read from.
-	 * @param pos
-	 *            The position within the channel.
-	 * @return The block type as string.
-	 * @throws IOException
-	 *             Error reading block type.
-	 */
-	protected static String getBlockType(SeekableByteChannel channel, long pos)
-			throws IOException {
-		// read block header
-		ByteBuffer bb = ByteBuffer.allocate(4);
-		bb.order(ByteOrder.LITTLE_ENDIAN);
-		channel.position(pos);
-		channel.read(bb);
-		bb.rewind();
-		return MDF4Util.readCharsISO8859(bb, 4);
-	}
-
-	/**
 	 * Parses the body section of a block. For a subclass of MDFGenBlock, this
 	 * method should fill all other fields with the correct values. DataBlock's
 	 * content should normally not be included in content, because the amount of
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Util.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Util.java
index 233708d..cb4bffa 100644
--- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Util.java
+++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Util.java
@@ -261,17 +261,7 @@
 			throws IOException {
 		byte[] b = new byte[length];
 		bb.get(b);
-
-		// lookup null character for string termination
-		int strLength = 0;
-		for (byte element : b) {
-			if (element == 0) {
-				break;
-			}
-			strLength++;
-		}
-
-		return new String(b, 0, strLength, CHARSET_ISO8859);
+		return new String(b, 0, length, CHARSET_ISO8859);
 	}
 
 	/**
@@ -289,17 +279,7 @@
 			throws IOException {
 		byte[] b = new byte[length];
 		bb.get(b);
-
-		// lookup null character for string termination
-		int strLength = 0;
-		for (byte element : b) {
-			if (element == 0) {
-				break;
-			}
-			strLength++;
-		}
-
-		return new String(b, 0, strLength, CHARSET_UTF8);
+		return new String(b, 0, length, CHARSET_UTF8);
 	}
 
 	public static byte[] getBytesCharsUTF8(String s) throws IOException {
diff --git a/src/test/java/org/eclipse/mdm/mdfsorter/MDF3GenBlockTest.java b/src/test/java/org/eclipse/mdm/mdfsorter/MDF3GenBlockTest.java
deleted file mode 100644
index 5bd39c0..0000000
--- a/src/test/java/org/eclipse/mdm/mdfsorter/MDF3GenBlockTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2016 Audi AG
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.eclipse.mdm.mdfsorter;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MDF3GenBlockTest {
-
-	@BeforeClass
-	public static void setUpBeforeClass() throws Exception {
-	}
-
-	@AfterClass
-	public static void tearDownAfterClass() throws Exception {
-	}
-
-	@Test
-	public void test() {
-
-	}
-
-}
diff --git a/src/test/java/org/eclipse/mdm/mdfsorter/MDF3UnsortProcessor.java b/src/test/java/org/eclipse/mdm/mdfsorter/MDF3UnsortProcessor.java
index f3f34a2..2e46eb8 100644
--- a/src/test/java/org/eclipse/mdm/mdfsorter/MDF3UnsortProcessor.java
+++ b/src/test/java/org/eclipse/mdm/mdfsorter/MDF3UnsortProcessor.java
@@ -144,7 +144,6 @@
 			MDFCompatibilityProblem prob = l.get(0);
 			MDFProblemType probtype = prob.getType();
 			MDF3GenBlock node = (MDF3GenBlock) prob.getStartnode();
-			MDF3GenBlock parentnode = (MDF3GenBlock) prob.getParentnode();
 			if (probtype == MDFProblemType.UNSORTED_DATA_PROBLEM) {
 				// Refactor Channel Group!
 				// We have more than one channel group in a single
diff --git a/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsortProcessor.java b/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsortProcessor.java
index 95bc130..1ddcb25 100644
--- a/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsortProcessor.java
+++ b/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsortProcessor.java
@@ -160,7 +160,6 @@
 			MDFCompatibilityProblem prob = l.get(0);
 			MDFProblemType probtype = prob.getType();
 			MDF4GenBlock node = (MDF4GenBlock) prob.getStartnode();
-			MDF4GenBlock parentnode = (MDF4GenBlock) prob.getParentnode();
 			if (probtype == MDFProblemType.UNSORTED_DATA_PROBLEM) {
 				// Refactor Channel Group!
 				// We have more than one channel group in a single
diff --git a/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsorter.java b/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsorter.java
index ea27ba1..c42cf25 100644
--- a/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsorter.java
+++ b/src/test/java/org/eclipse/mdm/mdfsorter/MDFUnsorter.java
@@ -61,6 +61,7 @@
 	 *            if all data should be Zipped (Stored in DZBlocks) in the
 	 *            output file.
 	 */
+	@SuppressWarnings("unchecked")
 	public static void unsortMDF(String inputfile, String outputfile,
 			long maxblocksize, boolean unzip) {
 		ArgumentStruct struct = new ArgumentStruct();
@@ -77,7 +78,7 @@
 			MDFFileContent<? extends MDFGenBlock> con = MDFParser
 					.serializeFile(bufstream.getChannel());
 
-			MDFAbstractProcessWriter processorwriter;
+			MDFAbstractProcessWriter<?> processorwriter;
 
 			if (con.isMDF3()) {
 				processorwriter = new MDF3UnsortProcessor(