diff --git a/makefile.dist b/makefile.dist
index e493305..9cf2757 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -2,45 +2,49 @@
 # Distribution makefile
 #--------------------------------------------------------------------------
 
-DIST = luasocket-1.5-alpha
+DIST = luasocket-2.0-alpha
 
 LUA = \
-    concat.lua \
-    code.lua \
-    url.lua \
-    http.lua \
-    smtp.lua \
-    ftp.lua \
-    select.lua \
-    luasocket.lua
+auxiliar.lua
+code.lua
+concat.lua
+ftp.lua
 
 TESTS = \
-    testclnt.lua \
-    testsrvr.lua \
-    testcmd.lua \
-    codetest.lua \
-    urltest.lua \
-    concattest.lua \
-	ftptest.lua \
-    httptest.lua \
-    smtptest.lua \
-    mbox.lua \
-    udptest.lua
+codetest.lua
+concattest.lua
+ftptest.lua
 
 EXAMPLES = \
-    check-links.lua \
-    daytimeclnt.lua \
-    echoclnt.lua \
-    echosrvr.lua \
-    get.lua \
-    listener.lua \
-    talker.lua \
-    tinyirc.lua
+check-links.lua
+daytimeclnt.lua
+echoclnt.lua
+echosrvr.lua
+dict.lua
 
 ETC = \
-    cl-compat.lua \
-    tftp.lua \
-    dict.lua 
+cl-compat.lua
+
+get.lua
+http.lua
+httptest.lua
+listener.lua
+lua.lua
+luasocket.lua
+mbox.lua
+noglobals.lua
+select.lua
+smtp.lua
+smtptest.lua
+talker.lua
+testclnt.lua
+test.lua
+testsrvr.lua
+tftp.lua
+tinyirc.lua
+udptest.lua
+url.lua
+urltest.lua
 
 MAIN = \
 	auxiliar.c \
diff --git a/samples/tinyirc.lua b/samples/tinyirc.lua
index 0ad00ab..d9cb896 100644
--- a/samples/tinyirc.lua
+++ b/samples/tinyirc.lua
@@ -6,7 +6,7 @@
 -----------------------------------------------------------------------------
 host = host or "*"
 port1 = port1 or 8080
-port2 = port2 or 8081
+port2 = port2 or 8181
 if arg then
     host = arg[1] or host
     port1 = arg[2] or port1
@@ -15,11 +15,16 @@ end
 
 server1, error = socket.bind(host, port1)
 assert(server1, error)
-server1:timeout(1)
+server1:timeout(1) -- make sure we don't block in accept
 server2, error = socket.bind(host, port2)
 assert(server2, error)
-server2:timeout(1)
+server2:timeout(1) -- make sure we don't block in accept
 
+io.write("Servers bound\n")
+
+-- simple set implementation
+-- the select function doesn't care about what is passed to it as long as
+-- it behaves like a table
 function newset()
     local reverse = {}
     local set = {}
@@ -32,46 +37,43 @@ function newset()
             table.remove(set, reverse[value])
             reverse[value] = nil
         end,
-        id = function(set, value)
-            return reverse[value]
-        end
     }})
     return set
 end
 
-sockets = newset()
+set = newset()
 
-sockets:insert(server1)
-sockets:insert(server2)
+io.write("Inserting servers in set\n")
+set:insert(server1)
+set:insert(server2)
 
 while 1 do
-    local readable, _, error = socket.select(sockets, nil)
+    local readable, _, error = socket.select(set, nil)
     for _, input in readable do
         -- is it a server socket?
-        local id = sockets:id(input)
         if input == server1 or input == server2 then
+            io.write("Waiting for clients\n")
             local new = input:accept()
             if new then 
                 new:timeout(1)
-                sockets:insert(new) 
-                io.write("Server ", id, " got client ", sockets:id(new), "\n")
+                io.write("Inserting client in set\n")
+                set:insert(new) 
             end
         -- it is a client socket
         else
             local line, error = input:receive()
             if error then 
                 input:close()
-                io.write("Removing client ", id, "\n")
-                sockets:remove(input) 
+                io.write("Removing client from set\n")
+                set:remove(input) 
             else
-            	io.write("Broadcasting line '", id, "> ", line, "'.\n")
-            	__, writable, error = socket.select(nil, sockets, 1)
+            	io.write("Broadcasting line '", line, "'\n")
+            	__, writable, error = socket.select(nil, set, 1)
             	if not error then
                 	for ___, output in writable do
-                        io.write("Sending to client ", sockets:id(output), "\n")
-                    	output:send(id, "> ", line, "\r\n")
+                    	output:send(line .. "\n")
                 	end
-            	else io.write("No one ready to listen!!!\n") end
+            	else io.write("No client ready to receive!!!\n") end
 			end
         end
     end
diff --git a/src/auxiliar.c b/src/auxiliar.c
index 8b2fa37..65425c5 100644
--- a/src/auxiliar.c
+++ b/src/auxiliar.c
@@ -25,6 +25,11 @@ void aux_open(lua_State *L)
     lua_pushnumber(L, 1);
     lua_rawset(L, -3);
 #endif
+    /* make version string available so scripts */
+    lua_pushstring(L, "version");
+    lua_pushstring(L, LUASOCKET_VERSION);
+    lua_rawset(L, -3);
+    /* store namespace as global */
     lua_settable(L, LUA_GLOBALSINDEX);
     /* make sure modules know what is our namespace */
     lua_pushstring(L, "LUASOCKET_LIBNAME");
diff --git a/src/inet.c b/src/inet.c
index 312a45b..574399c 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -177,7 +177,6 @@ const char *inet_tryconnect(p_sock ps, const char *address,
         if (!strlen(address) || !inet_aton(address, &remote.sin_addr)) {
             struct hostent *hp = gethostbyname(address);
             struct in_addr **addr;
-            remote.sin_family = AF_INET;
             if (!hp) return sock_hoststrerror();
             addr = (struct in_addr **) hp->h_addr_list;
             memcpy(&remote.sin_addr, *addr, sizeof(struct in_addr));