diff --git a/bindings/go/unicorn/unicorn.go b/bindings/go/unicorn/unicorn.go
index 1500627a..ecaa6336 100644
--- a/bindings/go/unicorn/unicorn.go
+++ b/bindings/go/unicorn/unicorn.go
@@ -48,6 +48,7 @@ type Unicorn interface {
 	Stop() error
 	HookAdd(htype int, cb interface{}, begin, end uint64, extra ...int) (Hook, error)
 	HookDel(hook Hook) error
+	Query(queryType int) (uint64, error)
 	Close() error
 }
 
@@ -167,3 +168,9 @@ func (u *uc) MemProtect(addr, size uint64, prot int) error {
 func (u *uc) MemUnmap(addr, size uint64) error {
 	return errReturn(C.uc_mem_unmap(u.handle, C.uint64_t(addr), C.size_t(size)))
 }
+
+func (u *uc) Query(queryType int) (uint64, error) {
+	var ret C.size_t
+	ucerr := C.uc_query(u.handle, C.uc_query_type(queryType), &ret)
+	return uint64(ret), errReturn(ucerr)
+}
diff --git a/bindings/go/unicorn/unicorn_test.go b/bindings/go/unicorn/unicorn_test.go
index 58e78431..6627528f 100644
--- a/bindings/go/unicorn/unicorn_test.go
+++ b/bindings/go/unicorn/unicorn_test.go
@@ -59,3 +59,17 @@ func TestMemRegions(t *testing.T) {
 		t.Fatalf("incorrect region: %#v", r)
 	}
 }
+
+func TestQuery(t *testing.T) {
+	mu, err := NewUnicorn(ARCH_ARM, MODE_THUMB)
+	if err != nil {
+		t.Fatal(err)
+	}
+	mode, err := mu.Query(QUERY_MODE)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if mode != MODE_THUMB {
+		t.Fatal("query returned invalid mode: %d != %d", mode, MODE_THUMB)
+	}
+}