diff --git a/src/ctx.nobj.lua b/src/ctx.nobj.lua
index 6f230e6..1f9eb1b 100644
--- a/src/ctx.nobj.lua
+++ b/src/ctx.nobj.lua
@@ -22,9 +22,22 @@ object "ZMQ_Ctx" {
 	c_source [[
 typedef void * ZMQ_Ctx;
 ]],
-	destructor "term" {
+	destructor {
+		c_source[[
+	if(${this}_flags & OBJ_UDATA_CTX_SHOULD_FREE) {
+		zmq_term(${this});
+	}
+]]
+	},
+	method "term" {
 		c_call "ZMQ_Error"  "zmq_term" {}
 	},
+	method "lightuserdata" {
+		var_out{ "void *", "ptr" },
+		c_source[[
+	${ptr} = ${this};
+]]
+	},
 	method "socket" {
 		var_in{ "int", "type" },
 		var_out{ "ZMQ_Socket", "sock", own = true },
diff --git a/src/ffi.lua b/src/ffi.lua
new file mode 100644
index 0000000..bf146db
--- /dev/null
+++ b/src/ffi.lua
@@ -0,0 +1,347 @@
+-- Copyright (c) 2010 by Robert G. Jakabosky <bobby@sharedrealm.com>
+--
+-- Permission is hereby granted, free of charge, to any person obtaining a copy
+-- of this software and associated documentation files (the "Software"), to deal
+-- in the Software without restriction, including without limitation the rights
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-- copies of the Software, and to permit persons to whom the Software is
+-- furnished to do so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in
+-- all copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-- THE SOFTWARE.
+
+local zmq = ...
+
+-- try loading luajit's ffi
+local stat, ffi=pcall(require,"ffi")
+if not stat then
+	print("No FFI module: ZMQ using standard Lua api interface.")
+	return
+end
+-- check if ffi is disabled.
+if disable_ffi then
+	print("FFI disabled: ZMQ using standard Lua api interface.")
+	return
+end
+
+local setmetatable = setmetatable
+local getmetatable = getmetatable
+local print = print
+local pairs = pairs
+local error = error
+local type = type
+local assert = assert
+local tostring = tostring
+local tonumber = tonumber
+local newproxy = newproxy
+
+ffi.cdef[[
+void zmq_version (int *major, int *minor, int *patch);
+int zmq_errno ();
+const char *zmq_strerror (int errnum);
+
+typedef struct zmq_msg_t
+{
+    void *content;
+    unsigned char flags;
+    unsigned char vsm_size;
+    unsigned char vsm_data [30];
+} zmq_msg_t;
+
+typedef void (zmq_free_fn) (void *data, void *hint);
+
+int zmq_msg_init (zmq_msg_t *msg);
+int zmq_msg_init_size (zmq_msg_t *msg, size_t size);
+int zmq_msg_init_data (zmq_msg_t *msg, void *data, size_t size, zmq_free_fn *ffn, void *hint);
+int zmq_msg_close (zmq_msg_t *msg);
+int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src);
+int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src);
+void *zmq_msg_data (zmq_msg_t *msg);
+size_t zmq_msg_size (zmq_msg_t *msg);
+
+void *zmq_init (int io_threads);
+int zmq_term (void *context);
+
+void *zmq_socket (void *context, int type);
+int zmq_close (void *s);
+int zmq_setsockopt (void *s, int option, const void *optval, size_t optvallen);
+int zmq_getsockopt (void *s, int option, void *optval, size_t *optvallen);
+int zmq_bind (void *s, const char *addr);
+int zmq_connect (void *s, const char *addr);
+int zmq_send (void *s, zmq_msg_t *msg, int flags);
+int zmq_recv (void *s, zmq_msg_t *msg, int flags);
+
+int zmq_device (int device, void * insocket, void* outsocket);
+
+]]
+
+local C = ffi.load"zmq"
+
+-- simulate: module(...)
+zmq._M = zmq
+setfenv(1, zmq)
+
+function version()
+	local major = ffi.new('int[1]',0)
+	local minor = ffi.new('int[1]',0)
+	local patch = ffi.new('int[1]',0)
+	C.zmq_version(major, minor, patch)
+	return {major[0], minor[0], patch[0]}
+end
+
+local function zmq_error()
+	local errno = C.zmq_errno()
+	local err = ffi.string(C.zmq_strerror(errno))
+	if err == "Resource temporarily unavailable" then err = "timeout" end
+	if err == "Context was terminated" then err = "closed" end
+	return nil, err
+end
+
+--
+-- ZMQ socket
+--
+local sock_mt = {}
+sock_mt.__index = sock_mt
+
+function sock_mt:close()
+	-- get the true self
+	self=getmetatable(self)
+	local sock = self.sock
+	-- make sure socket is still valid.
+	if not sock then return end
+	-- mark this socket as closed.
+	self.sock = nil
+	-- close zmq socket.
+	if C.zmq_close(sock) ~= 0 then
+		return zmq_error()
+	end
+	return true
+end
+
+local function sock__gc(self)
+	self:close()
+end
+
+local option_types = {
+[zmq.HWM] = 'uint64_t[1]',
+[zmq.SWAP] = 'int64_t[1]',
+[zmq.AFFINITY] = 'uint64_t[1]',
+[zmq.IDENTITY] = 'string',
+[zmq.SUBSCRIBE] = 'string',
+[zmq.UNSUBSCRIBE] = 'string',
+[zmq.RATE] = 'int64_t[1]',
+[zmq.RECOVERY_IVL] = 'int64_t[1]',
+[zmq.MCAST_LOOP] = 'int64_t[1]',
+[zmq.SNDBUF] = 'uint64_t[1]',
+[zmq.RCVBUF] = 'uint64_t[1]',
+[zmq.RCVMORE] = 'int64_t[1]',
+[zmq.FD] = 'int[1]',
+[zmq.EVENTS] = 'uint32_t[1]',
+[zmq.TYPE] = 'int[1]',
+[zmq.LINGER] = 'int[1]',
+[zmq.RECONNECT_IVL] = 'int[1]',
+[zmq.BACKLOG] = 'int[1]',
+}
+local option_len = {}
+local option_tmps = {}
+for k,v in pairs(option_types) do
+	if v ~= 'string' then
+		option_len[k] = ffi.sizeof(v)
+		option_tmps[k] = ffi.new(v, 0)
+	end
+end
+function sock_mt:setopt(opt, opt_val)
+	local ctype = option_types[opt]
+	local val_len = 0
+	if ctype == 'string' then
+		--val = ffi.cast('void *', tostring(val))
+		val = tostring(opt_val)
+		val_len = #val
+	else
+		val = option_tmps[opt]
+		val[0] = opt_val
+		val_len = option_len[opt]
+	end
+	local ret = C.zmq_setsockopt(self.sock, opt, val, val_len)
+	if ret ~= 0 then
+		return zmq_error()
+	end
+	return true
+end
+
+local tmp_val_len = ffi.new('size_t[1]', 4)
+function sock_mt:getopt(opt)
+	local ctype = option_types[opt]
+	local val
+	local val_len = tmp_val_len
+	if ctype == 'string' then
+		val_len[0] = 255
+		val = ffi.new('uint8_t[?]', val_len[0])
+		ffi.fill(val, val_len[0])
+	else
+		val = option_tmps[opt]
+		val[0] = 0
+		val_len[0] = option_len[opt]
+	end
+	local ret = C.zmq_getsockopt(self.sock, opt, val, val_len)
+	if ret ~= 0 then
+		return zmq_error()
+	end
+	if ctype == 'string' then
+		val_len = val_len[0]
+		return ffi.string(val, val_len)
+	else
+		val = val[0]
+	end
+	return tonumber(val)
+end
+
+local tmp32 = ffi.new('uint32_t[1]', 0)
+local tmp32_len = ffi.new('size_t[1]', 4)
+function sock_mt:events()
+	local val = tmp32
+	local val_len = tmp32_len
+	val[0] = 0
+	val_len[0] = 4
+	local ret = C.zmq_getsockopt(self.sock, 15, val, val_len)
+	if ret ~= 0 then
+		return zmq_error()
+	end
+	return val[0]
+end
+
+function sock_mt:bind(addr)
+	local ret = C.zmq_bind(self.sock, addr)
+	if ret ~= 0 then
+		return zmq_error()
+	end
+	return true
+end
+
+function sock_mt:connect(addr)
+	local ret = C.zmq_connect(self.sock, addr)
+	if ret ~= 0 then
+		return zmq_error()
+	end
+	return true
+end
+
+local tmp_msg = ffi.new('zmq_msg_t')
+function sock_mt:send(data, flags)
+	local msg = tmp_msg
+	local msg_len = #data
+	-- initialize message
+	if C.zmq_msg_init_size(msg, msg_len) < 0 then
+		return zmq_error()
+	end
+	-- copy data into message.
+	ffi.copy(C.zmq_msg_data(msg), data, msg_len)
+
+	-- send message
+	local ret = C.zmq_send(self.sock, msg, flags or 0)
+	-- close message before processing return code
+	C.zmq_msg_close(msg)
+	-- now process send return code
+	if ret ~= 0 then
+		return zmq_error()
+	end
+	return true
+end
+
+function sock_mt:recv(flags)
+	local msg = tmp_msg
+	-- initialize blank message.
+	if C.zmq_msg_init(msg) < 0 then
+		return zmq_error()
+	end
+
+	-- receive message
+	local ret = C.zmq_recv(self.sock, msg, flags or 0)
+	if ret ~= 0 then
+		local data, err = zmq_error()
+		C.zmq_msg_close(msg)
+		return data, err
+	end
+	local data = ffi.string(C.zmq_msg_data(msg), C.zmq_msg_size(msg))
+	-- close message
+	C.zmq_msg_close(msg)
+	return data
+end
+
+--
+-- ZMQ context
+--
+local ctx_mt = {}
+ctx_mt.__index = ctx_mt
+
+function ctx_mt:term()
+	-- get the true self
+	self=getmetatable(self)
+	local ctx = self.ctx
+	self.ctx = nil
+	-- make sure context is valid.
+	if not ctx then return end
+	if C.zmq_term(ctx) ~= 0 then
+		return zmq_error()
+	end
+	return true
+end
+
+function ctx_mt:lightuserdata()
+	return self.ctx
+end
+
+function ctx_mt:socket(sock_type)
+	local sock = C.zmq_socket(self.ctx, sock_type)
+	if not sock then
+		return zmq_error()
+	end
+	-- use a wrapper newproxy for __gc support
+	local self=newproxy(true)
+	local meta=getmetatable(self)
+	meta.__index = meta
+	meta.sock = sock
+	meta.__gc = sock__gc
+	setmetatable(meta, sock_mt)
+	return self
+end
+
+local function ctx__gc(self)
+	if self.should_free then
+		self:term()
+	end
+end
+
+function init(io_threads)
+	local should_free = true
+	local ctx
+	print("ZMQ using FFI interface.")
+	if type(io_threads) == 'number' then
+		ctx = C.zmq_init(io_threads)
+		if not ctx then
+			return zmq_error()
+		end
+	else
+		should_free = false
+		-- should be lightuserdata or cdata<void *>
+		ctx = io_threads
+	end
+	-- use a wrapper newproxy for __gc support
+	local self=newproxy(true)
+	local meta=getmetatable(self)
+	meta.__index = meta
+	meta.ctx = ctx
+	meta.should_free = should_free
+	meta.__gc = ctx__gc
+	setmetatable(meta, ctx_mt)
+	return self
+end
+
diff --git a/src/pre_generated-zmq.nobj.c b/src/pre_generated-zmq.nobj.c
index baa3b0d..b400631 100644
--- a/src/pre_generated-zmq.nobj.c
+++ b/src/pre_generated-zmq.nobj.c
@@ -686,16 +686,19 @@ function sock_mt:close()\n\
 	local sock = self.sock\n\
 	-- make sure socket is still valid.\n\
 	if not sock then return end\n\
-	-- close zmq socket.\n\
-	local ret = C.zmq_close(sock)\n\
 	-- mark this socket as closed.\n\
 	self.sock = nil\n\
-	if ret ~= 0 then\n\
+	-- close zmq socket.\n\
+	if C.zmq_close(sock) ~= 0 then\n\
 		return zmq_error()\n\
 	end\n\
 	return true\n\
 end\n\
 \n\
+local function sock__gc(self)\n\
+	self:close()\n\
+end\n\
+\n\
 local option_types = {\n\
 [zmq.HWM] = 'uint64_t[1]',\n\
 [zmq.SWAP] = 'int64_t[1]',\n\
@@ -849,12 +852,22 @@ local ctx_mt = {}\n\
 ctx_mt.__index = ctx_mt\n\
 \n\
 function ctx_mt:term()\n\
-	if C.zmq_term(self.ctx) ~= 0 then\n\
+	-- get the true self\n\
+	self=getmetatable(self)\n\
+	local ctx = self.ctx\n\
+	self.ctx = nil\n\
+	-- make sure context is valid.\n\
+	if not ctx then return end\n\
+	if C.zmq_term(ctx) ~= 0 then\n\
 		return zmq_error()\n\
 	end\n\
 	return true\n\
 end\n\
 \n\
+function ctx_mt:lightuserdata()\n\
+	return self.ctx\n\
+end\n\
+\n\
 function ctx_mt:socket(sock_type)\n\
 	local sock = C.zmq_socket(self.ctx, sock_type)\n\
 	if not sock then\n\
@@ -865,18 +878,40 @@ function ctx_mt:socket(sock_type)\n\
 	local meta=getmetatable(self)\n\
 	meta.__index = meta\n\
 	meta.sock = sock\n\
-	meta.__gc = function() self:close() end\n\
+	meta.__gc = sock__gc\n\
 	setmetatable(meta, sock_mt)\n\
 	return self\n\
 end\n\
 \n\
+local function ctx__gc(self)\n\
+	if self.should_free then\n\
+		self:term()\n\
+	end\n\
+end\n\
+\n\
 function init(io_threads)\n\
+	local should_free = true\n\
+	local ctx\n\
 	print(\"ZMQ using FFI interface.\")\n\
-	local ctx = C.zmq_init(io_threads)\n\
-	if not ctx then\n\
-		return zmq_error()\n\
+	if type(io_threads) == 'number' then\n\
+		ctx = C.zmq_init(io_threads)\n\
+		if not ctx then\n\
+			return zmq_error()\n\
+		end\n\
+	else\n\
+		should_free = false\n\
+		-- should be lightuserdata or cdata<void *>\n\
+		ctx = io_threads\n\
 	end\n\
-	return setmetatable({ ctx = ctx }, ctx_mt)\n\
+	-- use a wrapper newproxy for __gc support\n\
+	local self=newproxy(true)\n\
+	local meta=getmetatable(self)\n\
+	meta.__index = meta\n\
+	meta.ctx = ctx\n\
+	meta.should_free = should_free\n\
+	meta.__gc = ctx__gc\n\
+	setmetatable(meta, ctx_mt)\n\
+	return self\n\
 end\n\
 \n\
 \n\
@@ -1040,6 +1075,16 @@ static int ZMQ_Ctx__term__meth(lua_State *L) {
   return 2;
 }
 
+/* method: lightuserdata */
+static int ZMQ_Ctx__lightuserdata__meth(lua_State *L) {
+  ZMQ_Ctx * this_idx1 = obj_type_ZMQ_Ctx_check(L,1);
+  void * ptr_idx1 = NULL;
+	ptr_idx1 = this_idx1;
+
+  lua_pushlightuserdata(L, ptr_idx1);
+  return 1;
+}
+
 /* method: socket */
 static int ZMQ_Ctx__socket__meth(lua_State *L) {
   int is_error = 0;
@@ -1339,6 +1384,7 @@ static const luaL_reg obj_ZMQ_Ctx_pub_funcs[] = {
 
 static const luaL_reg obj_ZMQ_Ctx_methods[] = {
   {"term", ZMQ_Ctx__term__meth},
+  {"lightuserdata", ZMQ_Ctx__lightuserdata__meth},
   {"socket", ZMQ_Ctx__socket__meth},
   {NULL, NULL}
 };
diff --git a/src/zmq_ffi.nobj.lua b/src/zmq_ffi.nobj.lua
index fcd6000..709a024 100644
--- a/src/zmq_ffi.nobj.lua
+++ b/src/zmq_ffi.nobj.lua
@@ -1,294 +1,4 @@
-ffi_source "ffi_src" [==================[
-local zmq = ...
-
--- try loading luajit's ffi
-local stat, ffi=pcall(require,"ffi")
-if not stat then
-	print("No FFI module: ZMQ using standard Lua api interface.")
-	return
-end
--- check if ffi is disabled.
-if disable_ffi then
-	print("FFI disabled: ZMQ using standard Lua api interface.")
-	return
-end
-
-local setmetatable = setmetatable
-local getmetatable = getmetatable
-local print = print
-local pairs = pairs
-local error = error
-local type = type
-local assert = assert
-local tostring = tostring
-local tonumber = tonumber
-local newproxy = newproxy
-
-ffi.cdef[[
-void zmq_version (int *major, int *minor, int *patch);
-int zmq_errno ();
-const char *zmq_strerror (int errnum);
-
-typedef struct zmq_msg_t
-{
-    void *content;
-    unsigned char flags;
-    unsigned char vsm_size;
-    unsigned char vsm_data [30];
-} zmq_msg_t;
-
-typedef void (zmq_free_fn) (void *data, void *hint);
-
-int zmq_msg_init (zmq_msg_t *msg);
-int zmq_msg_init_size (zmq_msg_t *msg, size_t size);
-int zmq_msg_init_data (zmq_msg_t *msg, void *data, size_t size, zmq_free_fn *ffn, void *hint);
-int zmq_msg_close (zmq_msg_t *msg);
-int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src);
-int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src);
-void *zmq_msg_data (zmq_msg_t *msg);
-size_t zmq_msg_size (zmq_msg_t *msg);
-
-void *zmq_init (int io_threads);
-int zmq_term (void *context);
-
-void *zmq_socket (void *context, int type);
-int zmq_close (void *s);
-int zmq_setsockopt (void *s, int option, const void *optval, size_t optvallen);
-int zmq_getsockopt (void *s, int option, void *optval, size_t *optvallen);
-int zmq_bind (void *s, const char *addr);
-int zmq_connect (void *s, const char *addr);
-int zmq_send (void *s, zmq_msg_t *msg, int flags);
-int zmq_recv (void *s, zmq_msg_t *msg, int flags);
-
-int zmq_device (int device, void * insocket, void* outsocket);
-
-]]
-
-local C = ffi.load"zmq"
-
--- simulate: module(...)
-zmq._M = zmq
-setfenv(1, zmq)
-
-function version()
-	local major = ffi.new('int[1]',0)
-	local minor = ffi.new('int[1]',0)
-	local patch = ffi.new('int[1]',0)
-	C.zmq_version(major, minor, patch)
-	return {major[0], minor[0], patch[0]}
-end
-
-local function zmq_error()
-	local errno = C.zmq_errno()
-	local err = ffi.string(C.zmq_strerror(errno))
-	if err == "Resource temporarily unavailable" then err = "timeout" end
-	if err == "Context was terminated" then err = "closed" end
-	return nil, err
-end
-
---
--- ZMQ socket
---
-local sock_mt = {}
-sock_mt.__index = sock_mt
-
-function sock_mt:close()
-	-- get the true self
-	self=getmetatable(self)
-	local sock = self.sock
-	-- make sure socket is still valid.
-	if not sock then return end
-	-- close zmq socket.
-	local ret = C.zmq_close(sock)
-	-- mark this socket as closed.
-	self.sock = nil
-	if ret ~= 0 then
-		return zmq_error()
-	end
-	return true
-end
-
-local option_types = {
-[zmq.HWM] = 'uint64_t[1]',
-[zmq.SWAP] = 'int64_t[1]',
-[zmq.AFFINITY] = 'uint64_t[1]',
-[zmq.IDENTITY] = 'string',
-[zmq.SUBSCRIBE] = 'string',
-[zmq.UNSUBSCRIBE] = 'string',
-[zmq.RATE] = 'int64_t[1]',
-[zmq.RECOVERY_IVL] = 'int64_t[1]',
-[zmq.MCAST_LOOP] = 'int64_t[1]',
-[zmq.SNDBUF] = 'uint64_t[1]',
-[zmq.RCVBUF] = 'uint64_t[1]',
-[zmq.RCVMORE] = 'int64_t[1]',
-[zmq.FD] = 'int[1]',
-[zmq.EVENTS] = 'uint32_t[1]',
-[zmq.TYPE] = 'int[1]',
-[zmq.LINGER] = 'int[1]',
-[zmq.RECONNECT_IVL] = 'int[1]',
-[zmq.BACKLOG] = 'int[1]',
+ffi_files{
+	"ffi.lua",
 }
-local option_len = {}
-local option_tmps = {}
-for k,v in pairs(option_types) do
-	if v ~= 'string' then
-		option_len[k] = ffi.sizeof(v)
-		option_tmps[k] = ffi.new(v, 0)
-	end
-end
-function sock_mt:setopt(opt, opt_val)
-	local ctype = option_types[opt]
-	local val_len = 0
-	if ctype == 'string' then
-		--val = ffi.cast('void *', tostring(val))
-		val = tostring(opt_val)
-		val_len = #val
-	else
-		val = option_tmps[opt]
-		val[0] = opt_val
-		val_len = option_len[opt]
-	end
-	local ret = C.zmq_setsockopt(self.sock, opt, val, val_len)
-	if ret ~= 0 then
-		return zmq_error()
-	end
-	return true
-end
-
-local tmp_val_len = ffi.new('size_t[1]', 4)
-function sock_mt:getopt(opt)
-	local ctype = option_types[opt]
-	local val
-	local val_len = tmp_val_len
-	if ctype == 'string' then
-		val_len[0] = 255
-		val = ffi.new('uint8_t[?]', val_len[0])
-		ffi.fill(val, val_len[0])
-	else
-		val = option_tmps[opt]
-		val[0] = 0
-		val_len[0] = option_len[opt]
-	end
-	local ret = C.zmq_getsockopt(self.sock, opt, val, val_len)
-	if ret ~= 0 then
-		return zmq_error()
-	end
-	if ctype == 'string' then
-		val_len = val_len[0]
-		return ffi.string(val, val_len)
-	else
-		val = val[0]
-	end
-	return tonumber(val)
-end
-
-local tmp32 = ffi.new('uint32_t[1]', 0)
-local tmp32_len = ffi.new('size_t[1]', 4)
-function sock_mt:events()
-	local val = tmp32
-	local val_len = tmp32_len
-	val[0] = 0
-	val_len[0] = 4
-	local ret = C.zmq_getsockopt(self.sock, 15, val, val_len)
-	if ret ~= 0 then
-		return zmq_error()
-	end
-	return val[0]
-end
-
-function sock_mt:bind(addr)
-	local ret = C.zmq_bind(self.sock, addr)
-	if ret ~= 0 then
-		return zmq_error()
-	end
-	return true
-end
-
-function sock_mt:connect(addr)
-	local ret = C.zmq_connect(self.sock, addr)
-	if ret ~= 0 then
-		return zmq_error()
-	end
-	return true
-end
-
-local tmp_msg = ffi.new('zmq_msg_t')
-function sock_mt:send(data, flags)
-	local msg = tmp_msg
-	local msg_len = #data
-	-- initialize message
-	if C.zmq_msg_init_size(msg, msg_len) < 0 then
-		return zmq_error()
-	end
-	-- copy data into message.
-	ffi.copy(C.zmq_msg_data(msg), data, msg_len)
-
-	-- send message
-	local ret = C.zmq_send(self.sock, msg, flags or 0)
-	-- close message before processing return code
-	C.zmq_msg_close(msg)
-	-- now process send return code
-	if ret ~= 0 then
-		return zmq_error()
-	end
-	return true
-end
-
-function sock_mt:recv(flags)
-	local msg = tmp_msg
-	-- initialize blank message.
-	if C.zmq_msg_init(msg) < 0 then
-		return zmq_error()
-	end
-
-	-- receive message
-	local ret = C.zmq_recv(self.sock, msg, flags or 0)
-	if ret ~= 0 then
-		local data, err = zmq_error()
-		C.zmq_msg_close(msg)
-		return data, err
-	end
-	local data = ffi.string(C.zmq_msg_data(msg), C.zmq_msg_size(msg))
-	-- close message
-	C.zmq_msg_close(msg)
-	return data
-end
-
---
--- ZMQ context
---
-local ctx_mt = {}
-ctx_mt.__index = ctx_mt
-
-function ctx_mt:term()
-	if C.zmq_term(self.ctx) ~= 0 then
-		return zmq_error()
-	end
-	return true
-end
-
-function ctx_mt:socket(sock_type)
-	local sock = C.zmq_socket(self.ctx, sock_type)
-	if not sock then
-		return zmq_error()
-	end
-	-- use a wrapper newproxy for __gc support
-	local self=newproxy(true)
-	local meta=getmetatable(self)
-	meta.__index = meta
-	meta.sock = sock
-	meta.__gc = function() self:close() end
-	setmetatable(meta, sock_mt)
-	return self
-end
-
-function init(io_threads)
-	print("ZMQ using FFI interface.")
-	local ctx = C.zmq_init(io_threads)
-	if not ctx then
-		return zmq_error()
-	end
-	return setmetatable({ ctx = ctx }, ctx_mt)
-end
 
-]==================]
diff --git a/zmq.nobj.lua b/zmq.nobj.lua
index acbdbad..aceb45d 100644
--- a/zmq.nobj.lua
+++ b/zmq.nobj.lua
@@ -7,6 +7,10 @@ luajit_ffi = true,
 
 include "zmq.h",
 
+c_source[[
+#define OBJ_UDATA_CTX_SHOULD_FREE (OBJ_UDATA_LAST_FLAG << 1)
+]],
+
 --
 -- Module constants
 --
@@ -85,12 +89,17 @@ c_function "version" {
 ]]
 },
 c_function "init" {
-	var_in{ "int", "io_threads" },
+	var_in{ "<any>", "io_threads" },
 	var_out{ "ZMQ_Ctx", "ctx", own = true },
 	var_out{ "ZMQ_Error", "err"},
 	c_source[[
-	${ctx} = zmq_init(${io_threads});
-	if(${ctx} == NULL) ${err} = -1;
+	if(lua_isnumber(L, ${io_threads::idx})) {
+		${ctx} = zmq_init(lua_tointeger(L,${io_threads::idx}));
+		if(${ctx} == NULL) ${err} = -1;
+		${ctx}_flags |= OBJ_UDATA_CTX_SHOULD_FREE;
+	} else {
+		${ctx} = lua_touserdata(L, ${io_threads::idx});
+	}
 ]]
 },
 c_function "device" {