diff --git a/src/main/java/teetime/framework/OutputPort.java b/src/main/java/teetime/framework/OutputPort.java
index 904e567b6b9e11d5cef3d02ccc476a84cc6cea13..bbc69cf4e293f72caee80fa0250dab9e18f1ce73 100644
--- a/src/main/java/teetime/framework/OutputPort.java
+++ b/src/main/java/teetime/framework/OutputPort.java
@@ -18,6 +18,15 @@ package teetime.framework;
 import teetime.framework.signal.ISignal;
 import teetime.framework.signal.TerminatingSignal;
 
+/**
+ *
+ * @author Christian Wulf
+ *
+ * @param <T>
+ *            the type of elements to be sent
+ *
+ * @since 1.0
+ */
 public final class OutputPort<T> extends AbstractPort<T> {
 
 	OutputPort() {
@@ -42,6 +51,8 @@ public final class OutputPort<T> extends AbstractPort<T> {
 	 *            to be sent; May not be <code>null</code>.
 	 *
 	 * @return <code>true</code> iff the <code>element</code> was sent; <code>false</code> otherwise.
+	 *
+	 * @since 1.1
 	 */
 	public boolean sendNonBlocking(final T element) {
 		return this.pipe.addNonBlocking(element);
diff --git a/src/main/java/teetime/stage/basic/distributor/Distributor.java b/src/main/java/teetime/stage/basic/distributor/Distributor.java
index ac5f845af15d2de0fa5c55cb1a57eb0e2ccb60e1..057a709ef070c7b2750a5c5022cca4ea212c3985 100644
--- a/src/main/java/teetime/stage/basic/distributor/Distributor.java
+++ b/src/main/java/teetime/stage/basic/distributor/Distributor.java
@@ -31,7 +31,7 @@ public final class Distributor<T> extends AbstractConsumerStage<T> {
 	private IDistributorStrategy strategy;
 
 	public Distributor() {
-		this(new RoundRobinStrategy());
+		this(new RoundRobinStrategy2());
 	}
 
 	public Distributor(final IDistributorStrategy strategy) {
diff --git a/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java b/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java
index e46807aaae4bd388326b91ffdd82a9ffd0973d3e..e6cca92ec6ca06eb5f5a21e48f99ab63bfc8198b 100644
--- a/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java
+++ b/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java
@@ -18,9 +18,9 @@ package teetime.stage.basic.distributor;
 import teetime.framework.OutputPort;
 
 /**
- * @author Nils Christian Ehmke, Christian Wulf
+ * @author Christian Wulf
  *
- * @since 1.0
+ * @since 1.1
  */
 public final class RoundRobinStrategy2 implements IDistributorStrategy {