diff --git a/TODO.md b/TODO.md
index 4e1e6389cb..35ab9e30d4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,7 +11,7 @@ Broken stuff to fixe before release
 - dwarf
 - rar asm/dis
 
-0.9.4
+0.9.6
 =====
 * scr.cols -> hex.cols
 * scr.width
diff --git a/libr/bin/format/dex/dex.h b/libr/bin/format/dex/dex.h
index b697ad3d8c..cf3c096b71 100644
--- a/libr/bin/format/dex/dex.h
+++ b/libr/bin/format/dex/dex.h
@@ -77,6 +77,7 @@ struct r_bin_dex_obj_t {
 	ut32 *strings;
 	struct dex_method_t *methods;
 	struct dex_field_t *fields;
+	RList *methods_list;
 };
 
 struct r_bin_dex_str_t {
diff --git a/libr/db/sdb/Makefile b/libr/db/sdb/Makefile
index 10d3b24f4d..b7317b8c69 100644
--- a/libr/db/sdb/Makefile
+++ b/libr/db/sdb/Makefile
@@ -17,6 +17,11 @@ endif
 src/sdb-version.h:
 	echo '#define SDB_VERSION "${VERSION}"' > src/sdb-version.h
 
+EMCCFLAGS=-O2 -s ASM_JS=1
+#EMCCFLAGS+=--embed-file sdb.data
+sdb.js: src/sdb-version.h
+	cd src ; emcc ${EMCCFLAGS} -I. -o ../sdb.js *.c json/api.c json/js0n.c json/json.c json/rangstr.c  
+
 clean:
 	rm -f src/sdb-version.h
 	cd src && ${MAKE} clean
diff --git a/libr/db/sdb/config.mk b/libr/db/sdb/config.mk
index 634fa9be8c..9a6deb1655 100644
--- a/libr/db/sdb/config.mk
+++ b/libr/db/sdb/config.mk
@@ -1,9 +1,7 @@
 DESTDIR?=
 PREFIX?=/usr
 
-VERSION=0.6.1
-
-CFLAGS+=-DVERSION=\"${VERSION}\"
+VERSION=0.6.2
 
 CFLAGS_STD?=-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
 CFLAGS+=${CFLAGS_STD}
diff --git a/libr/db/sdb/src/main.c b/libr/db/sdb/src/main.c
index 5363382d64..b742dde732 100644
--- a/libr/db/sdb/src/main.c
+++ b/libr/db/sdb/src/main.c
@@ -67,7 +67,7 @@ static void showusage(int o) {
 }
 
 static void showversion(void) {
-	printf ("sdb "VERSION"\n");
+	printf ("sdb "SDB_VERSION"\n");
 	exit (0);
 }
 
diff --git a/libr/db/sdb/src/query.c b/libr/db/sdb/src/query.c
index ad7b1a5a71..bbebb5976a 100644
--- a/libr/db/sdb/src/query.c
+++ b/libr/db/sdb/src/query.c
@@ -30,10 +30,16 @@ SDB_VISIBLE char *sdb_querysf (Sdb *s, char *buf, size_t buflen, const char *fmt
 
 SDB_VISIBLE char *sdb_querys (Sdb *s, char *buf, size_t len, const char *cmd) {
 	const char *q;
-	char *p, *eq, *ask = strchr (cmd, '?');
+	char *p, *eq, *ask;
 	int i, ok, w, alength;
 	ut64 n;
+	if (cmd == NULL) {
+		cmd = buf;
+		buf = NULL;
+	}
+	if (!len || !buf) buf = malloc ((len=32));
 
+	ask = strchr (cmd, '?');
 	if (*cmd == '+' || *cmd == '-') {
 		*buf = 0;
 		if (ask) {
diff --git a/libr/db/sdb/src/sdb-version.h b/libr/db/sdb/src/sdb-version.h
index e40b4b7d46..8078159976 100644
--- a/libr/db/sdb/src/sdb-version.h
+++ b/libr/db/sdb/src/sdb-version.h
@@ -1 +1 @@
-#define SDB_VERSION "0.6.1"
+#define SDB_VERSION "0.6.2"
diff --git a/libr/include/sdb/sdb-version.h b/libr/include/sdb/sdb-version.h
index e40b4b7d46..8078159976 100644
--- a/libr/include/sdb/sdb-version.h
+++ b/libr/include/sdb/sdb-version.h
@@ -1 +1 @@
-#define SDB_VERSION "0.6.1"
+#define SDB_VERSION "0.6.2"