--- a/src/luan/modules/Thread.luan	Wed Mar 29 19:54:45 2017 -0600
+++ b/src/luan/modules/Thread.luan	Wed Apr 05 16:24:02 2017 -0600
@@ -12,7 +12,7 @@
 
 
 Thread.global = {}  -- shared across threads
-local map = ThreadLuan.StringMap.new()
+local map = ThreadLuan.GlobalMap.new()
 local global_mt = {}
 set_metatable(Thread.global,global_mt)
 
@@ -21,16 +21,19 @@
 end
 
 function global_mt.__new_index(_,key,value)
-	map.set(key,value)
+	map.put(key,value)
 end
 
-function global_mt.get_timeout()
+function Thread.get_global_timeout()
 	return map.timeout
 end
 
-function global_mt.set_timeout(timeout)
+function Thread.set_global_timeout(timeout)
 	map.timeout = timeout
 end
 
+function Thread.global_put(key,value)
+	return map.put(key,value)
+end
 
 return Thread

--- a/src/luan/modules/ThreadLuan.java	Wed Mar 29 19:54:45 2017 -0600
+++ b/src/luan/modules/ThreadLuan.java	Wed Apr 05 16:24:02 2017 -0600
@@ -71,14 +71,14 @@
 	}
 
 
-	public static class StringMap {
+	public static class GlobalMap {
 
 		private static class Value {
 			final long time = System.currentTimeMillis();
-			final String s;
+			final Object v;
 
-			Value(String s) {
-				this.s = s;
+			Value(Object v) {
+				this.v = v;
 			}
 		}
 
@@ -89,13 +89,21 @@
 			}
 		};
 
-		public synchronized String get(String key) {
+		public synchronized Object get(String key) {
 			Value val = map.get(key);
-			return val==null ? null : val.s;
+			return val==null ? null : val.v;
 		}
 
-		public synchronized void set(String key,String s) {
-			map.put(key,new Value(s));
+		public synchronized Object put(String key,Object v) throws LuanException {
+			Value val;
+			if( v == null ) {
+				val = map.remove(key);
+			} else {
+				if( !(v instanceof String || v instanceof Boolean || v instanceof Number) )
+					throw new LuanException("can't assign type "+Luan.type(v)+" to Thread.global");
+				val = map.put(key,new Value(v));
+			}
+			return val==null ? null : val.v;
 		}
 	}
 }