diff --git a/java/KaazingAMQPClientLibrariesFacade.md b/java/KaazingAMQPClientLibrariesFacade.md
index df07263..906e277 100644
--- a/java/KaazingAMQPClientLibrariesFacade.md
+++ b/java/KaazingAMQPClientLibrariesFacade.md
@@ -258,6 +258,4 @@ Disconnects all opened subscriptions, disconnects Amqp client.
 	}
 	this.amqpClient.disconnect();
 	...
-```
-
-
+```
\ No newline at end of file
diff --git a/java/KaazingJMSClientLibrariesFacade.md b/java/KaazingJMSClientLibrariesFacade.md
index 710cfe6..4fb2743 100644
--- a/java/KaazingJMSClientLibrariesFacade.md
+++ b/java/KaazingJMSClientLibrariesFacade.md
@@ -11,6 +11,7 @@ For more information see:
 
 ## Organization of the library
 UniversalClientFactory's create 
+<<<<<<< HEAD
 Library contains JMSUniversalClient class (implementing UniversalClient interface) that is created by UniversalClientFactory's _createUniversalClient_ method. JMSUniversalClient object provides the following functionality:
 - **constructor** of JMSUniversalClient - connects client to Kaazing WebSocket JMS gateway 
 - **subscribe** method of JMSUniversalClient - subscribes to publishing and subscription endpoints and returns an instance of ClientSubscription object. 
@@ -256,3 +257,131 @@ Disconnects all opened subscriptions, closes session and connection.
 	this.session.close();
 	this.connection.close();
 ```
+=======
+Library contains JMSUniversalClient class (implementing UniversalClient interface) that is created by UniversalClientFactory's _createUniversalClient_ method. JMSClient objects provides the following functionality:
+- **constructor** connects client to Kaazing WebSocket JMS gateway 
+- **subscribe** function - subscribes to publishing and subscription endpoints and returns an instance of ClientSubscription object.
+- **close** function - close all subscriptions and connections
+
+### **constructor**
+Constructor implements the following sequence:
+
+1. Create JMS connection factory
+
+```javascript
+	var jmsConnectionFactory = new JmsConnectionFactory(url);
+```
+
+2. Create connection. createConnection function of JmsConnectionFactory takes three parameters: login, password and a callback function that will be called upon completion. Function returns the future that is checked in a callback function for exceptions.
+
+```javascript
+	var connectionFuture = jmsConnectionFactory.createConnection(username, password, function () {
+		if (!connectionFuture.exception) {
+			try {
+				connection = connectionFuture.getValue();
+				connection.setExceptionListener(handleException);
+		
+				session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+		
+				connection.start(function () {
+					 var connectionObject=createConnectionObject(session, JMSClient);
+                     connectedFunctionHandle(connectionObject);
+				});
+			}
+			catch (e) {
+				handleException(e);
+			}
+		}
+		else {
+			handleException(connectionFuture.exception);
+		}
+	})
+```
+	
+3. Once connection is created, callback function does the following:
+	1. Obtains the connection from the connectionFuture that was returned by createConection.
+	2. Sets exception listener to handle exceptions.
+	3. Creates session using createSession method. Session is created with auto-acknowledgement. 
+	4. Starts the connection using start function passing to it a callback function.
+
+4. Once connection is started, connection object is returned for the subscription to be created using __subscribe__ method.
+
+### **subscribe** method of connection object
+Method executed the following actions:
+
+- Creates publishing topic and producer to send messages
+
+	```javascript
+	var pubDest = session.createTopic(topicPub);
+	var producer = session.createProducer(dest);
+	```
+- Creates subscription topic and consumer.
+	_In order to prevent client from receiving its own messages consumer may be created with the query that will filter out the messages with the 'appId' string property set to this client application ID - a randomly generated GUID._
+	Once consumer is created, setMessageListener function is used to specify the function to be called when new message is received.
+
+	```javascript
+	var subDest = session.createTopic(topicSub);			
+	if (noLocalFlag)
+		consumer = session.createConsumer(dest, "appId<>'" + appId + "'");
+	else
+		consumer = session.createConsumer(dest);
+		consumer.setMessageListener(function (message) {
+		... obtain the message body ...			
+
+		rcvFunction(body);
+	});
+	```
+	
+- Creates subscription object, adds it to the array of opened subscriptions and returns it via callback.
+	   
+### **sendMessage** function of a subscription object	
+Function creates text message and sends it. In order to prevent client from receiving its own messages 'appId' string property may be set to this client application ID - a randomly generated GUID.
+
+```javascript
+	sendMessage:function(msg){
+		var textMsg = session.createTextMessage(msg);
+		if (noLocalFlag)
+			textMsg.setStringProperty("appId", appId);
+		try {
+			var future = producer.send(textMsg, function () {
+			if (future.exception) {
+				handleException(future.exception);
+			};	
+		});
+		} catch (e) {
+			handleException(e);
+		}
+	}
+``` 	
+
+### **close** function of a subscription object
+Function closes producer and consumer that were created during the subscription call.
+
+```javascript
+	this.producer.close(function(){
+		this.consumer.close(function(){
+		});
+	})
+```
+	    	
+### **disconnect** function
+Closes all subscriptions (causing closing of their producer and consumer), session and connection in a chain of callbacks.
+	
+```javascript
+	JMSClient.disconnect=function(){
+		for(var i=0;i<this.subscriptions.length;i++){
+			this.subscriptions[i].close();
+		}
+	
+		... Wait while all the subscriptions are closed...
+		
+		session.close(function () {
+			connection.close(function () {
+
+			});
+		});
+    }
+
+```
+
+>>>>>>> kaazing/develop