diff --git a/.gitignore b/.gitignore
index 2234032..bd9b665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+**.log
 .classpath
 .project
 bin
@@ -9,4 +10,4 @@ libquaqua64.jnilib
 .settings
 .DS_Store
 Statistics.ser
-dist/build
\ No newline at end of file
+dist/build
diff --git a/build.xml b/build.xml
index 0e522a1..9f33b0d 100644
--- a/build.xml
+++ b/build.xml
@@ -97,6 +97,7 @@
   <!-- =================================================================== -->
   <!-- Creates a minimal SysBio JAR                                        -->
   <!-- =================================================================== -->
+
   <target
     name="minimal_sysbio"
   	depends="init"
@@ -181,10 +182,10 @@
         <section name="SysBio">
           <attribute name="Specification-Title"    value="SysBio"/>
           <attribute name="Specification-Version"  value="Revision ${sysbio.revision}"/>
-          <attribute name="Specification-Vendor"   value="Center for Bioinformatics Tuebingen (ZBIT)"/>
+          <attribute name="Specification-Vendor"   value="Institute for Biomedical Informatics (IBMI)"/>
           <attribute name="Implementation-Title"   value="SysBio"/>
           <attribute name="Implementation-Version" value="Revision ${sysbio.revision} ${TODAY} (Build ${DSTAMP}-${TSTAMP})"/>
-          <attribute name="Implementation-Vendor"  value="University of Tuebingen"/>
+          <attribute name="Implementation-Vendor"  value="University of Tübingen"/>
         </section>
       </manifest>
       <zipfileset dir="${sysbio.dir}" prefix="META-INF/">
@@ -254,6 +255,7 @@
     <!-- =================================================================== -->
     <!-- Build a minimal version of JSBML for SBMLsimulator                  -->
     <!-- =================================================================== -->
+	
     <target
       name="minimal_jsbml"
       depends="init"
@@ -262,7 +264,7 @@
       <echo message="Defining basic properties of the JSBML project"/>
       <property name="jsbml.dir"      value="${basedir}/../JSBML"/>
       <property name="jsbml.name"     value="JSBML"/>
-      <property name="jsbml.version"  value="1.2"/>
+      <property name="jsbml.version"  value="1.5a"/>
       <property name="jar.excludes"   value="META-INF/**, **/package-info.class, **/package.html, **/*.java"/>
       <property name="jar.includes"   value="**.txt, **/*.txt, **.xml, **/*.xml, **.properties, **/*.properties, **.cfg, **/*.cfg, **.obo, **/*.obo"/>
       
@@ -406,7 +408,7 @@
         <zipfileset excludes="${jar.excludes}" src="${jsbml.dir}/core/lib/staxmate-2.3.0.jar"/>
         <zipfileset excludes="${jar.excludes}" src="${jsbml.dir}/core/lib/woodstox-core-5.0.1.jar"/>
       	<zipfileset excludes="${jar.excludes}" src="${jsbml.dir}/core/lib/xpp3_min-1.1.4c.jar"/>
-        <zipfileset excludes="${jar.excludes}" src="${jsbml.dir}/core/lib/xstream-1.3.1.jar"/>
+        <zipfileset excludes="${jar.excludes}" src="${jsbml.dir}/core/lib/xstream-1.4.9.jar"/>
         <zipfileset excludes="${jar.excludes}" src="${jsbml.dir}/modules/tidy/lib/jtidy-r938.jar"/>
       </jar>
       
diff --git a/dist/.gitignore b/dist/.gitignore
new file mode 100644
index 0000000..a6d64de
--- /dev/null
+++ b/dist/.gitignore
@@ -0,0 +1,5 @@
+/yguard.jar
+/secret.txt
+keystore
+obfuscation-log.xml
+SBMLsimulator-*
diff --git a/dist/Screenshot_1.PNG b/dist/Screenshot_1.png
similarity index 100%
rename from dist/Screenshot_1.PNG
rename to dist/Screenshot_1.png
diff --git a/dist/build.xml b/dist/build.xml
index c6f6644..13a65a3 100644
--- a/dist/build.xml
+++ b/dist/build.xml
@@ -29,32 +29,13 @@
   	
   	<property name="Name" value="SBMLsimulator"/>
     <property name="year" value="${YEAR}"/>
