diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index cb17c2eda248ad25ecd5342499f1ef72007328f3..ad916254d99c77c0f1c7e1d89e70f5ac599f70df 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Mon Apr 20 12:42:35 CEST 2015
+#Mon Apr 20 15:07:50 CEST 2015
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/framework/AbstractCompositeStage.java b/src/main/java/teetime/framework/AbstractCompositeStage.java
index 44b10e6548bc3c431528d1fe50de4ef939b32783..c156a7c4b5c1b2874609d5081c3bd2215a4dbc1d 100644
--- a/src/main/java/teetime/framework/AbstractCompositeStage.java
+++ b/src/main/java/teetime/framework/AbstractCompositeStage.java
@@ -107,7 +107,7 @@ public abstract class AbstractCompositeStage extends Stage {
 		super.setOwningThread(owningThread);
 	}
 
-	protected <T> void connectStages(final OutputPort<? extends T> out, final InputPort<T> in) {
+	protected <T> void connectPorts(final OutputPort<? extends T> out, final InputPort<T> in) {
 		INTRA_PIPE_FACTORY.create(out, in);
 		containingStages.add(out.getOwningStage());
 		containingStages.add(in.getOwningStage());
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index 7ae760cb15cf3cea4b7a63a59cbfb2a5eeddcc66..fb0837cd830c32aaeeca5f25500529755df5b221 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -267,7 +267,7 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
 	 * This method will start the Analysis and block until it is finished.
 	 *
 	 * @throws AnalysisException
-	 *             if at least one exception in one thread has occurred within the analysis. The exception contains the pairs of thread and throwable
+	 *             if at least one exception in one thread has occurred within the analysis. The exception contains the pairs of thread and throwable.
 	 *
 	 * @since 1.1
 	 */
diff --git a/src/main/java/teetime/framework/test/StageTester.java b/src/main/java/teetime/framework/test/StageTester.java
index 29b64eeb1bbd27c0da5bdb20d1554e999e363b0c..d9f978537c3deab582fc162e629e04971c3510ac 100644
--- a/src/main/java/teetime/framework/test/StageTester.java
+++ b/src/main/java/teetime/framework/test/StageTester.java
@@ -21,6 +21,7 @@ import java.util.List;
 
 import teetime.framework.Analysis;
 import teetime.framework.AnalysisConfiguration;
+import teetime.framework.AnalysisException;
 import teetime.framework.Stage;
 import teetime.framework.StageState;
 import teetime.stage.CollectorSink;
@@ -68,9 +69,17 @@ public final class StageTester {
 		return this;
 	}
 
+	/**
+	 * This method will start the test and block until it is finished.
+	 *
+	 * @throws AnalysisException
+	 *             if at least one exception in one thread has occurred within the analysis.
+	 *             The exception contains the pairs of thread and throwable.
+	 *
+	 */
 	public void start() {
 		final AnalysisConfiguration configuration = new Configuration(inputHolders, stage, outputHolders);
-		final Analysis analysis = new Analysis(configuration);
+		final Analysis<AnalysisConfiguration> analysis = new Analysis<AnalysisConfiguration>(configuration);
 		analysis.executeBlocking();
 	}
 
diff --git a/src/main/java/teetime/stage/io/EveryXthPrinter.java b/src/main/java/teetime/stage/io/EveryXthPrinter.java
index bc218cf3d83ff6b4beb40cd19e19158e6757c94c..1ca83ce56fd29af0167451efa8b0b69b57ed9b0b 100644
--- a/src/main/java/teetime/stage/io/EveryXthPrinter.java
+++ b/src/main/java/teetime/stage/io/EveryXthPrinter.java
@@ -36,8 +36,8 @@ public final class EveryXthPrinter<T> extends AbstractCompositeStage {
 		EveryXthStage<T> everyXthStage = new EveryXthStage<T>(threshold);
 		Printer<Integer> printer = new Printer<Integer>();
 
-		connectStages(distributor.getNewOutputPort(), everyXthStage.getInputPort());
-		connectStages(everyXthStage.getOutputPort(), printer.getInputPort());
+		connectPorts(distributor.getNewOutputPort(), everyXthStage.getInputPort());
+		connectPorts(everyXthStage.getOutputPort(), printer.getInputPort());
 
 		lastStages.add(printer);
 		distributor.setStrategy(new CopyByReferenceStrategy());
diff --git a/src/main/java/teetime/stage/string/WordCounter.java b/src/main/java/teetime/stage/string/WordCounter.java
index c2a8a409d0261e5c215897fc0cd8a3905f3a9c87..9c632b22726191726dd64af10c92018f8f9958ae 100644
--- a/src/main/java/teetime/stage/string/WordCounter.java
+++ b/src/main/java/teetime/stage/string/WordCounter.java
@@ -45,8 +45,8 @@ public final class WordCounter extends AbstractCompositeStage {
 		this.lastStages.add(this.mapCounter);
 		final ToLowerCase toLowerCase = new ToLowerCase();
 
-		connectStages(this.tokenizer.getOutputPort(), toLowerCase.getInputPort());
-		connectStages(toLowerCase.getOutputPort(), this.mapCounter.getInputPort());
+		connectPorts(this.tokenizer.getOutputPort(), toLowerCase.getInputPort());
+		connectPorts(toLowerCase.getOutputPort(), this.mapCounter.getInputPort());
 		// connectStages(wordcharacterFilter.getOutputPort(), this.mapCounter.getInputPort());
 	}
 
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 162510ff4d2f04011498ba6920aae0c78347c6c8..0e4474577e1f49bc96e734c286b2d9e0363895e8 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 162510ff4d2f04011498ba6920aae0c78347c6c8
+Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8