diff --git a/build/page.js b/build/page.js
index 858cb7a4..e90d71e9 100755
--- a/build/page.js
+++ b/build/page.js
@@ -88,7 +88,7 @@
     if (false !== options.popstate) addEventListener('popstate', onpopstate, false);
     if (false !== options.click) addEventListener('click', onclick, false);
     if (!dispatch) return;
-    page.replace(location.pathname, null, true, dispatch);
+    page.replace(location.pathname + location.search, null, true, dispatch);
   };
 
   /**
@@ -264,8 +264,10 @@
 
   Route.prototype.match = function(path, params){
     var keys = this.keys
-      , m = this.regexp.exec(path);
-
+      , qsIndex = path.indexOf('?')
+      , pathname = ~qsIndex ? path.slice(0, qsIndex) : path
+      , m = this.regexp.exec(pathname);
+  
     if (!m) return false;
 
     for (var i = 1, len = m.length; i < len; ++i) {
@@ -348,7 +350,7 @@
     while (el && 'A' != el.nodeName) el = el.parentNode;
     if (!el || 'A' != el.nodeName) return;
     var href = el.href;
-    var path = el.pathname;
+    var path = el.pathname + el.search;
     if (el.hash) return;
     if (!sameOrigin(href)) return;
     var orig = path;
diff --git a/build/page.min.js b/build/page.min.js
index ba6307d7..3f39c8f2 100644
--- a/build/page.min.js
+++ b/build/page.min.js
@@ -1 +1 @@
-(function(){var dispatch=!0,base="",running;function page(path,fn){if("function"==typeof fn){var route=new Route(path);for(var i=1;i<arguments.length;++i)page.callbacks.push(route.middleware(arguments[i]))}else"string"==typeof path?page.show(path,fn):page.start(path)}page.callbacks=[],page.base=function(path){if(0==arguments.length)return base;base=path},page.start=function(options){options=options||{};if(running)return;running=!0,!1===options.dispatch&&(dispatch=!1),!1!==options.popstate&&addEventListener("popstate",onpopstate,!1),!1!==options.click&&addEventListener("click",onclick,!1);if(!dispatch)return;page.replace(location.pathname,null,!0,dispatch)},page.stop=function(){running=!1,removeEventListener("click",onclick,!1),removeEventListener("popstate",onpopstate,!1)},page.show=function(path,state){var ctx=new Context(path,state);return page.dispatch(ctx),ctx.unhandled||ctx.pushState(),ctx},page.replace=function(path,state,init,dispatch){var ctx=new Context(path,state);return ctx.init=init,null==dispatch&&(dispatch=!0),dispatch&&page.dispatch(ctx),ctx.save(),ctx},page.dispatch=function(ctx){var i=0;function next(){var fn=page.callbacks[i++];if(!fn)return unhandled(ctx);fn(ctx,next)}next()};function unhandled(ctx){if(window.location.pathname==ctx.canonicalPath)return;page.stop(),ctx.unhandled=!0,window.location=ctx.canonicalPath}function Context(path,state){"/"==path[0]&&0!=path.indexOf(base)&&(path=base+path),this.canonicalPath=path,this.path=path.replace(base,"")||"/",this.title=document.title,this.state=state||{},this.state.path=path,this.params=[]}Context.prototype.pushState=function(){history.pushState(this.state,this.title,this.canonicalPath)},Context.prototype.save=function(){history.replaceState(this.state,this.title,this.canonicalPath)};function Route(path,options){options=options||{},this.path=path,this.method="GET",this.regexp=pathtoRegexp(path,this.keys=[],options.sensitive,options.strict)}Route.prototype.middleware=function(fn){var self=this;return function(ctx,next){if(self.match(ctx.path,ctx.params))return fn(ctx,next);next()}},Route.prototype.match=function(path,params){var keys=this.keys,m=this.regexp.exec(path);if(!m)return!1;for(var i=1,len=m.length;i<len;++i){var key=keys[i-1],val="string"==typeof m[i]?decodeURIComponent(m[i]):m[i];key?params[key.name]=undefined!==params[key.name]?params[key.name]:val:params.push(val)}return!0};function pathtoRegexp(path,keys,sensitive,strict){return path instanceof RegExp?path:(path instanceof Array&&(path="("+path.join("|")+")"),path=path.concat(strict?"":"/?").replace(/\/\(/g,"(?:/").replace(/\+/g,"__plus__").replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?/g,function(_,slash,format,key,capture,optional){return keys.push({name:key,optional:!!optional}),slash=slash||"",""+(optional?"":slash)+"(?:"+(optional?slash:"")+(format||"")+(capture||format&&"([^/.]+?)"||"([^/]+?)")+")"+(optional||"")}).replace(/([\/.])/g,"\\$1").replace(/__plus__/g,"(.+)").replace(/\*/g,"(.*)"),new RegExp("^"+path+"$",sensitive?"":"i"))}function onpopstate(e){if(e.state){var path=e.state.path;page.replace(path,e.state)}}function onclick(e){if(e.defaultPrevented)return;var el=e.target;while(el&&"A"!=el.nodeName)el=el.parentNode;if(!el||"A"!=el.nodeName)return;var href=el.href,path=el.pathname;if(el.hash)return;if(!sameOrigin(href))return;var orig=path;path=path.replace(base,"");if(base&&orig==path)return;e.preventDefault(),page.show(orig)}function sameOrigin(href){var origin=location.protocol+"//"+location.hostname;return location.port&&(origin+=":"+location.port),0==href.indexOf(origin)}"undefined"==typeof module?window.page=page:module.exports=page})();
\ No newline at end of file
+(function(){var dispatch=!0,base="",running;function page(path,fn){if("function"==typeof fn){var route=new Route(path);for(var i=1;i<arguments.length;++i)page.callbacks.push(route.middleware(arguments[i]))}else"string"==typeof path?page.show(path,fn):page.start(path)}page.callbacks=[],page.base=function(path){if(0==arguments.length)return base;base=path},page.start=function(options){options=options||{};if(running)return;running=!0,!1===options.dispatch&&(dispatch=!1),!1!==options.popstate&&addEventListener("popstate",onpopstate,!1),!1!==options.click&&addEventListener("click",onclick,!1);if(!dispatch)return;page.replace(location.pathname+location.search,null,!0,dispatch)},page.stop=function(){running=!1,removeEventListener("click",onclick,!1),removeEventListener("popstate",onpopstate,!1)},page.show=function(path,state){var ctx=new Context(path,state);return page.dispatch(ctx),ctx.unhandled||ctx.pushState(),ctx},page.replace=function(path,state,init,dispatch){var ctx=new Context(path,state);return ctx.init=init,null==dispatch&&(dispatch=!0),dispatch&&page.dispatch(ctx),ctx.save(),ctx},page.dispatch=function(ctx){var i=0;function next(){var fn=page.callbacks[i++];if(!fn)return unhandled(ctx);fn(ctx,next)}next()};function unhandled(ctx){if(window.location.pathname==ctx.canonicalPath)return;page.stop(),ctx.unhandled=!0,window.location=ctx.canonicalPath}function Context(path,state){"/"==path[0]&&0!=path.indexOf(base)&&(path=base+path),this.canonicalPath=path,this.path=path.replace(base,"")||"/",this.title=document.title,this.state=state||{},this.state.path=path,this.params=[]}Context.prototype.pushState=function(){history.pushState(this.state,this.title,this.canonicalPath)},Context.prototype.save=function(){history.replaceState(this.state,this.title,this.canonicalPath)};function Route(path,options){options=options||{},this.path=path,this.method="GET",this.regexp=pathtoRegexp(path,this.keys=[],options.sensitive,options.strict)}Route.prototype.middleware=function(fn){var self=this;return function(ctx,next){if(self.match(ctx.path,ctx.params))return fn(ctx,next);next()}},Route.prototype.match=function(path,params){var keys=this.keys,qsIndex=path.indexOf("?"),pathname=~qsIndex?path.slice(0,qsIndex):path,m=this.regexp.exec(pathname);if(!m)return!1;for(var i=1,len=m.length;i<len;++i){var key=keys[i-1],val="string"==typeof m[i]?decodeURIComponent(m[i]):m[i];key?params[key.name]=undefined!==params[key.name]?params[key.name]:val:params.push(val)}return!0};function pathtoRegexp(path,keys,sensitive,strict){return path instanceof RegExp?path:(path instanceof Array&&(path="("+path.join("|")+")"),path=path.concat(strict?"":"/?").replace(/\/\(/g,"(?:/").replace(/\+/g,"__plus__").replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?/g,function(_,slash,format,key,capture,optional){return keys.push({name:key,optional:!!optional}),slash=slash||"",""+(optional?"":slash)+"(?:"+(optional?slash:"")+(format||"")+(capture||format&&"([^/.]+?)"||"([^/]+?)")+")"+(optional||"")}).replace(/([\/.])/g,"\\$1").replace(/__plus__/g,"(.+)").replace(/\*/g,"(.*)"),new RegExp("^"+path+"$",sensitive?"":"i"))}function onpopstate(e){if(e.state){var path=e.state.path;page.replace(path,e.state)}}function onclick(e){if(e.defaultPrevented)return;var el=e.target;while(el&&"A"!=el.nodeName)el=el.parentNode;if(!el||"A"!=el.nodeName)return;var href=el.href,path=el.pathname+el.search;if(el.hash)return;if(!sameOrigin(href))return;var orig=path;path=path.replace(base,"");if(base&&orig==path)return;e.preventDefault(),page.show(orig)}function sameOrigin(href){var origin=location.protocol+"//"+location.hostname;return location.port&&(origin+=":"+location.port),0==href.indexOf(origin)}"undefined"==typeof module?window.page=page:module.exports=page})();
\ No newline at end of file
diff --git a/lib/page.js b/lib/page.js
index 858cb7a4..e90d71e9 100755
--- a/lib/page.js
+++ b/lib/page.js
@@ -88,7 +88,7 @@
     if (false !== options.popstate) addEventListener('popstate', onpopstate, false);
     if (false !== options.click) addEventListener('click', onclick, false);
     if (!dispatch) return;