-  	<property name="version" value="2.0a"/>
+  	<property name="version" value="2.0"/>
   	<property name="repository.revision" value="1159"/>
 
     <echo message="----------- ${Name} ${version} [${year}] ------------"/>
     <echo message="-----------     ${TODAY}       ------------"/>
     <echo message="-----------     ${DSTAMP} ${TSTAMP}       ------------"/>
-  	
-    <!-- the path to the SBMLsimulator binaries -->
-    <property name="classes" location="${base}/bin"/>
     
-    <!-- the unobfuscated application jar file -->
-    <property name="appJarRaw" value="SBMLsimulator_unobfuscated.jar"/>
-  	
-    <!-- the unsigned application jar file -->
-    <property name="appJarObf" value="SBMLsimulator_unsigned.jar"/>
-
-    <!-- the FINAL obfuscated signed application jar file -->
-    <property name="appJar" value="SBMLsimulator.jar"/>
-
-  	
-    <!-- the yGuard jar file containing the obfuscation task -->
-    <property name="yGuardJar" value="yguard.jar"/>
-    
-    <!-- the log file geenrated by the obfuscation task -->
-    <property name="obfuscationLog" value="obfuscation-log.xml"/>
-  	
     <!-- For compiling the project -->
     <property name="src" location="${base}/src"/>
     <property name="test" location="${base}/test"/>
@@ -72,18 +53,16 @@
   	<property name="build.number"           value="${DSTAMP}-${TSTAMP}"/>
     <property name="build.name"             value="${version} (build ${build.number})"/>
   	
-    <property name="classes"                location="${base}/bin"/>
     <!--<property name="test"                   value="${base}/test"/>-->
     <property name="build.dir"              value="${basedir}/build"/>
     <property name="build.src"              value="${basedir}/build/src"/>
     <property name="build.dest"             value="${basedir}/build/classes"/>
     <property name="doc"                    value="${basedir}/doc/api"/>
     <property name="lib"                    value="${base}/lib"/>
-    <property name="dist"                   value="${basedir}/dist"/>
+    <property name="dist"                   value="${base}/dist"/>
     <property name="dist.dir"               value="${dist}/${Name}-${version}"/>
   	<property name="UUID"                   value="58f78f8d-a676-333a-b2e3-7ea6265d5ab7"/>
-  	<property name="garuda.gadget"          value="${dist.dir}/${JAR_Name}_v${version}_Garuda.zip"/>
-  	<property name="vendor"                 value="Center for Bioinformatics Tuebingen (ZBIT)"/>
+  	<property name="vendor"                 value="Institute for Biomedical Informatics (IBMI)"/>
   	
   	<property name="jar.exclude" value="META-INF/*.SF, META-INF/LICENSE*, META-INF/NOTICE*, META-INF/INDEX.LIST, META-INF/DEPENDENCIES, **/package.html, **/package-info.class, overview.html, *.txt"/>
   	
@@ -98,7 +77,7 @@
     
     <!-- the path to SYSBIO -->
     <property name="SysBioPath" location="${base}/../SysBio" />
-    <!-- the path to JSBML -->
+    <!-- the path to  -->
     <property name="JSBMLPath" location="${base}/../jsbml" />
     <!-- the path to SBML2LaTeX -->
     <property name="SBML2LaTeXPath" location="${base}/../SBML2LaTeX" />
@@ -106,11 +85,30 @@
     <property name="SBMLsimulatorCorePath" location="${base}/../SBSCL" />
     <!-- =================================== -->
   	
+  	<property name="JAR_Name" value="SBMLsimulator_v${version}"/>
+  	
+  	<!-- the unobfuscated application jar file -->
+    <property name="appJarRaw" value="${JAR_Name}_unobfuscated.jar"/>
+  	  	
+    <!-- the unsigned application jar file -->
+    <property name="appJarObf" value="${JAR_Name}_unsigned.jar"/>
+
+    <!-- the FINAL obfuscated signed application jar file -->
+    <property name="appJar" value="${dist.dir}/${JAR_Name}.jar"/>
+  	  	
+    <!-- the yGuard jar file containing the obfuscation task -->
+    <property name="yGuardJar" value="yguard.jar"/>
+  	    
+  	<!-- the log file geenrated by the obfuscation task -->
+    <property name="obfuscationLog" value="obfuscation-log.xml"/>
+
+  	
   </target>
 
   <!-- =================================================================== -->
   <!-- Prepares the build directory                                        -->
   <!-- =================================================================== -->
