diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/index.html b/index.html
index a685599..bae2948 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,12 @@
         <script language='javascript'>
 
             $(document).ready(function() {
-                var ws = new WebSocket("ws://localhost:8080/test");
+                var ws;
+                if (typeof MozWebSocket != "undefined") {
+                    ws = new MozWebSocket("ws://localhost:8080/test");
+                } else {
+                    ws = new WebSocket("ws://localhost:8080/test");
+                }
                 ws.onmessage = function(evt) {
                     $('#output').text(evt.data);
                 }
diff --git a/websocket.py b/websocket.py
index ab2dcc9..f348330 100644
--- a/websocket.py
+++ b/websocket.py
@@ -247,9 +247,9 @@ def _getOneHeader(self, name):
 
     def _clientHandshakeHybi(self):
         """
-        Initial handshake, as defined in hybi-10.
+        Initial handshake, as defined in hybi-10 and 16 (versions 8 and 13).
 
-        If the client is not following the hybi-10 protocol or is requesting a
+        If the client is not following the hybi-10 or 16 protocol or is requesting a
         version that's lower than what hybi-10 describes, the connection will
         be closed.
 
@@ -257,8 +257,8 @@ def _clientHandshakeHybi(self):
         plugged in and the connection will be estabilished.
         """
         version = self._getOneHeader("Sec-WebSocket-Version")
-        # we only speak version 8 of the protocol
-        if version != "8":
+        # we only speak version 7, 8 and 13 of the protocol
+        if version not in ("7", "8", "13"):
             self.setResponseCode(426, "Upgrade Required")
             self.setHeader("Sec-WebSocket-Version", "8")
             return self.finish()
@@ -523,7 +523,8 @@ def sendFrame(self, opcode, payload, fragmented=False):
 
         data.append(length)
         header = struct.pack(spec, *data)
-        self._request.write(header + payload)
+        if self._connected:
+            self._request.write(header + payload)
 
 
 class WebSocketHandler(object):