-    page.replace(location.pathname, null, true, dispatch);
+    page.replace(location.pathname + location.search, null, true, dispatch);
   };
 
   /**
@@ -264,8 +264,10 @@
 
   Route.prototype.match = function(path, params){
     var keys = this.keys
-      , m = this.regexp.exec(path);
-
+      , qsIndex = path.indexOf('?')
+      , pathname = ~qsIndex ? path.slice(0, qsIndex) : path
+      , m = this.regexp.exec(pathname);
+  
     if (!m) return false;
 
     for (var i = 1, len = m.length; i < len; ++i) {
@@ -348,7 +350,7 @@
     while (el && 'A' != el.nodeName) el = el.parentNode;
     if (!el || 'A' != el.nodeName) return;
     var href = el.href;
-    var path = el.pathname;
+    var path = el.pathname + el.search;
     if (el.hash) return;
     if (!sameOrigin(href)) return;
     var orig = path;
diff --git a/test/tests.js b/test/tests.js
index 2b4d33ac..e6e58741 100644
--- a/test/tests.js
+++ b/test/tests.js
@@ -15,6 +15,42 @@ describe('page', function(){
     })
   })
 
+  describe('when matching routes', function(){
+    describe('when the path contains a query string', function(){
+      it('should not consider the query string when matching', function(done){
+        page('/qs', function(ctx){
+          done();
+        });
+
+        page('/qs?test=true');
+      })
+
+      it('should not consider the query string when matching a route ending with a named param', function(done){
+        page('/qs/:testParam', function(ctx){
+          done();
+        });
+
+        page('/qs/test?test=true');
+      })
+
+      it('should not consider the query string when matching a route ending with a named wildcard param', function(done){
+        page('/qs/named/wildcard/:testParam(*)', function(ctx){
+          done();
+        });
+
+        page('/qs/named/wildcard/something/else?test=true');
+      })
+
+      it('should not consider the query string when matching a route ending with a wildcard', function(done){
+        page('/qs/wildcard/end/*', function(ctx){
+          done();
+        });
+
+        page('/qs/wildcard/end/with/something/here?test=true');
+      });
+    })
+  })
+
   describe('when the route matches', function(){
     it('should invoke the callback', function(done){
       page('/user/:name', function(ctx){
@@ -32,6 +68,28 @@ describe('page', function(){
 
       page('/blog/post/something');
     })
+
+    describe('when the match has a query string', function(){
+
+      it('should not include the query string inside ctx.params for named param values', function(done){
+        page('/query/string/:name', function(ctx){
+          expect(ctx.params.name).to.equal('something');
+          done();
+        })
+
+        page('/query/string/something?test=true');
+      })
+
+      it('should not include the query string inside ctx.params for named wildcard params', function(done){
+        page('/query/string/wildcard/:name(*)', function(ctx){
+          expect(ctx.params.name).to.equal('something');
+          done();
+        })
+
+        page('/query/string/wildcard/something?test=true');
+      })
+    })
+
   })
 
   describe('when next() is called', function(){