+  
   <target
     name="prepare"
     depends="init"
@@ -124,6 +122,7 @@
   <!-- =================================================================== -->
   <!-- Prepares the source code                                            -->
   <!-- =================================================================== -->
+
   <target
     name="prepare-src"
     depends="prepare"
@@ -160,11 +159,14 @@
   <!-- =================================================================== -->
   <!-- Compile                                                             -->
   <!-- =================================================================== -->
+
   <target
 	name="compile"
 	depends="prepare-src">
+  	
     <echo message="Compiling the entire SBMLsimulator project"/>
-    <javac
+    
+  	<javac
       classpathref="classpath"
       compiler="${build.compiler}"
       debug="${debug}"
@@ -188,6 +190,8 @@
   	  <src path="${resources}"/>
     </javac>
   	
+  	<echo message="Writing Manifest file"/>
+  	
   	<manifest file="${build.dest}/META-INF/MANIFEST.MF">
       <attribute name="Main-Class"             value="org.sbml.simulator.SBMLsimulator"/>
       <attribute name="SplashScreen-Image"     value="org/sbml/simulator/gui/img/Splash.gif"/>
@@ -197,27 +201,40 @@
         <attribute name="Implementation-Title"   value="${Name}"/>
         <attribute name="Implementation-Vendor"  value="University of Tuebingen"/>
         <attribute name="Implementation-Version" value="Revision ${repository.revision} (Build ${build.number})"/>
-        <attribute name="Implementation-URL"     value="http://www.cogsys.cs.uni-tuebingen.de/software/${Name}/"/>
+        <attribute name="Implementation-URL"     value="http://csb.informatik.uni-tuebingen.de/software#${Name}/"/>
         <attribute name="Specification-Title"    value="${Name}"/>
         <attribute name="Specification-Version"  value="${api.version}"/>
         <attribute name="Specification-Vendor"   value="${vendor}"/>
       </section>
-      <attribute name="Bundle-Name"            value="${Name}"/> 
+      <!--<attribute name="Bundle-Name"            value="${Name}"/> 
       <attribute name="Bundle-SymbolicName"    value="${UUID}"/>
       <attribute name="Bundle-Revision"        value="${repository.revision}"/>
       <attribute name="Bundle-Vendor"          value="${vendor}"/>
       <attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6"/>
-      <attribute name="Bundle-Version"         value="${version}"/>
+      <attribute name="Bundle-Version"         value="${version}"/>-->
     </manifest>
   	
+  	<echo message="Coyping files to target folder"/>
+  	
     <copy todir="${build.dest}/META-INF/" verbose="${verbose}">
       <fileset dir="${base}/licenses"/>
     </copy>
   	
+  	<!-- copy resource files -->
+  	<copy todir="${build.dest}" overwrite="yes">
+  	  <fileset 
+  	    dir="${resources}"
+  	    includes="org/**, **/*.properties, **/*.xml, **/*.png, **/*.jpg"
+  	    excludes="**/.svn*, **/*~, **/*.tgz, **/*.zip"/>
+    </copy>
+  	
   </target>
 
   <!-- puts the application specific classes into application.jar. -->
-  <target name="jar" depends="compile">
+  <target
+    name="jar"
+    depends="compile">
+  	
     <delete file="${appJarRaw}"/>
     <jar
       compress="true"
@@ -229,7 +246,7 @@
     >
       
       <!-- SBMLsimulator Classes -->
-      <fileset dir="${classes}">
+      <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
       	<exclude name="**/package-info.class"/>
       	<exclude name="overview.html"/>
@@ -310,12 +327,12 @@
     	
       <externalclasses>
         <pathelement location="${base}/lib/EvA2.jar"/>
