diff --git a/README.md b/README.md
index de177de1..587be8eb 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ If you plan to use Spring or GWT, take a look at their specific samples.
 | [chat-guice](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-guice-chat%22) | This sample demonstrate the use of Google Guice with Atmosphere. The Chat application is implemented using @Suspend and @Broadcast annotation | [Guice](https://github.com/Atmosphere/atmosphere-samples/blob/master/extensions-samples/guice/chat-guice/src/main/java/org/atmosphere/samples/guice/GuiceChatModule.java) [Jersey Resource](https://github.com/Atmosphere/atmosphere-extensions/blob/master/guice/samples/chat-guice/src/main/java/org/atmosphere/samples/guice/ResourceChat.java#L31) | Javascript Functions demonstrating [WebSocket, falling back to Long-Polling](https://github.com/Atmosphere/atmosphere-samples/blob/master/extensions-samples/guice/chat-guice/src/main/webapp/jquery/application.js) |
 | [chat](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-chat%22) | This sample demonstrates the use of WebSocket (falling back to SSE and Long-Polling) using the [@ManagedService](http://atmosphere.github.io/atmosphere/apidocs/org/atmosphere/config/service/ManagedService.html) annotation. The sample also demonstrates how to detect which transport are supported by the client and server by negotiating with the server. | [Chat](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/chat/src/main/java/org/atmosphere/samples/chat/Chat.java) | Javascript Functions demonstrating [WebSocket, falling back to Long-Polling](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/chat/src/main/webapp/javascript/application.js). This is the recommended sample to start with. |
 | [chat-multiroom](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-chat-multiroom%22) | This sample demonstrates the use of WebSocket (falling back SSE and to Long-Polling) using the [@ManagedService](http://atmosphere.github.io/atmosphere/apidocs/org/atmosphere/config/service/ManagedService.html) annotation with [Encoder](http://atmosphere.github.io/atmosphere/apidocs/org/atmosphere/config/managed/Encoder.html) and [Decoder](http://atmosphere.github.io/atmosphere/apidocs/org/atmosphere/config/managed/Decoder.html). The sample also demonstrates how to detect which transport are supported by the client and server by negotiating with the server. | [Chatroom](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/chat-multiroom/src/main/java/org/atmosphere/samples/chat/ChatRoom.java) | Javascript Functions demonstrating [WebSocket, falling back to Long-Polling](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/chat/src/main/webapp/javascript/application.js). This is the recommended sample to start with. |
-| [cxf-node-client](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-chat-node-client%22) | This sample demonstrates atmosphere.js with node.js. | | [Javascript Functions](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/chat-node-client/src/main/resources/chat-client.js)|
+| [cxf-node-client](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-chat-node-client%22) | This sample demonstrates atmosphere.js with node.js. This client can be used agaist various samples such as chat, websocket-chat, ... | | [Javascript Functions](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/chat-node-client/src/main/resources/chat-client.js)|
 | [cxf-chat](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-cxf-chat%22) | This sample demonstrates the use of WebSocket (falling back SSE and to Long-Polling) in other framework using Atmosphere. | [CXF](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/cxf-chat/src/main/java/org/atmosphere/samples/chat/cxf/ChatResource.java) | [Javascript Functions](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/cxf-chat/src/main/webapp/javascript/application.js)|
 | [cxf-chat-osgi](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-cxf-chat-ogi%22) | This sample is an OSGi version of cxf-chat that demonstrates the use of Atmosphere in an OSGi container. The code is identical to that of cxf-chat and it only differs in its pom.xml file so that the appropriate bundle descriptor is generated in its manifest.mf file.| [CXF OSGi](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/cxf-chat-osgi/src/main/java/org/atmosphere/samples/chat/cxf/ChatResource.java) | [Javascript Functions](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/cxf-chat-osgi/src/main/webapp/javascript/application.js)|
 | [di-guice-sample](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.atmosphere.samples%22%20AND%20a%3A%22atmosphere-di-guice-sample%22) | The sample demonstrates the use of Atmosphere's Dependencies Injection using Guice | [Jersey Resource](https://github.com/Atmosphere/atmosphere-samples/blob/master/extensions-samples/guice/di-guice-sample/src/main/java/org/atmosphere/samples/di/guice/MessageResource.java) [Guice](https://github.com/Atmosphere/atmosphere-samples/blob/master/samples/di-guice-sample/src/main/java/org/atmosphere/samples/di/guice/GuiceContextListener.java) | [Javascript Callback](https://github.com/Atmosphere/atmosphere-samples/blob/master/extensions-samples/guice/di-guice-sample/src/main/webapp/index.html#L46) |
diff --git a/extensions-samples/pom.xml b/extensions-samples/pom.xml
index 0e4b61e0..4d1d668f 100755
--- a/extensions-samples/pom.xml
+++ b/extensions-samples/pom.xml
@@ -20,6 +20,7 @@
         <module>gwt</module>
         <module>hazelcast</module>
         <module>jgroups</module>
+        <module>kafka/jersey-pubsub</module>
         <module>rabbitmq/jersey-pubsub</module>
         <module>redis</module>
         <module>rmi</module>
diff --git a/samples/pom.xml b/samples/pom.xml
index f12d0f08..ee8ca938 100755
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -23,6 +23,8 @@
         <module>sse-rest-chat</module>
         <module>chat-multiroom</module>
         <module>chat-node-client</module>
+        <module>cxf-chat</module>
+        <module>cxf-chat-osgi</module>
         <module>pubsub</module>
         <module>atmospherehandler-pubsub</module>
         <module>jersey2-chat</module>