diff --git a/lib/catroid_class_hierarchy.jar b/lib/catroid_class_hierarchy.jar
index 3d5451fb..a044ef24 100644
Binary files a/lib/catroid_class_hierarchy.jar and b/lib/catroid_class_hierarchy.jar differ
diff --git a/sourcecodefilter/.classpath b/sourcecodefilter/.classpath
index 3f3271f5..4159aeb7 100755
--- a/sourcecodefilter/.classpath
+++ b/sourcecodefilter/.classpath
@@ -21,9 +21,9 @@
 	<classpathentry kind="lib" path="lib/org.eclipse.osgi_3.10.100.v20150529-1857.jar"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.text_3.5.400.v20150505-1044.jar"/>
 	<classpathentry kind="lib" path="lib/snakeyaml-1.16.jar"/>
-	<classpathentry kind="lib" path="/home/lukas/IdeaProjects/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4.jar"/>
-	<classpathentry kind="lib" path="/home/lukas/IdeaProjects/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4-javadoc.jar"/>
-	<classpathentry kind="lib" path="/home/lukas/IdeaProjects/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4-jdk14.jar"/>
-	<classpathentry kind="lib" path="/home/lukas/IdeaProjects/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4-sources.jar"/>
+	<classpathentry kind="lib" path="/home/martin/Dokumente/ScratchToCatrobat/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4.jar"/>
+	<classpathentry kind="lib" path="/home/martin/Dokumente/ScratchToCatrobat/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4-javadoc.jar"/>
+	<classpathentry kind="lib" path="/home/martin/Dokumente/ScratchToCatrobat/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4-jdk14.jar"/>
+	<classpathentry kind="lib" path="/home/martin/Dokumente/ScratchToCatrobat/ScratchToCatrobat/sourcecodefilter/lib/ini4j-0.5.4-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/sourcecodefilter/config/config.yml b/sourcecodefilter/config/config.yml
index 694a2c60..c27084a9 100644
--- a/sourcecodefilter/config/config.yml
+++ b/sourcecodefilter/config/config.yml
@@ -640,6 +640,8 @@ class_to_preserved_methods_mapping:
         - getDefaultScene
         - getUserVariable
         - getUserList
+        - getNotesAndCredits
+        - setNotesAndCredits
     SoundInfo:
         - compareTo
         - setTitle
diff --git a/sourcecodefilter/src/sourcecodefilter/SourceCodeFilter.java b/sourcecodefilter/src/sourcecodefilter/SourceCodeFilter.java
index 1e4e68c8..91037eca 100644
--- a/sourcecodefilter/src/sourcecodefilter/SourceCodeFilter.java
+++ b/sourcecodefilter/src/sourcecodefilter/SourceCodeFilter.java
@@ -35,10 +35,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTParser;
@@ -51,7 +51,6 @@
 import org.eclipse.jdt.core.dom.FieldDeclaration;
 import org.eclipse.jdt.core.dom.IExtendedModifier;
 import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.Modifier;
 import org.eclipse.jdt.core.dom.ParameterizedType;
@@ -60,23 +59,22 @@
 import org.eclipse.jdt.core.dom.Statement;
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.ini4j.Ini;
 import org.ini4j.Wini;
 import org.yaml.snakeyaml.Yaml;
 
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+
 import sourcecodefilter.ConverterRelevantCatroidSource.FilteringProject;
 import sourcecodefilter.filter.AssignmentFilter;
 import sourcecodefilter.filter.IfElseFilter;
 import sourcecodefilter.filter.MethodInvocationFilter;
-import sourcecodefilter.filter.VariableDeclarationFilter;
 import sourcecodefilter.filter.TryCatchFilter;
+import sourcecodefilter.filter.VariableDeclarationFilter;
 import sourcecodefilter.inject.InlineClassInjector;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
 class ExitCode {
 	public static final int FAILURE = 1;
 	public static final int SUCCESS = 0;
diff --git a/src/scratchtocatrobat/converter/converter.py b/src/scratchtocatrobat/converter/converter.py
index d9ccff37..7ec4b84e 100644
--- a/src/scratchtocatrobat/converter/converter.py
+++ b/src/scratchtocatrobat/converter/converter.py
@@ -1806,20 +1806,21 @@ def _update_xml_header(xml_header, scratch_project_id, program_name, scratch_pro
         xml_header.setRemixParentsUrlString(helpers.config.get("SCRATCH_API", "project_base_url") + scratch_project_id)
 
         sep_line = "\n" + "-" * 40 + "\n"
-        description = sep_line
+        description = ""
+
         try:
             if scratch_project_instructions is not None:
-                description += "Instructions:\n" + scratch_project_instructions + sep_line
+                description += scratch_project_instructions + sep_line
         except:
             # TODO: FIX ASCII issue!!
             pass
 
         try:
             if scratch_project_notes_and_credits is not None:
-                description += "Description:\n" + scratch_project_notes_and_credits + sep_line
+                xml_header.setNotesAndCredits(scratch_project_notes_and_credits)
         except:
-            # TODO: FIX ASCII issue!!
             pass
+            # TODO: FIX ASCII issue!!
 
         description += "\nMade with {} version {}.\nOriginal Scratch project => {}".format( \
                          helpers.application_info("name"), \