-      	<pathelement location="${base}/lib/jsbml-1.2-incl-libs.jar"/>
+      	<pathelement location="${base}/lib/jsbml-1.5a-incl-libs.jar"/>
       	<pathelement location="${base}/lib/garuda-csr.jar"/>
-      	<pathelement location="${base}/lib/log4j-1.2-api-2.3.jar"/>
-      	<pathelement location="${base}/lib/log4j-api-2.3.jar"/>
-      	<pathelement location="${base}/lib/log4j-core-2.3.jar"/>
-      	<pathelement location="${base}/lib/log4j-slf4j-impl-2.3.jar"/>
+      	<pathelement location="${JSBMLPath}/core/lib/log4j-1.2-api-2.3.jar"/>
+      	<pathelement location="${JSBMLPath}/core/lib/log4j-api-2.3.jar"/>
+      	<pathelement location="${JSBMLPath}/core/lib/log4j-core-2.3.jar"/>
+      	<pathelement location="${JSBMLPath}/core/lib/log4j-slf4j-impl-2.3.jar"/>
       </externalclasses>
     	
 
@@ -484,7 +501,7 @@
   	  <!-- index="true" indexMetaInf="true" -->
   	  <zipfileset excludes="${jar.exclude}, tidy.gif, gpl-3.0.txt, jsc.jar, lgpl-3.0.txt, XPP3_1.1.4c_MIN_VERSION" src="${appJarObf}"/>
   	  <zipfileset excludes="${jar.exclude}" src="${base}/lib/EvA2.jar"/>
-  	  <zipfileset excludes="${jar.exclude}" src="${base}/lib/jsbml-1.2-incl-libs.jar"/>
+  	  <zipfileset excludes="${jar.exclude}" src="${base}/lib/jsbml-1.5a-incl-libs.jar"/>
   	  <zipfileset excludes="${jar.exclude}" src="${base}/lib/garuda/garuda-csr.jar"/>
   	  <zipfileset excludes="${jar.exclude}" src="${JSBMLPath}/core/lib/log4j-1.2-api-2.3.jar"/>
   	  <zipfileset excludes="${jar.exclude}" src="${JSBMLPath}/core/lib/log4j-api-2.3.jar"/>
@@ -497,8 +514,9 @@
   <!-- signs the application -->
   <target name="sign" depends="obfuscate">
   	<delete file="${appJar}"/>
