diff --git a/README.md b/README.md
index f2d5624..2a83ffa 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,8 @@ JMeter - WebSocket Sampler
 
 Compiled binary can be downloaded from the Releases.
 
-Please have a look at the [Wiki pages](https://github.com/maciejzaleski/JMeter-WebSocketSampler/wiki) for instructions on how to install the plug-in.
+Please have a look at the Wiki pages for instructions on how to install the plug-in.
+
+How to build
+======
+mvn clean install
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7773b9c..0a258e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,34 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-  <groupId>co.uk.bugtrap</groupId>
-  <artifactId>JMeterWebSocketSampler</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>co.uk.bugtrap</groupId>
+    <artifactId>JMeterWebSocketSampler</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>JMeterWebSocketSampler</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jetty.version>9.2.14.v20151106</jetty.version>
+        <jMeter.version>2.13</jMeter.version>
+    </properties>
+
+    <scm>
+    	<connection>scm:git:https://github.com/elyrank/JMeter-WebSocketSampler.git</connection>
+    	<url>scm:git:https://github.com/elyrank/JMeter-WebSocketSampler.git</url>
+    	<developerConnection>scm:git:https://github.com/elyrank/JMeter-WebSocketSampler.git</developerConnection>
+    </scm>
 
-  <name>JMeterWebSocketSampler</name>
-  <url>http://maven.apache.org</url>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -19,62 +37,110 @@
                     <source>1.7</source>
                     <target>1.7</target>
                     <excludes>
-			            <exclude>**\JMeter\plugins\controler\websocketapp\**</exclude>
-			        </excludes>
+                        <exclude>**\JMeter\plugins\controler\websocketapp\**</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
             <plugin>
-		    <artifactId>maven-jar-plugin</artifactId>
-		    <version>2.3.1</version>
-		    <executions>
-		      <execution>
-		        <id>default-jar</id>
-		        <phase>package</phase>
-		        <goals>
-		          <goal>jar</goal>
-		        </goals>
-		        <configuration>
-		          <excludes>
-		            <exclude>**/JMeter/plugins/functional/controler/**/*</exclude>
-		            <exclude>**/JMeter/plugins/controler/websocketapp/**</exclude>
-		          </excludes>
-		        </configuration>
-		      </execution>
-		    </executions>
-		  </plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                    <outputFile>target/${project.name}-dist-${project.version}.jar</outputFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-client</artifactId>
-      <version>9.1.1.v20140108</version>
-      <classifier>hybrid</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jmeter</groupId>
-      <artifactId>ApacheJMeter</artifactId>
-      <version>2.10</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jmeter</groupId>
-      <artifactId>ApacheJMeter_core</artifactId>
-      <version>2.10</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jmeter</groupId>
-      <artifactId>ApacheJMeter_http</artifactId>
-      <version>2.10</version>
-    </dependency>
-  </dependencies>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <!--scope>test</scope-->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-client</artifactId>
+            <version>${jetty.version}</version>
+            <classifier>hybrid</classifier>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter</artifactId>
+            <version>${jMeter.version}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+            <!--for some reason those jars are missing, and failing the package. since it is provided anyway - there is no implication for excluding them-->
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-math3</artifactId>
+                    <groupId>commons-math3</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-pool2</artifactId>
+                    <groupId>commons-pool2</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>d-haven-managed-pool</artifactId>
+                    <groupId>d-haven-managed-pool</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_core</artifactId>
+            <version>${jMeter.version}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+            <!--for some reason those jars are missing, and failing the package. since it is provided anyway - there is no implication for excluding them-->
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-math3</artifactId>
+                    <groupId>commons-math3</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-pool2</artifactId>
+                    <groupId>commons-pool2</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>d-haven-managed-pool</artifactId>
+                    <groupId>d-haven-managed-pool</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_http</artifactId>
+            <version>${jMeter.version}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+            <!--for some reason those jars are missing, and failing the package. since it is provided anyway - there is no implication for excluding them-->
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-math3</artifactId>
+                    <groupId>commons-math3</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>d-haven-managed-pool</artifactId>
+                    <groupId>d-haven-managed-pool</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-pool2</artifactId>
+                    <groupId>commons-pool2</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/src/main/java/JMeter/plugins/functional/samplers/websocket/ServiceSocket.java b/src/main/java/JMeter/plugins/functional/samplers/websocket/ServiceSocket.java
index fcad059..cf13503 100644
--- a/src/main/java/JMeter/plugins/functional/samplers/websocket/ServiceSocket.java
+++ b/src/main/java/JMeter/plugins/functional/samplers/websocket/ServiceSocket.java
@@ -4,40 +4,40 @@
  */
 package JMeter.plugins.functional.samplers.websocket;
 
-import java.io.IOException;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.log.Logger;
-
-import java.util.regex.Pattern;
-
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+import org.eclipse.jetty.websocket.api.BatchMode;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketFrame;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.websocket.api.extensions.Frame;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Deque;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
+
 /**
- *
  * @author Maciej Zaleski
  */
-@WebSocket(maxTextMessageSize = 256 * 1024 * 1024)
+@WebSocket(batchMode = BatchMode.OFF, maxTextMessageSize = 256 * 1024 * 1024)
 public class ServiceSocket {
 
-    protected final WebSocketSampler parent;
+    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+
+    protected WebSocketSampler parent;
     protected WebSocketClient client;
     private static final Logger log = LoggingManager.getLoggerForClass();
-    protected Deque<String> responeBacklog = new LinkedList<String>();
+    protected Deque<String> responeBacklog = new ConcurrentLinkedDeque<>();
     protected Integer error = 0;
     protected StringBuffer logMessage = new StringBuffer();
     protected CountDownLatch openLatch = new CountDownLatch(1);
@@ -45,7 +45,7 @@ public class ServiceSocket {
     protected Session session = null;
     protected String responsePattern;
     protected String disconnectPattern;
-    protected int messageCounter = 1;
+    protected AtomicInteger messageCounter = new AtomicInteger(1);
     protected Pattern responseExpression;
     protected Pattern disconnectExpression;
     protected boolean connected = false;
@@ -53,7 +53,7 @@ public class ServiceSocket {
     public ServiceSocket(WebSocketSampler parent, WebSocketClient client) {
         this.parent = parent;
         this.client = client;
-        
+
         //Evaluate response matching patterns in case thay contain JMeter variables (i.e. ${var})
         responsePattern = new CompoundVariable(parent.getResponsePattern()).execute();
         disconnectPattern = new CompoundVariable(parent.getCloseConncectionPattern()).execute();
@@ -64,56 +64,26 @@ public ServiceSocket(WebSocketSampler parent, WebSocketClient client) {
 
     @OnWebSocketMessage
     public void onMessage(String msg) {
-        synchronized (parent) {
-            log.debug("Received message: " + msg);
-            String length = " (" + msg.length() + " bytes)";
-            logMessage.append(" - Received message #").append(messageCounter).append(length);
-            addResponseMessage("[Message " + (messageCounter++) + "]\n" + msg + "\n\n");
-
-            if (responseExpression == null || responseExpression.matcher(msg).find()) {
-                logMessage.append("; matched response pattern").append("\n");
-                closeLatch.countDown();
-            } else if (!disconnectPattern.isEmpty() && disconnectExpression.matcher(msg).find()) {
-                logMessage.append("; matched connection close pattern").append("\n");
-                closeLatch.countDown();
-                close(StatusCode.NORMAL, "JMeter closed session.");
-            } else {
-                logMessage.append("; didn't match any pattern").append("\n");
-            }
+//            log.info("Received message: " + msg);
+        String length = " (" + msg.length() + " bytes)";
+        logMessage.append(" - Received message #").append(messageCounter).append(length);
+        addResponseMessage("[Message " + messageCounter.getAndIncrement() + ", Time: " + DATE_FORMAT.format(new Date()) + "]\n" + msg + "\n\n");
+
+        if (responseExpression == null || responseExpression.matcher(msg).find()) {
+            logMessage.append("; matched response pattern").append("\n");
+            closeLatch.countDown();
+        } else if (!disconnectPattern.isEmpty() && disconnectExpression.matcher(msg).find()) {
+            logMessage.append("; matched connection close pattern").append("\n");
+            closeLatch.countDown();
+            close(StatusCode.NORMAL, "JMeter closed session.");
+        } else {
+            logMessage.append("; didn't match any pattern").append("\n");
         }
     }
-    
-	@OnWebSocketFrame
-	public void onFrame(Frame frame) {
-		synchronized (parent) {
-			log.debug("Received frame: " + frame.getPayload() + " "
-					+ frame.getType().name());
-			String length = " (" + frame.getPayloadLength() + " bytes)";
-			logMessage.append(" - Received frame #").append(messageCounter)
-					.append(length);
-			String frameTxt = new String(frame.getPayload().array());
-			addResponseMessage("[Frame " + (messageCounter++) + "]\n"
-					+ frameTxt + "\n\n");
-
-			if (responseExpression == null
-					|| responseExpression.matcher(frameTxt).find()) {
-				logMessage.append("; matched response pattern").append("\n");
-				closeLatch.countDown();
-			} else if (!disconnectPattern.isEmpty()
-					&& disconnectExpression.matcher(frameTxt).find()) {
-				logMessage.append("; matched connection close pattern").append(
-						"\n");
-				closeLatch.countDown();
-				close(StatusCode.NORMAL, "JMeter closed session.");
-			} else {
-				logMessage.append("; didn't match any pattern").append("\n");
-			}
-		}
-	}
 
     @OnWebSocketConnect
     public void onOpen(Session session) {
-        logMessage.append(" - WebSocket conection has been opened").append("\n");
+        logMessage.append(" - WebSocket connection has been opened on ").append(session.getUpgradeRequest().getRequestURI().toString()).append("\n");
         log.debug("Connect " + session.isOpen());
         this.session = session;
         connected = true;
@@ -130,7 +100,7 @@ public void onClose(int statusCode, String reason) {
             logMessage.append(" - WebSocket conection has been successfully closed by the server").append("\n");
             log.debug("Disconnect " + statusCode + ": " + reason);
         }
-        
+
         //Notify connection opening and closing latches of the closed connection
         openLatch.countDown();
         closeLatch.countDown();
@@ -142,11 +112,10 @@ public void onClose(int statusCode, String reason) {
      */
     public String getResponseMessage() {
         String responseMessage = "";
-        
+
         //Iterate through response messages saved in the responeBacklog cache
-        Iterator<String> iterator = responeBacklog.iterator();
-        while (iterator.hasNext()) {
-            responseMessage += iterator.next();
+        for (String aResponeBacklog : responeBacklog) {
+            responseMessage += aResponeBacklog;
         }
 
         return responseMessage;
@@ -201,8 +170,8 @@ public void close(int statusCode, String statusText) {
         } else {
             logMessage.append(" - WebSocket session wasn't started (...that's odd)").append("\n");
         }
-        
-        
+
+
         //Stoping WebSocket client; thanks m0ro
         try {
             client.stop();
@@ -224,7 +193,7 @@ public Integer getError() {
      */
     public String getLogMessage() {
         logMessage.append("\n\n[Variables]\n");
-        logMessage.append(" - Message count: ").append(messageCounter - 1).append("\n");
+        logMessage.append(" - Message count: ").append(messageCounter.get() - 1).append("\n");
 
         return logMessage.toString();
     }
@@ -261,13 +230,18 @@ public boolean isConnected() {
         return connected;
     }
 
-    public void initialize() {
+    public void initialize(WebSocketSampler parent) {
         logMessage = new StringBuffer();
         logMessage.append("\n\n[Execution Flow]\n");
         logMessage.append(" - Reusing exising connection\n");
         error = 0;
 
         this.closeLatch = new CountDownLatch(1);
+        //update the parent - used for streaming connection when using the same connection but updating all other definitions of the sampler
+        this.parent = parent;
+        this.responsePattern = new CompoundVariable(parent.getResponsePattern()).execute();
+        this.disconnectPattern = new CompoundVariable(parent.getCloseConncectionPattern()).execute();
+        initializePatterns();
     }
 
     private void addResponseMessage(String message) {
diff --git a/src/main/java/JMeter/plugins/functional/samplers/websocket/WebSocketSampler.java b/src/main/java/JMeter/plugins/functional/samplers/websocket/WebSocketSampler.java
index 2747394..da1b31b 100644
--- a/src/main/java/JMeter/plugins/functional/samplers/websocket/WebSocketSampler.java
+++ b/src/main/java/JMeter/plugins/functional/samplers/websocket/WebSocketSampler.java
@@ -71,8 +71,10 @@ private ServiceSocket getConnectionSocket() throws URISyntaxException, Exception
         
         if (isStreamingConnection() && connectionList.containsKey(connectionId)) {
         	ServiceSocket socket = connectionList.get(connectionId);
-            socket.initialize();
-            return socket;
+            if (socket.getSession() != null && socket.getSession().isOpen()) {
+                socket.initialize(this);
+                return socket;
+            }
         }
         
         //Create WebSocket client