diff --git a/README.md b/README.md
index 66b9eaf..8654027 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ package API is stable.
### Protocol Compliance
-The Gorilla WebSocket package passes the server tests in the [Autobahn WebSockets Test
+The Gorilla WebSocket package passes the server tests in the [Autobahn Test
Suite](http://autobahn.ws/testsuite) using the application in the [examples/autobahn
subdirectory](https://github.com/gorilla/websocket/tree/master/examples/autobahn).
@@ -34,19 +34,19 @@ subdirectory](https://github.com/gorilla/websocket/tree/master/examples/autobahn
go.net |
-
Protocol support | RFC 6455 | RFC 6455, see notes |
-Limit size of received message | Yes | No |
-Send pings and receive pongs | Yes | No |
-Send close message | Yes | No |
-Read message using io.Reader | Yes | No, see notes |
-Write message using io.WriteCloser | Yes | No, see notes |
+RFC 6455 Features |
+Passes Autobahn Test Suite | Yes | No |
+Receive fragmented message | Yes | No |
+Send close message | Yes | No |
+Send pings and receive pongs | Yes | No |
+Other Features |
+Limit size of received message | Yes | No |
+Read message using io.Reader | Yes | No, see note |
+Write message using io.WriteCloser | Yes | No, see note |
Encode, decode JSON message | Yes | Yes |
-Notes:
-
-- The go.net package does not handle fragmented messages.
-- The go.net io.Reader and io.Writer operate across WebSocket frame boundaries.
- Read returns when the input buffer is full or a frame boundary is
- encountered, Each call to Write sends a single frame message. The Gorilla
- io.Reader and io.WriteCloser operate on a single WebSocket message.
+Note: The go.net io.Reader and io.Writer operate across WebSocket frame
+boundaries. Read returns when the input buffer is full or a frame boundary is
+encountered, Each call to Write sends a single frame message. The Gorilla
+io.Reader and io.WriteCloser operate on a single WebSocket message.
diff --git a/examples/autobahn/README.md b/examples/autobahn/README.md
index 68a7ea3..348a24a 100644
--- a/examples/autobahn/README.md
+++ b/examples/autobahn/README.md
@@ -1,13 +1,8 @@
-# Test
+# Test Server
-Clients and servers for the [Autobahn WebSockets Test Suite](http://autobahn.ws/testsuite).
+This package contains a server for the [Autobahn WebSockets Test Suite](http://autobahn.ws/testsuite).
-To test different code paths in the package, the test server echoes messages two ways:
-
-- Read the entire message using io.ReadAll and write the message in one chunk.
-- Copy the message in parts using io.Copy
-
-To test the server, run it
+To test the server, run
go run server.go