--- miscJava/Test3/src/dk/thoerup/websocket/AnnotatedSocket.java	2014/02/11 12:49:11	2114
+++ miscJava/Test3/src/dk/thoerup/websocket/AnnotatedSocket.java	2014/02/11 12:54:19	2115
@@ -29,6 +29,14 @@
 		broadcastMessage(guestNick + " has joined the chat");
 		try {
 			session.getBasicRemote().sendText( "Welcome " + guestNick);
+			StringBuilder sb = new StringBuilder();
+			
+			for(String n : sessionNicks.values() ) {				
+				sb.append(n).append(" ");
+			}
+			session.getBasicRemote().sendText( "*** On-line guests: " + sb.toString() );
+			
+			
 		} catch (IOException e) {
 			System.out.println("Error sending welcome messages " + e.getMessage() );
 		}
@@ -45,8 +53,13 @@
 	
 	@OnClose
 	public void close(Session session, CloseReason reason) {
+		
+		String nick = sessionNicks.get( session.getId() );
+		
 		sessions.remove(session.getId());
 		sessionNicks.remove(session.getId());
+		
+		broadcastMessage( "*** " + nick + " has left the chat");
 	}