diff --git a/pom.xml b/pom.xml
index 9189fba8d..91b30b268 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,8 @@
     </scm>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.java-websocket</groupId>
-    <artifactId>Java-WebSocket</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <artifactId>bc-Java-WebSocket</artifactId>
+    <version>0.1</version>
     <packaging>jar</packaging>
     <name>Java WebSocket</name>
     <url>http://java-websocket.org/</url>
diff --git a/src/main/java/org/java_websocket/WebSocket.java b/src/main/java/org/java_websocket/WebSocket.java
index a661eddbf..672d7e526 100644
--- a/src/main/java/org/java_websocket/WebSocket.java
+++ b/src/main/java/org/java_websocket/WebSocket.java
@@ -3,6 +3,7 @@
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.NotYetConnectedException;
+import java.util.Map;
 
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.framing.Framedata;
@@ -121,4 +122,6 @@ public enum READYSTATE {
 	 * If the opening handshake has not yet happened it will return null.
 	 **/
 	public abstract String getResourceDescriptor();
+	
+	public abstract Map<Object,Object> getAttributes();
 }
\ No newline at end of file
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
index 669bee146..034c7509c 100644
--- a/src/main/java/org/java_websocket/WebSocketImpl.java
+++ b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -9,7 +9,9 @@
 import java.nio.channels.SelectionKey;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -104,6 +106,7 @@ public class WebSocketImpl implements WebSocket {
 	
 	private String resourceDescriptor = null;
 
+	public Map<Object,Object> attrs = new HashMap<Object,Object>();
 	/**
 	 * crates a websocket with server role
 	 */
@@ -734,4 +737,9 @@ public String getResourceDescriptor() {
 		return resourceDescriptor;
 	}
 
+	@Override
+	public Map<Object,Object> getAttributes() {
+		return attrs;
+	}
+
 }
diff --git a/src/test/java/AutobahnClientTest.java b/src/test/java/AutobahnClientTest.java
index a567fd1b4..b0c397e96 100644
--- a/src/test/java/AutobahnClientTest.java
+++ b/src/test/java/AutobahnClientTest.java
@@ -3,6 +3,7 @@
 import java.io.InputStreamReader;
 import java.net.URI;
 import java.nio.ByteBuffer;
+import java.util.Map;
 
 import org.java_websocket.WebSocket;
 import org.java_websocket.WebSocketImpl;
@@ -159,5 +160,10 @@ public void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {
 		builder.setTransferemasked( true );
 		getConnection().sendFrame( frame );
 	}
+	@Override
+	public Map<Object, Object> getAttributes() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 
 }