diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index 4f26969..8df2130 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi</groupId>
 	<artifactId>fda</artifactId>
-	<version>2.3.1</version>
+	<version>2.4.1</version>
 
 	<dependencies>
 
@@ -29,13 +29,13 @@
 			<artifactId>ch.psi.fda.fdaq</artifactId>
 			<version>2.3.0</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>ch.psi</groupId>
 			<artifactId>jcae</artifactId>
 			<version>2.4.1</version>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>ch.psi</groupId>
 			<artifactId>plot</artifactId>
@@ -77,7 +77,7 @@
 			<artifactId>cli</artifactId>
 			<version>1.2</version>
 		</dependency>
-		
+
 		<!-- Library to Read Matlab Files -->
 		<dependency>
 			<groupId>com.jmatio</groupId>
@@ -90,7 +90,7 @@
 			<artifactId>freehep-xdr</artifactId>
 			<version>2.0.4</version>
 		</dependency>
-		<!-- JUnit test library -->
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -110,10 +110,24 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<additionalparam>-Xdoclint:none</additionalparam> <!-- Disable Java8 strict Javadoc checking -->
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.2</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -130,12 +144,12 @@
 		<snapshotRepository>
 			<id>i.snapshots</id>
 			<name>Artifactory Snapshots</name>
-			<url>http://yoke/artifactory/libs-snapshots-local</url>
+			<url>http://yoke.psi.ch/artifactory/libs-snapshots-local</url>
 		</snapshotRepository>
 		<repository>
 			<id>i.releases</id>
 			<name>Atrifactory Releases</name>
-			<url>http://yoke/artifactory/libs-releases-local</url>
+			<url>http://yoke.psi.ch/artifactory/libs-releases-local</url>
 		</repository>
 	</distributionManagement>
 </project>
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java
index 62aa3c5..cf28f9c 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java
@@ -48,10 +48,6 @@ public class DataDeserializerTXT implements DataDeserializer {
 	private List<Integer> dindex;
 	private List<Integer> iindex;
 	
-	/**
-	 * Default Constructor
-	 * @param file
-	 */
 	public DataDeserializerTXT(EventBus b, File file){
 		this.bus = b;
 		this.file = file;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
index ee56621..4e5fa26 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
@@ -61,8 +61,8 @@ public class ExecutionEngine {
 	 * Submit a scan to be executed. This will generate an execution request which is
 	 * enqueued in the execution queue.
 	 * 
-	 * @param edescriptor
-	 * @return
+	 * @param trackingId Tracking id
+	 * @param edescriptor	Edescriptor
 	 */
 	public void submit(String trackingId, EDescriptor edescriptor){
 
@@ -95,7 +95,7 @@ public class ExecutionEngine {
 	 * Terminate the request which is identified by its tracking id. If the request
 	 * is still in the execution queue it gets removed there.
 	 * 
-	 * @param trackingId
+	 * @param trackingId	Tracking ID
 	 */
 	public void terminate(String trackingId){
 		logger.info("Terminate TrackingId: "+trackingId);
@@ -132,9 +132,9 @@ public class ExecutionEngine {
 	
 	/**
 	 * Wait for the termination of the scan request
-	 * @param trackingId
-	 * @throws ExecutionException 
-	 * @throws InterruptedException 
+	 * @param trackingId Tracking ID
+	 * @throws ExecutionException -
+	 * @throws InterruptedException -
 	 */
 	public void wait(String trackingId) throws InterruptedException, ExecutionException{
 		logger.info("Waiting for termination for trackingId "+trackingId);