diff --git a/.classpath b/.classpath
index fdc7b871114eddec5aa36b968731e07a84572a65..5634d6545ad8c6fefdea1b5531c9f438391cfa85 100644
--- a/.classpath
+++ b/.classpath
@@ -24,6 +24,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/run-configurations/deploy.launch b/run-configurations/deploy.launch
index 761ef41eb3321c784871a714d127f6201a8daea8..07829bf93d2293130f0244a1666b1ef0d8283cc5 100644
--- a/run-configurations/deploy.launch
+++ b/run-configurations/deploy.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
 <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="-Psigning -Dmaven.javadoc.skip=true clean deploy"/>
+<stringAttribute key="M2_GOALS" value="-Psigning clean deploy"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
 <stringAttribute key="M2_PROFILES" value=""/>
diff --git a/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java b/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java
index 127999882580d945faf07cbe23e53a1422a01367..6e564014bc39e3e5e1855ed76f3d6ac42b78e480 100644
--- a/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java
+++ b/src/main/java/teetime/framework/pipe/PipeFactoryLoader.java
@@ -25,7 +25,7 @@ public final class PipeFactoryLoader {
 	public static List<IPipeFactory> loadFromStream(final InputStream stream) throws IOException {
 		List<IPipeFactory> pipeFactories = new LinkedList<IPipeFactory>();
 
-		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream));
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream, "UTF-8"));
 		try {
 			String line;
 			while (null != (line = bufferedReader.readLine())) {
diff --git a/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java b/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java
index bd91f95548782164bd9ce2750a2a4b680d4b2068..42538d1954a4c108ece551298e7585c15ebf36cf 100644
--- a/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java
+++ b/src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java
@@ -45,7 +45,7 @@ public final class PipeFactoryRegistry {
 	/**
 	 * The singleton instance of PipeFactoryRegistry
 	 */
-	public static PipeFactoryRegistry INSTANCE = new PipeFactoryRegistry("pipe-factories.conf");
+	public static final PipeFactoryRegistry INSTANCE = new PipeFactoryRegistry("pipe-factories.conf");
 
 	private PipeFactoryRegistry(final String configFileName) {
 		List<IPipeFactory> pipeFactories = PipeFactoryLoader.loadPipeFactoriesFromClasspath(configFileName);
diff --git a/src/main/java/teetime/stage/ByteArray2String.java b/src/main/java/teetime/stage/ByteArray2String.java
index d00ccca99686ae2187273f846132bfddf5abd508..8eed70b815cd9c76f7758ffe988c6bbecaec984f 100644
--- a/src/main/java/teetime/stage/ByteArray2String.java
+++ b/src/main/java/teetime/stage/ByteArray2String.java
@@ -1,5 +1,7 @@
 package teetime.stage;
 
+import java.nio.charset.Charset;
+
 import teetime.framework.ConsumerStage;
 import teetime.framework.OutputPort;
 
@@ -9,7 +11,7 @@ public class ByteArray2String extends ConsumerStage<byte[]> {
 
 	@Override
 	protected void execute(final byte[] element) {
-		this.send(this.outputPort, new String(element));
+		this.send(this.outputPort, new String(element, Charset.forName("UTF-8")));
 	}
 
 	public OutputPort<? extends String> getOutputPort() {