diff --git a/src/routing.jl b/src/routing.jl
index 0240faf7..e00ec972 100644
--- a/src/routing.jl
+++ b/src/routing.jl
@@ -1,6 +1,6 @@
 using HTTP
 
-export method, GET, route, page, probabilty
+export method, GET, route, page, probabilty, query
 
 # Request type
 
@@ -44,6 +44,24 @@ page(p::AbstractString, app...) = page(splitpath(p), app...)
 page(app...) = page([], app...)
 page(app::Function, p) = page(p, app)
 
+# Query routing
+
+function matchquery(q, req)
+  qdict = HTTP.URIs.queryparams(req[:query])
+  length(q) != length(qdict) && return false
+  for (key, value) in q
+    if haskey(qdict, key) && (value == "" || value == qdict[key])
+      continue
+    else
+      return false
+    end
+  end
+  return true
+end
+
+query(q::Dict{<:AbstractString, <:AbstractString}, app...) =
+  branch(req -> matchquery(q, req), app...)
+
 # Misc
 
 probabilty(x, app...) = branch(_->rand()<x, app...)
diff --git a/test/runtests.jl b/test/runtests.jl
index be1f2999..e07b9fb4 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -2,15 +2,19 @@ using Mux
 using Test
 using Lazy
 using HTTP
+import HTTP.ExceptionRequest: StatusError
 
 @test Mux.notfound()(d())[:status] == 404
-
+d1 = Dict("one"=> "1", "two"=> "2")
+d2 = Dict("one"=> "1", "two"=> "")
 # Test basic server
 @app test = (
   Mux.defaults,
   page("/",respond("<h1>Hello World!</h1>")),
   page("/about", respond("<h1>Boo!</h1>")),
   page("/user/:user", req -> "<h1>Hello, $(req[:params][:user])!</h1>"),
+  query(d1, respond("<h1>query1</h1>")),
+  query(d2, respond("<h1>query2</h1>")),
   Mux.notfound())
 serve(test)
 @test String(HTTP.get("http://localhost:8000").body) ==
@@ -30,3 +34,15 @@ function f()
 end
 
 @test f() == nothing
+
+# Query based routing
+@test String(HTTP.get("http://localhost:8000/dum?one=1&two=2").body) ==
+            "<h1>query1</h1>"
+@test_throws StatusError String(HTTP.get("http://localhost:8000/dum?one=1").body)
+@test_throws StatusError String(HTTP.get("http://localhost:8000/dum?one=1&two=2&sarv=boo").body)
+@test_throws StatusError String(HTTP.get("http://localhost:8000/dum?one=1").body)
+@test String(HTTP.get("http://localhost:8000/dum?one=1&two=56").body) ==
+            "<h1>query2</h1>"
+@test String(HTTP.get("http://localhost:8000/dum?one=1&two=hfjd").body) ==
+            "<h1>query2</h1>"
+@test_throws StatusError String(HTTP.get("http://localhost:8000/dum?one=1&two=2&sarv=boo").body)