-    <!-- Having an "keystore" file is required. Generate it with the "keytool" in the current directory. -->  	
-	  <signjar alias="SBMLsimulator" jar="${appJarObf}" keypass="d=dpfSBMLsimulator!" keystore="keystore" signedjar="${appJar}" storepass="d=dpfSBMLsimulator!"/>
+    <!-- Having an "keystore" file is required. Generate it with the "keytool" in the current directory. -->
+  	<!-- keytool -genkey -alias <alias name> -keystore <key file> (http://docs.oracle.com/javase/6/docs/technotes/tools/solaris/keytool.html) -->
+	<signjar alias="SBMLsimulator" jar="${appJarObf}" keystore="keystore" signedjar="${appJar}" tsaurl="http://timestamp.digicert.com" />
   </target>
 
 	
@@ -511,13 +529,100 @@
     </java>
   </target>
 
+	
+  <!-- =================================================================== -->
+  <!-- Creates a ZIP file for Garuda                                       -->
+  <!-- =================================================================== -->
+
+  <target
+    name="garuda"
+    depends="sign"
+    description="Creates a ZIP file for Garuda">
+	
+    <property name="garuda.gadget"  value="${dist.dir}/${JAR_Name}_Garuda.zip"/>
+    <property name="gadget.config"  value="gadget_config.xml"/>
+	  	
+    <!-- Launch command is platform dependent -> Determine command for platform -->
+    <!-- Windows: cmd /c start javaw.exe -jar gadgets/[GADGET_UUID]/[JAR_NAME] -->
+    <!-- Linux:   java -jar gadgets/[GADGET_UUID]/[JAR_NAME] -->
+    <!-- Mac OS:  open gadgets/[GADGET_UUID]/[JAR_NAME] -->
+    <condition property="jar.executor" value="open">
+      <os family="mac"/>
+    </condition>
+    <condition property="jar.executor" value="cmd /c start javaw.exe -jar">
+      <os family="windows"/>
+    </condition>
+    <condition property="jar.executor" value="java -jar">
+      <and>
+        <os family="unix"/>
+        <not>
+          <os family="mac"/>
+        </not>
+      </and>
+    </condition>
+	  	
+    <copy file="${dist}/${gadget.config}" todir="${dist.dir}/" verbose="${verbose}"/>
+    <property name="sbmlsimlator.config" value="${dist.dir}/${gadget.config}"/>
+	  	
+    <echo message="Updating Garuda gadget configuration..."/>
+    <replace
+      file="${sbmlsimlator.config}"
+      token="[LAUNCH_COMMAND]"
+      value="${jar.executor}"
+    />
+    <replace
+      file="${sbmlsimlator.config}"
+      token="[GADGET_UUID]"
+      value="${UUID}"
+    />
+    <replace
+      file="${sbmlsimlator.config}"
+      token="[GADGET_NAME]"
+      value="${Name}"
+    />
+    <replace
+      file="${sbmlsimlator.config}"
+      token="[JAR_NAME]"
+      value="${JAR_Name}.jar"
+    />
+	  	
+    <echo message="Generating ZIP archive for Garuda..."/>
+    <zip
+      compress="true"
+      comment="Garuda Gadget ${Name}"
+      destfile="${garuda.gadget}"
+      encoding="utf-8"
+      level="9"
+      update="true"
+    >
+      <mappedresources>
+        <fileset file="${sbmlsimlator.config}"/>
+        <globmapper from="*" to="${UUID}/*"/>
+      </mappedresources>
+      <mappedresources>
+        <fileset file="${appJar}"/>
+        <globmapper from="*" to="${UUID}/*"/>
+      </mappedresources>
+      <mappedresources>
+        <fileset file="${resources}/org/sbml/simulator/gui/img/${Name}_64.png"/>
+        <globmapper from="*" to="${UUID}/icons/*"/>
+      </mappedresources>
+      <zipfileset dir="${dist}/" prefix="${UUID}/snapshot/">
+        <include name="Screenshot_*.png"/>
+      </zipfileset>
+    </zip>
+	  	
+  	<delete file="${sbmlsimlator.config}" verbose="${verbose}"/>
+
+  </target>
+
   <!-- Removes all that has been built -->
   <target name="clean" depends="init">
   	<delete file="${appJarRaw}"/>
   	<delete file="${appJarObf}"/>
     <delete file="${appJar}"/>
   	<delete includeemptydirs="true" dir="${build.dir}"/>
-    <delete includeemptydirs="true" dir="${classes}"/>
+    <delete includeemptydirs="true" dir="${build.dest}"/>
   </target>
-
+	
 </project>
diff --git a/dist/gadget_config.xml b/dist/gadget_config.xml
index 5f12a54..f72d15c 100644
--- a/dist/gadget_config.xml
+++ b/dist/gadget_config.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
- * $Id$
- * $URL$
- *
  *******************************************************************************
  *
  * This file is part of SBMLsimulator, a Java-based simulator for models
  * of biochemical processes encoded in the modeling language SBML.
  *
- * Copyright (C) 2007-2016 by the University of Tuebingen, Germany.
+ * Copyright (C) 2007-2019 by the University of Tübingen, Germany.
  *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -18,8 +15,6 @@
  * <http://www.gnu.org/licenses/lgpl-3.0-standalone.html>.
  *
  *******************************************************************************
- *
- * Version: $Rev$
 -->
 <Gadget>
   <UUID>[GADGET_UUID]</UUID>
@@ -32,9 +27,9 @@
     <Icon32Path>icons/SBMLsimulator_64.png</Icon32Path>
   </IconPaths>
   <Snapshots>
-    <SnapshotPath>snapshot/Screenshot_1.PNG</SnapshotPath>
-    <SnapshotPath>snapshot/Screenshot_2.PNG</SnapshotPath>
-    <SnapshotPath>snapshot/Screenshot_3.PNG</SnapshotPath>
+    <SnapshotPath>snapshot/Screenshot_1.png</SnapshotPath>
+    <!--<SnapshotPath>snapshot/Screenshot_2.png</SnapshotPath>
+    <SnapshotPath>snapshot/Screenshot_3.png</SnapshotPath>-->
   </Snapshots>
   <Categories>
     <Category>Dynamic simulation</Category>
@@ -42,7 +37,7 @@
     <Category>Heuristic optimization</Category>
     <Category>Ordinary differential equation solver</Category>
   </Categories>
-  <Provider>University of Tuebingen</Provider>
+  <Provider>University of Tübingen</Provider>
   <Description>SBMLsimulator is a fast, accurate, and easily usable program for dynamic model simulation and heuristic parameter optimization of models encoded in the Systems Biology Markup Language (SBML). In order to ensure a high reliability of this software, its internal numerical solver engine, the Systems Biology Simulation Core Library, has been benchmarked against the entire SBML Test Suite and all models from the BioModels database. It includes a large collection of nature-inspired heuristic optimization procedures for efficient model calibration. SBMLsimulator provides an intuitive Graphical User Interface (GUI) and several command-line options to be suitable for large-scale batch processing and model calibration. SBMLsimulator runs on all platforms that provide a standard Java Virtual Machine and is based on the open-source library JSBML. The simulation core library of SBMLsimulator can be obtained as a separate application programming library.</Description>
   <LoadableKeys>
     <InputFileFormat>
diff --git a/lib/jsbml-1.4-a1-incl-libs.jar b/lib/jsbml-1.4-a1-incl-libs.jar
deleted file mode 100644
index 0912ab5..0000000
Binary files a/lib/jsbml-1.4-a1-incl-libs.jar and /dev/null differ
diff --git a/lib/jsbml-1.5a-incl-libs.jar b/lib/jsbml-1.5a-incl-libs.jar
new file mode 100644
index 0000000..bd745f5
Binary files /dev/null and b/lib/jsbml-1.5a-incl-libs.jar differ
diff --git a/src/org/sbml/simulator/SBMLsimulator.java b/src/org/sbml/simulator/SBMLsimulator.java
index 0259236..61b2847 100644
--- a/src/org/sbml/simulator/SBMLsimulator.java
+++ b/src/org/sbml/simulator/SBMLsimulator.java
@@ -51,7 +51,7 @@
 /**
  * The start program for {@link SBMLsimulator}, which can initialize the
  * graphical user interface or, alternatively, the command-line interface.
- * 
+ *
  * @author Andreas Dr&auml;ger
  * @author Roland Keller
  * @date 2010-09-01
@@ -95,7 +95,7 @@ public class SBMLsimulator extends Launcher {
   public static final String SOLVER_PACKAGE = "org.simulator.math.odes";
 
   /**
-   * 
+   *
    */
   public static final boolean garuda = true;
 
@@ -158,7 +158,7 @@ public class SBMLsimulator extends Launcher {
 
 
   /**
-   * 
+   *
    * @return
    */
   @SuppressWarnings("rawtypes")
@@ -199,7 +199,7 @@ public static final Class<QualityMeasure>[] getAvailableQualityMeasures() {
   }
 
   /**
-   * 
+   *
    * @return
    */
   @SuppressWarnings("rawtypes")
@@ -216,7 +216,7 @@ public static List<Class> getAvailableSolverClasses() {
   }
 
   /**
-   * 
+   *
    * @return
    */
   public static Class<AbstractDESSolver>[] getAvailableSolvers() {
@@ -224,7 +224,7 @@ public static Class<AbstractDESSolver>[] getAvailableSolvers() {
   }
 
   /**
-   * 
+   *
    * @param args
    * @throws IOException
    * @throws HeadlessException
@@ -234,7 +234,7 @@ public static void main(String args[]) {
   }
 
   /**
-   * 
+   *
    * @param args
    */
   public SBMLsimulator(String[] args) {
@@ -242,7 +242,7 @@ public SBMLsimulator(String[] args) {
   }
 
   /**
-   * 
+   *
    */
   public SBMLsimulator() {
     super();
@@ -366,7 +366,7 @@ public String getVersionNumber() {
    */
   @Override
   public short getYearOfProgramRelease() {
-    return (short) 2016;
+    return (short) 2019;
   }
 
   /* (non-Javadoc)