diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..94cc540
Binary files /dev/null and b/.DS_Store differ
diff --git a/path.js b/path.js
index d56a2d8..dc4b652 100644
--- a/path.js
+++ b/path.js
@@ -1,192 +1,219 @@
-var Path = {
-    'version': "0.8.4",
-    'map': function (path) {
-        if (Path.routes.defined.hasOwnProperty(path)) {
-            return Path.routes.defined[path];
-        } else {
-            return new Path.core.route(path);
-        }
-    },
-    'root': function (path) {
-        Path.routes.root = path;
-    },
-    'rescue': function (fn) {
-        Path.routes.rescue = fn;
-    },
-    'history': {
-        'initial':{}, // Empty container for "Initial Popstate" checking variables.
-        'pushState': function(state, title, path){
-            if(Path.history.supported){
-                if(Path.dispatch(path)){
-                    history.pushState(state, title, path);
-                }
+!function (ctx) {
+
+    var Path = {
+        'version': "0.8.4",
+        'map': function (path) {
+            if (Path.routes.defined.hasOwnProperty(path)) {
+                return Path.routes.defined[path];
             } else {
-                if(Path.history.fallback){
-                    window.location.hash = "#" + path;
-                }
+                return new Path.core.route(path);
             }
         },
-        'popState': function(event){
-            var initialPop = !Path.history.initial.popped && location.href == Path.history.initial.URL;
-            Path.history.initial.popped = true;
-            if(initialPop) return;
-            Path.dispatch(document.location.pathname);
+        'root': function (path) {
+            Path.routes.root = path;
         },
-        'listen': function(fallback){
-            Path.history.supported = !!(window.history && window.history.pushState);
-            Path.history.fallback  = fallback;
+        'rescue': function (fn) {
+            Path.routes.rescue = fn;
+        },
+        'history': {
+            'initial':{}, // Empty container for "Initial Popstate" checking variables.
+            'pushState': function(state, title, path){
+                if(Path.history.supported){
+                    if(Path.dispatch(path)){
+                        history.pushState(state, title, path);
+                    }
+                } else {
+                    if(Path.history.fallback){
+                        window.location.hash = "#" + path;
+                    }
+                }
+            },
+            'popState': function(event){
+                var initialPop = !Path.history.initial.popped && location.href == Path.history.initial.URL;
+                Path.history.initial.popped = true;
+                if(initialPop) return;
+                Path.dispatch(document.location.pathname);
+            },
+            'listen': function(fallback){
+                Path.history.supported = !!(window.history && window.history.pushState);
+                Path.history.fallback  = fallback;
 
-            if(Path.history.supported){
-                Path.history.initial.popped = ('state' in window.history), Path.history.initial.URL = location.href;
-                window.onpopstate = Path.history.popState;
-            } else {
-                if(Path.history.fallback){
-                    for(route in Path.routes.defined){
-                        if(route.charAt(0) != "#"){
-                          Path.routes.defined["#"+route] = Path.routes.defined[route];
-                          Path.routes.defined["#"+route].path = "#"+route;
+                if(Path.history.supported){
+                    Path.history.initial.popped = ('state' in window.history), Path.history.initial.URL = location.href;
+                    window.onpopstate = Path.history.popState;
+                } else {
+                    if(Path.history.fallback){
+                        for(route in Path.routes.defined){
+                            if(route.charAt(0) != "#"){
+                              Path.routes.defined["#"+route] = Path.routes.defined[route];
+                              Path.routes.defined["#"+route].path = "#"+route;
+                            }
                         }
+                        Path.listen();
                     }
-                    Path.listen();
                 }
             }
-        }
-    },
-    'match': function (path, parameterize) {
-        var params = {}, route = null, possible_routes, slice, i, j, compare;
-        for (route in Path.routes.defined) {
-            if (route !== null && route !== undefined) {
-                route = Path.routes.defined[route];
-                possible_routes = route.partition();
-                for (j = 0; j < possible_routes.length; j++) {
-                    slice = possible_routes[j];
-                    compare = path;
-                    if (slice.search(/:/) > 0) {
-                        for (i = 0; i < slice.split("/").length; i++) {
-                            if ((i < compare.split("/").length) && (slice.split("/")[i].charAt(0) === ":")) {
-                                params[slice.split('/')[i].replace(/:/, '')] = compare.split("/")[i];
-                                compare = compare.replace(compare.split("/")[i], slice.split("/")[i]);
-                            }
+        },
+        'match': function (path, parameterize) {
+            var params = {}, route = null, possible_routes, slice, i, j, compare;
+            for (route in Path.routes.defined) {
+                if (route !== null && route !== undefined) {
+                    route = Path.routes.defined[route];
+                    possible_routes = route.partition();
+
+                    // if a ? is present...
+                    if (path.search(/\?[a-z0-9\-_=&]{1,}/i) > 0) {
+                        var url_params = path.match(/\?[a-z0-9\-_=&]{1,}/i),
+                            param;
+
+                        // remove the ?, split params on & if applicable
+                        param = url_params[0].substring(1).split('&');
+
+                        // add params to route params array, allowing fully qualified params (like :id in URL match)
+                        //  to overwrite query string params
+                        for(var u in param) {
+                            params[ param[u].split('=')[0] || param[u] ] = param[u].split('=')[1] || true;
                         }
+
+                        // remove url query params from path & re-assign
+                        path = path.substring(0, path.search(/\?[a-z0-9\-_=&]+/gi));
                     }
-                    if (slice === compare) {
-                        if (parameterize) {
-                            route.params = params;
+
+                    for (j = 0; j < possible_routes.length; j++) {
+                        slice = possible_routes[j];
+                        compare = path;
+                        if (slice.search(/:/) > 0) {
+                            for (i = 0; i < slice.split("/").length; i++) {
+                                if ((i < compare.split("/").length) && (slice.split("/")[i].charAt(0) === ":")) {
+                                    params[slice.split('/')[i].replace(/:/, '')] = compare.split("/")[i];
+                                    compare = compare.replace(compare.split("/")[i], slice.split("/")[i]);
+                                }
+                            }
+                        }
+                        if (slice === compare) {
+                            if (parameterize) {
+                                route.params = params;
+                            }
+                            return route;
                         }
-                        return route;
                     }
                 }
             }
-        }
-        return null;
-    },
-    'dispatch': function (passed_route) {
-        var previous_route, matched_route;
-        if (Path.routes.current !== passed_route) {
-            Path.routes.previous = Path.routes.current;
-            Path.routes.current = passed_route;
-            matched_route = Path.match(passed_route, true);
+            return null;
+        },
+        'dispatch': function (passed_route) {
+            var previous_route, matched_route;
+            if (Path.routes.current !== passed_route) {
+                Path.routes.previous = Path.routes.current;
+                Path.routes.current = passed_route;
+                matched_route = Path.match(passed_route, true);
 
-            if (Path.routes.previous) {
-                previous_route = Path.match(Path.routes.previous);
-                if (previous_route !== null && previous_route.do_exit !== null) {
-                    previous_route.do_exit();
+                if (Path.routes.previous) {
+                    previous_route = Path.match(Path.routes.previous);
+                    if (previous_route !== null && previous_route.do_exit !== null) {
+                        previous_route.do_exit();
+                    }
                 }
-            }
 
-            if (matched_route !== null) {
-                matched_route.run();
-                return true;
-            } else {
-                if (Path.routes.rescue !== null) {
-                    Path.routes.rescue();
+                if (matched_route !== null) {
+                    matched_route.run();
+                    return true;
+                } else {
+                    if (Path.routes.rescue !== null) {
+                        Path.routes.rescue();
+                    }
                 }
             }
-        }
-    },
-    'listen': function () {
-        var fn = function(){ Path.dispatch(location.hash); }
+        },
+        'listen': function () {
+            var fn = function(){ Path.dispatch(location.hash); }
 
-        if (location.hash === "") {
-            if (Path.routes.root !== null) {
-                location.hash = Path.routes.root;
+            if (location.hash === "") {
+                if (Path.routes.root !== null) {
+                    location.hash = Path.routes.root;
+                }
             }
-        }
 
-        // The 'document.documentMode' checks below ensure that PathJS fires the right events
-        // even in IE "Quirks Mode".
-        if ("onhashchange" in window && (!document.documentMode || document.documentMode >= 8)) {
-            window.onhashchange = fn;
-        } else {
-            setInterval(fn, 50);
-        }
+            // The 'document.documentMode' checks below ensure that PathJS fires the right events
+            // even in IE "Quirks Mode".
+            if ("onhashchange" in window && (!document.documentMode || document.documentMode >= 8)) {
+                window.addEventListener("hashchange", fn, false);
+            } else {
+                setInterval(fn, 50);
+            }
 
-        if(location.hash !== "") {
-            Path.dispatch(location.hash);
-        }
-    },
-    'core': {
-        'route': function (path) {
-            this.path = path;
-            this.action = null;
-            this.do_enter = [];
-            this.do_exit = null;
-            this.params = {};
-            Path.routes.defined[path] = this;
-        }
-    },
-    'routes': {
-        'current': null,
-        'root': null,
-        'rescue': null,
-        'previous': null,
-        'defined': {}
-    }
-};
-Path.core.route.prototype = {
-    'to': function (fn) {
-        this.action = fn;
-        return this;
-    },
-    'enter': function (fns) {
-        if (fns instanceof Array) {
-            this.do_enter = this.do_enter.concat(fns);
-        } else {
-            this.do_enter.push(fns);
-        }
-        return this;
-    },
-    'exit': function (fn) {
-        this.do_exit = fn;
-        return this;
-    },
-    'partition': function () {
-        var parts = [], options = [], re = /\(([^}]+?)\)/g, text, i;
-        while (text = re.exec(this.path)) {
-            parts.push(text[1]);
-        }
-        options.push(this.path.split("(")[0]);
-        for (i = 0; i < parts.length; i++) {
-            options.push(options[options.length - 1] + parts[i]);
+            if(location.hash !== "") {
+                Path.dispatch(location.hash);
+            }
+        },
+        'core': {
+            'route': function (path) {
+                this.path = path;
+                this.action = null;
+                this.do_enter = [];
+                this.do_exit = null;
+                this.params = {};
+                Path.routes.defined[path] = this;
+            }
+        },
+        'routes': {
+            'current': null,
+            'root': null,
+            'rescue': null,
+            'previous': null,
+            'defined': {}
         }
-        return options;
-    },
-    'run': function () {
-        var halt_execution = false, i, result, previous;
+    };
+    Path.core.route.prototype = {
+        'to': function (fn) {
+            this.action = fn;
+            return this;
+        },
+        'enter': function (fns) {
+            if (fns instanceof Array) {
+                this.do_enter = this.do_enter.concat(fns);
+            } else {
+                this.do_enter.push(fns);
+            }
+            return this;
+        },
+        'exit': function (fn) {
+            this.do_exit = fn;
+            return this;
+        },
+        'partition': function () {
+            var parts = [], options = [], re = /\(([^}]+?)\)/g, text, i;
+            while (text = re.exec(this.path)) {
+                parts.push(text[1]);
+            }
+            options.push(this.path.split("(")[0]);
+            for (i = 0; i < parts.length; i++) {
+                options.push(options[options.length - 1] + parts[i]);
+            }
+            return options;
+        },
+        'run': function () {
+            var halt_execution = false, i, result, previous;
 
-        if (Path.routes.defined[this.path].hasOwnProperty("do_enter")) {
-            if (Path.routes.defined[this.path].do_enter.length > 0) {
-                for (i = 0; i < Path.routes.defined[this.path].do_enter.length; i++) {
-                    result = Path.routes.defined[this.path].do_enter[i].apply(this, null);
-                    if (result === false) {
-                        halt_execution = true;
-                        break;
+            if (Path.routes.defined[this.path].hasOwnProperty("do_enter")) {
+                if (Path.routes.defined[this.path].do_enter.length > 0) {
+                    for (i = 0; i < Path.routes.defined[this.path].do_enter.length; i++) {
+                        result = Path.routes.defined[this.path].do_enter[i].apply(this, null);
+                        if (result === false) {
+                            halt_execution = true;
+                            break;
+                        }
                     }
                 }
             }
+            if (!halt_execution) {
+                Path.routes.defined[this.path].action();
+            }
         }
-        if (!halt_execution) {
-            Path.routes.defined[this.path].action();
-        }
-    }
-};
\ No newline at end of file
+    };
+
+    typeof module !== 'undefined' && module.exports ?
+        (module.exports.pathjs = Path) :
+        (ctx.pathjs = Path);
+
+}(this);
\ No newline at end of file
diff --git a/path.min.js b/path.min.js
index f44e647..46dd099 100644
--- a/path.min.js
+++ b/path.min.js
@@ -1 +1 @@
-var Path={version:"0.8.4",map:function(a){if(Path.routes.defined.hasOwnProperty(a)){return Path.routes.defined[a]}else{return new Path.core.route(a)}},root:function(a){Path.routes.root=a},rescue:function(a){Path.routes.rescue=a},history:{initial:{},pushState:function(a,b,c){if(Path.history.supported){if(Path.dispatch(c)){history.pushState(a,b,c)}}else{if(Path.history.fallback){window.location.hash="#"+c}}},popState:function(a){var b=!Path.history.initial.popped&&location.href==Path.history.initial.URL;Path.history.initial.popped=true;if(b)return;Path.dispatch(document.location.pathname)},listen:function(a){Path.history.supported=!!(window.history&&window.history.pushState);Path.history.fallback=a;if(Path.history.supported){Path.history.initial.popped="state"in window.history,Path.history.initial.URL=location.href;window.onpopstate=Path.history.popState}else{if(Path.history.fallback){for(route in Path.routes.defined){if(route.charAt(0)!="#"){Path.routes.defined["#"+route]=Path.routes.defined[route];Path.routes.defined["#"+route].path="#"+route}}Path.listen()}}}},match:function(a,b){var c={},d=null,e,f,g,h,i;for(d in Path.routes.defined){if(d!==null&&d!==undefined){d=Path.routes.defined[d];e=d.partition();for(h=0;h<e.length;h++){f=e[h];i=a;if(f.search(/:/)>0){for(g=0;g<f.split("/").length;g++){if(g<i.split("/").length&&f.split("/")[g].charAt(0)===":"){c[f.split("/")[g].replace(/:/,"")]=i.split("/")[g];i=i.replace(i.split("/")[g],f.split("/")[g])}}}if(f===i){if(b){d.params=c}return d}}}}return null},dispatch:function(a){var b,c;if(Path.routes.current!==a){Path.routes.previous=Path.routes.current;Path.routes.current=a;c=Path.match(a,true);if(Path.routes.previous){b=Path.match(Path.routes.previous);if(b!==null&&b.do_exit!==null){b.do_exit()}}if(c!==null){c.run();return true}else{if(Path.routes.rescue!==null){Path.routes.rescue()}}}},listen:function(){var a=function(){Path.dispatch(location.hash)};if(location.hash===""){if(Path.routes.root!==null){location.hash=Path.routes.root}}if("onhashchange"in window&&(!document.documentMode||document.documentMode>=8)){window.onhashchange=a}else{setInterval(a,50)}if(location.hash!==""){Path.dispatch(location.hash)}},core:{route:function(a){this.path=a;this.action=null;this.do_enter=[];this.do_exit=null;this.params={};Path.routes.defined[a]=this}},routes:{current:null,root:null,rescue:null,previous:null,defined:{}}};Path.core.route.prototype={to:function(a){this.action=a;return this},enter:function(a){if(a instanceof Array){this.do_enter=this.do_enter.concat(a)}else{this.do_enter.push(a)}return this},exit:function(a){this.do_exit=a;return this},partition:function(){var a=[],b=[],c=/\(([^}]+?)\)/g,d,e;while(d=c.exec(this.path)){a.push(d[1])}b.push(this.path.split("(")[0]);for(e=0;e<a.length;e++){b.push(b[b.length-1]+a[e])}return b},run:function(){var a=false,b,c,d;if(Path.routes.defined[this.path].hasOwnProperty("do_enter")){if(Path.routes.defined[this.path].do_enter.length>0){for(b=0;b<Path.routes.defined[this.path].do_enter.length;b++){c=Path.routes.defined[this.path].do_enter[b]();if(c===false){a=true;break}}}}if(!a){Path.routes.defined[this.path].action()}}}
\ No newline at end of file
+!function(e){var t={version:"0.8.4",map:function(e){if(t.routes.defined.hasOwnProperty(e)){return t.routes.defined[e]}else{return new t.core.route(e)}},root:function(e){t.routes.root=e},rescue:function(e){t.routes.rescue=e},history:{initial:{},pushState:function(e,n,r){if(t.history.supported){if(t.dispatch(r)){history.pushState(e,n,r)}}else{if(t.history.fallback){window.location.hash="#"+r}}},popState:function(e){var n=!t.history.initial.popped&&location.href==t.history.initial.URL;t.history.initial.popped=true;if(n)return;t.dispatch(document.location.pathname)},listen:function(e){t.history.supported=!!(window.history&&window.history.pushState);t.history.fallback=e;if(t.history.supported){t.history.initial.popped="state"in window.history,t.history.initial.URL=location.href;window.onpopstate=t.history.popState}else{if(t.history.fallback){for(route in t.routes.defined){if(route.charAt(0)!="#"){t.routes.defined["#"+route]=t.routes.defined[route];t.routes.defined["#"+route].path="#"+route}}t.listen()}}}},match:function(e,n){var r={},i=null,s,o,u,a,f;for(i in t.routes.defined){if(i!==null&&i!==undefined){i=t.routes.defined[i];s=i.partition();if(e.search(/\?[a-z0-9\-_=&]{1,}/i)>0){var l=e.match(/\?[a-z0-9\-_=&]{1,}/i),c;c=l[0].substring(1).split("&");for(var h in c){r[c[h].split("=")[0]||c[h]]=c[h].split("=")[1]||true}e=e.substring(0,e.search(/\?[a-z0-9\-_=&]+/gi))}for(a=0;a<s.length;a++){o=s[a];f=e;if(o.search(/:/)>0){for(u=0;u<o.split("/").length;u++){if(u<f.split("/").length&&o.split("/")[u].charAt(0)===":"){r[o.split("/")[u].replace(/:/,"")]=f.split("/")[u];f=f.replace(f.split("/")[u],o.split("/")[u])}}}if(o===f){if(n){i.params=r}return i}}}}return null},dispatch:function(e){var n,r;if(t.routes.current!==e){t.routes.previous=t.routes.current;t.routes.current=e;r=t.match(e,true);if(t.routes.previous){n=t.match(t.routes.previous);if(n!==null&&n.do_exit!==null){n.do_exit()}}if(r!==null){r.run();return true}else{if(t.routes.rescue!==null){t.routes.rescue()}}}},listen:function(){var e=function(){t.dispatch(location.hash)};if(location.hash===""){if(t.routes.root!==null){location.hash=t.routes.root}}if("onhashchange"in window&&(!document.documentMode||document.documentMode>=8)){window.addEventListener("hashchange",e,false)}else{setInterval(e,50)}if(location.hash!==""){t.dispatch(location.hash)}},core:{route:function(e){this.path=e;this.action=null;this.do_enter=[];this.do_exit=null;this.params={};t.routes.defined[e]=this}},routes:{current:null,root:null,rescue:null,previous:null,defined:{}}};t.core.route.prototype={to:function(e){this.action=e;return this},enter:function(e){if(e instanceof Array){this.do_enter=this.do_enter.concat(e)}else{this.do_enter.push(e)}return this},exit:function(e){this.do_exit=e;return this},partition:function(){var e=[],t=[],n=/\(([^}]+?)\)/g,r,i;while(r=n.exec(this.path)){e.push(r[1])}t.push(this.path.split("(")[0]);for(i=0;i<e.length;i++){t.push(t[t.length-1]+e[i])}return t},run:function(){var e=false,n,r,i;if(t.routes.defined[this.path].hasOwnProperty("do_enter")){if(t.routes.defined[this.path].do_enter.length>0){for(n=0;n<t.routes.defined[this.path].do_enter.length;n++){r=t.routes.defined[this.path].do_enter[n].apply(this,null);if(r===false){e=true;break}}}}if(!e){t.routes.defined[this.path].action()}}};typeof module!=="undefined"&&module.exports?module.exports.pathjs=t:e.pathjs=t}(this)
\ No newline at end of file
diff --git a/tests/path.js.test.html b/tests/path.js.test.html
index 9d870fa..2ce57b6 100644
--- a/tests/path.js.test.html
+++ b/tests/path.js.test.html
@@ -5,143 +5,158 @@
 		<script type="text/javascript" src="../path.js"></script>
 		<script type="text/javascript">
 		var hrefs = [
-		        "#A",
+			"#A",
 			"#B",
 			"#C",
 			"#D1",
-                        "#D2",
+			"#D2",
 			"#E/params/1/parse",
 			"#E/params/2/parse",
 			"#E/params/3/check",
 			"#F",
 			"#G",
-                        "#H",
-                        "#H/10",
-                        "#H/10/20"
-	    ];
+			"#H",
+			"#H/10",
+			"#H/10/20",
+			"#I?debug",
+			"#I?debug=false",
+			"#I?debug&id=10",
+			"#I?"
+		];
 		var index = 0;
 		var timer = null;
 		
 		function update(str){
-		    var d = document.getElementById("actual");
+			var d = document.getElementById("actual");
 			text = d.innerHTML;
 			d.innerHTML = d.innerHTML + ((text == "") ? "" : "::") + str;
 		}
 		
 		function run_route(){
-		    if(index <= hrefs.length){
-                        if(index == hrefs.length){
-                            window.history.go(-1);
-                        } else {
-                            location.hash = hrefs[index];
-                        }
-			    index++;
+			if(index <= hrefs.length){
+				if(index == hrefs.length){
+					window.history.go(-5);
+				} else {
+					location.hash = hrefs[index];
+				}
+				index++;
 			} else {
-			    clearInterval(timer);
+				clearInterval(timer);
 				
 				var expected = document.getElementById("expected");
 				var actual = document.getElementById("actual");
 				var grade = document.getElementById("grade");
 				if(expected.innerHTML == actual.innerHTML){
-				    grade.innerHTML = "PASS";
+					grade.innerHTML = "PASS";
 					grade.style.color = "#00FF00";
 				} else {
-				    grade.innerHTML = "FAIL";
+					grade.innerHTML = "FAIL";
 					grade.style.color = "#FF0000";
 				}
 			}
 		}
 		
 		function define_routes(){
-		    Path.map("#A").enter(function(){
-			    update("A[enter]");
+			Path.map("#A").enter(function(){
+				update("A[enter]");
 			}).to(function(){
-			    update("A[action]");
+				update("A[action]");
 			}).exit(function(){
-			    update("A[exit]");
+				update("A[exit]");
 			});
 			
 			Path.map("#B").to(function(){
-			    update("B[action]");
+				update("B[action]");
 			});
 			
 			Path.map("#B").enter(function(){
-			    update("B[enter]");
+				update("B[enter]");
 			})
 			
 			Path.map("#C").to(function(){
-			    update("C[action]");
+				update("C[action]");
 			}).exit(function(){
-			    update("C[exit]");
+				update("C[exit]");
 			});
 			
 			// No map for #D1 or #D2.  This checks that our rescue method works, and works multiple times in succession.
 			
 			Path.map("#E/params/:id/parse").to(function(){
-			    update("E[action](parse id=" + this.params['id'] + ")");
+				update("E[action](parse id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#E/params/:id/parse").enter(function(){
-			    update("E[enter](parse id=" + this.params['id'] + ")");
+				update("E[enter](parse id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#E/params/:id/check").to(function(){
-			    update("E[action](check id=" + this.params['id'] + ")");
+				update("E[action](check id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#E/params/:id/check").exit(function(){
-			    update("E[exit](check id=" + this.params['id'] + ")");
+				update("E[exit](check id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#F").enter(function(){
-			    update("F[enter]");
+				update("F[enter]");
 			}).to(function(){
-			    update("F[action]");
+				update("F[action]");
 			});
 			
 			Path.map("#G").enter(function(){
-			    update("G[enter 1]");
+				update("G[enter 1]");
 			}).enter(function(){
-			    update("G[enter 2]");
+				update("G[enter 2]");
 			}).enter([
-			    function(){
-			        update("G[enter 3]");
-			    },
-			    function(){
-			        update("G[enter 4]");
-			        return false;
-			    }
+				function(){
+					update("G[enter 3]");
+				},
+				function(){
+					update("G[enter 4]");
+					return false;
+				}
 			]).to(function(){
-			    update("G[action - NOT HIT]");
+				update("G[action - NOT HIT]");
+			});
+
+			Path.map("#H(/:id_one)(/:id_two)").to(function(){
+				var id_one = this.params["id_one"] || "N/A";
+				var id_two = this.params["id_two"] || "N/A";
+				update("H(one=" + id_one + ", two=" + id_two + ")");
 			});
 
-                        Path.map("#H(/:id_one)(/:id_two)").to(function(){
-	                    var id_one = this.params["id_one"] || "N/A";
-	                    var id_two = this.params["id_two"] || "N/A";
-                            update("H(one=" + id_one + ", two=" + id_two + ")");
-                        });
+			Path.map("#I").to(function() {
+				var output = [];
+				if(this.params.hasOwnProperty("debug")) {
+					output.push("debug=" + this.params["debug"]);
+				}
+				if(this.params.hasOwnProperty("id")) {
+					output.push("id=" + this.params["id"]);
+				}
+				update("I(" + output.join(", ") + ")");
+			});
 			
 			Path.rescue(function(){
-			    update("RESCUE");
+				update("RESCUE");
 			});
 			
 			Path.root("#F");
 			Path.listen();
-		    timer = setInterval(run_route, 500);
-	    }
+			timer = setInterval(run_route, 200);
+		}
 		</script>
 		
 		<style type="text/css">
-		    body {font-family: arial;}
-		    p {width: 600px; text-align: justify;}
-		    table {font-family: courier;}
+			body {font-family: arial;}
+			p {width: 600px; text-align: justify;}
+			table {font-family: courier;}
 		</style>
 	</head>
 	<body onload="define_routes();">
-	    <div id="description">
-		    <h2>Test Suite</h2>
+		<div id="description">
+			<h2>Test Suite</h2>
 			<p>
-			    Path.js uses a very straightforward method of testing.  We manually construct
+				Path.js uses a very straightforward method of testing.  We manually construct
 				a series of method calls that the library should execute under normal working
 				conditions.  We then use JavaScript to simulate the URL changes, and compare
 				the final result with what the result should actually be.  If the end result
@@ -149,39 +164,43 @@ <h2>Test Suite</h2>
 				is not suitable for use. The expected test results are as follows:
 			</p>
 			<table>
-			    <tr><td><b>Token</b></td>          <td><b>Reason</b></td></tr>
-				<tr><td>F[enter]</td>              <td>Enter method of F, as it is root</td></tr>
-				<tr><td>F[action]</td>             <td>True action of F, as it is root</td></tr>
-				<tr><td>A[enter]</td>              <td>Enter method of A, as it is looped</td></tr>
-				<tr><td>A[action]</td>             <td>True action of A, as it is looped</td></tr>
-				<tr><td>A[exit]</td>               <td>Exit method of A, as we move to next route</td></tr>
-				<tr><td>B[enter]</td>              <td>Enter method of B, as it is looped</td></tr>
-				<tr><td>B[action]</td>             <td>True action of B, as it is looped</td></tr>
-				<tr><td>C[action]</td>             <td>True action of C</td></tr>
-				<tr><td>C[exit]</td>               <td>Exit method of C, as we move to next route</td></tr>
-				<tr><td>RESCUE</td>                <td>Rescue a route that wasn't found (D1)</td></tr>
-				<tr><td>RESCUE</td>                <td>Rescue a route that wasn't found (D2)</td></tr>
-				<tr><td>E[enter](parse id=1)</td>  <td>Enter method of a param parsed route</td></tr>
-				<tr><td>E[action](parse id=1)</td> <td>True action of the route, with param of id=1</td></tr>
-				<tr><td>E[enter](parse id=2)</td>  <td>Enter method of the same route again</td></tr>
-				<tr><td>E[action](parse id=2)</td> <td>True action of the route, with param of id=2</td></tr>
-				<tr><td>E[action](check id=3)</td> <td>True action of the next route, with param id=3</td></tr>
-				<tr><td>E[exit](check id=3)</td>   <td>Exit method of parameterized route</td></tr>
-				<tr><td>F[enter]</td>              <td>Enter method of F again, our final route</td></tr>
-				<tr><td>F[action]</td>             <td>True action of F, our final route</td></tr>
-				<tr><td>G[enter 1]</td>            <td>First enter method of G</td></tr>
-				<tr><td>G[enter 2]</td>            <td>Second enter method of G</td></tr>
-				<tr><td>G[enter 3]</td>            <td>Third enter method of G</td></tr>
-				<tr><td>G[enter 4]</td>            <td>Last enter method of G - Returns false, stops execution</td></tr>
-				<tr><td>H(one=N/A, two=N/A)</td>   <td>Optional parameters with only the require part submitted</td></tr>
-				<tr><td>H(one=10, two=N/A)</td>    <td>Optional parameters with one optional part submitted</td></tr>
-				<tr><td>H(one=10, two=20)</td>     <td>Optional parameters two levels deep</td></tr>
-                                <tr><td>H(one=10, two=N/A)</td>    <td>Testing "back" functionality</td></tr>
+				<tr><td><b>Token</b></td>          	<td><b>Reason</b></td></tr>
+				<tr><td>F[enter]</td>              	<td>Enter method of F, as it is root</td></tr>
+				<tr><td>F[action]</td>             	<td>True action of F, as it is root</td></tr>
+				<tr><td>A[enter]</td>              	<td>Enter method of A, as it is looped</td></tr>
+				<tr><td>A[action]</td>             	<td>True action of A, as it is looped</td></tr>
+				<tr><td>A[exit]</td>               	<td>Exit method of A, as we move to next route</td></tr>
+				<tr><td>B[enter]</td>              	<td>Enter method of B, as it is looped</td></tr>
+				<tr><td>B[action]</td>             	<td>True action of B, as it is looped</td></tr>
+				<tr><td>C[action]</td>             	<td>True action of C</td></tr>
+				<tr><td>C[exit]</td>               	<td>Exit method of C, as we move to next route</td></tr>
+				<tr><td>RESCUE</td>                	<td>Rescue a route that wasn't found (D1)</td></tr>
+				<tr><td>RESCUE</td>                	<td>Rescue a route that wasn't found (D2)</td></tr>
+				<tr><td>E[enter](parse id=1)</td>  	<td>Enter method of a param parsed route</td></tr>
+				<tr><td>E[action](parse id=1)</td> 	<td>True action of the route, with param of id=1</td></tr>
+				<tr><td>E[enter](parse id=2)</td>  	<td>Enter method of the same route again</td></tr>
+				<tr><td>E[action](parse id=2)</td> 	<td>True action of the route, with param of id=2</td></tr>
+				<tr><td>E[action](check id=3)</td> 	<td>True action of the next route, with param id=3</td></tr>
+				<tr><td>E[exit](check id=3)</td>   	<td>Exit method of parameterized route</td></tr>
+				<tr><td>F[enter]</td>              	<td>Enter method of F again, our final route</td></tr>
+				<tr><td>F[action]</td>             	<td>True action of F, our final route</td></tr>
+				<tr><td>G[enter 1]</td>            	<td>First enter method of G</td></tr>
+				<tr><td>G[enter 2]</td>            	<td>Second enter method of G</td></tr>
+				<tr><td>G[enter 3]</td>            	<td>Third enter method of G</td></tr>
+				<tr><td>G[enter 4]</td>            	<td>Last enter method of G - Returns false, stops execution</td></tr>
+				<tr><td>H(one=N/A, two=N/A)</td>   	<td>Optional parameters with only the require part submitted</td></tr>
+				<tr><td>H(one=10, two=N/A)</td>    	<td>Optional parameters with one optional part submitted</td></tr>
+				<tr><td>H(one=10, two=20)</td>     	<td>Optional parameters two levels deep</td></tr>
+				<tr><td>I(debug=true)</td>     		<td>Query string parameter present, but not set</td></tr>
+				<tr><td>I(debug=false)</td>     	<td>Query string parameter set</td></tr>
+				<tr><td>I(debug=true, id=10)</td>   <td>Multiple query string parameters, one present (but unset), one set</td></tr>
+				<tr><td>RESCUE</td>   				<td>Empty query string with ? should fail to match</td></tr>
+				<tr><td>H(one=10, two=N/A)</td>    	<td>Testing "back" functionality</td></tr>
 			</table>
 		</div><br /><br />
 		<div id="console">
-		    <h3>Expected</h3>
-		    <div id="expected">F[enter]::F[action]::A[enter]::A[action]::A[exit]::B[enter]::B[action]::C[action]::C[exit]::RESCUE::RESCUE::E[enter](parse id=1)::E[action](parse id=1)::E[enter](parse id=2)::E[action](parse id=2)::E[action](check id=3)::E[exit](check id=3)::F[enter]::F[action]::G[enter 1]::G[enter 2]::G[enter 3]::G[enter 4]::H(one=N/A, two=N/A)::H(one=10, two=N/A)::H(one=10, two=20)::H(one=10, two=N/A)</div>
+			<h3>Expected</h3>
+			<div id="expected">F[enter]::F[action]::A[enter]::A[action]::A[exit]::B[enter]::B[action]::C[action]::C[exit]::RESCUE::RESCUE::E[enter](parse id=1)::E[action](parse id=1)::E[enter](parse id=2)::E[action](parse id=2)::E[action](check id=3)::E[exit](check id=3)::F[enter]::F[action]::G[enter 1]::G[enter 2]::G[enter 3]::G[enter 4]::H(one=N/A, two=N/A)::H(one=10, two=N/A)::H(one=10, two=20)::I(debug=true)::I(debug=false)::I(debug=true, id=10)::RESCUE::H(one=10, two=N/A)</div>
 			<h3>Actual</h3>
 			<div id="actual"></div>
 			<h3>Grade</h3>
diff --git a/tests/path.min.js.test.html b/tests/path.min.js.test.html
index bdcb2e1..9649b6c 100644
--- a/tests/path.min.js.test.html
+++ b/tests/path.min.js.test.html
@@ -5,143 +5,158 @@
 		<script type="text/javascript" src="../path.min.js"></script>
 		<script type="text/javascript">
 		var hrefs = [
-		        "#A",
+			"#A",
 			"#B",
 			"#C",
 			"#D1",
-                        "#D2",
+			"#D2",
 			"#E/params/1/parse",
 			"#E/params/2/parse",
 			"#E/params/3/check",
 			"#F",
 			"#G",
-                        "#H",
-                        "#H/10",
-                        "#H/10/20"
-	    ];
+			"#H",
+			"#H/10",
+			"#H/10/20",
+			"#I?debug",
+			"#I?debug=false",
+			"#I?debug&id=10",
+			"#I?"
+		];
 		var index = 0;
 		var timer = null;
 		
 		function update(str){
-		    var d = document.getElementById("actual");
+			var d = document.getElementById("actual");
 			text = d.innerHTML;
 			d.innerHTML = d.innerHTML + ((text == "") ? "" : "::") + str;
 		}
 		
 		function run_route(){
-		    if(index <= hrefs.length){
-                        if(index == hrefs.length){
-                            window.history.go(-1);
-                        } else {
-                            location.hash = hrefs[index];
-                        }
-			    index++;
+			if(index <= hrefs.length){
+				if(index == hrefs.length){
+					window.history.go(-5);
+				} else {
+					location.hash = hrefs[index];
+				}
+				index++;
 			} else {
-			    clearInterval(timer);
+				clearInterval(timer);
 				
 				var expected = document.getElementById("expected");
 				var actual = document.getElementById("actual");
 				var grade = document.getElementById("grade");
 				if(expected.innerHTML == actual.innerHTML){
-				    grade.innerHTML = "PASS";
+					grade.innerHTML = "PASS";
 					grade.style.color = "#00FF00";
 				} else {
-				    grade.innerHTML = "FAIL";
+					grade.innerHTML = "FAIL";
 					grade.style.color = "#FF0000";
 				}
 			}
 		}
 		
 		function define_routes(){
-		    Path.map("#A").enter(function(){
-			    update("A[enter]");
+			Path.map("#A").enter(function(){
+				update("A[enter]");
 			}).to(function(){
-			    update("A[action]");
+				update("A[action]");
 			}).exit(function(){
-			    update("A[exit]");
+				update("A[exit]");
 			});
 			
 			Path.map("#B").to(function(){
-			    update("B[action]");
+				update("B[action]");
 			});
 			
 			Path.map("#B").enter(function(){
-			    update("B[enter]");
+				update("B[enter]");
 			})
 			
 			Path.map("#C").to(function(){
-			    update("C[action]");
+				update("C[action]");
 			}).exit(function(){
-			    update("C[exit]");
+				update("C[exit]");
 			});
 			
 			// No map for #D1 or #D2.  This checks that our rescue method works, and works multiple times in succession.
 			
 			Path.map("#E/params/:id/parse").to(function(){
-			    update("E[action](parse id=" + this.params['id'] + ")");
+				update("E[action](parse id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#E/params/:id/parse").enter(function(){
-			    update("E[enter](parse)");
+				update("E[enter](parse id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#E/params/:id/check").to(function(){
-			    update("E[action](check id=" + this.params['id'] + ")");
+				update("E[action](check id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#E/params/:id/check").exit(function(){
-			    update("E[exit](check)");
+				update("E[exit](check id=" + this.params['id'] + ")");
 			});
 			
 			Path.map("#F").enter(function(){
-			    update("F[enter]");
+				update("F[enter]");
 			}).to(function(){
-			    update("F[action]");
+				update("F[action]");
 			});
 			
 			Path.map("#G").enter(function(){
-			    update("G[enter 1]");
+				update("G[enter 1]");
 			}).enter(function(){
-			    update("G[enter 2]");
+				update("G[enter 2]");
 			}).enter([
-			    function(){
-			        update("G[enter 3]");
-			    },
-			    function(){
-			        update("G[enter 4]");
-			        return false;
-			    }
+				function(){
+					update("G[enter 3]");
+				},
+				function(){
+					update("G[enter 4]");
+					return false;
+				}
 			]).to(function(){
-			    update("G[action - NOT HIT]");
+				update("G[action - NOT HIT]");
+			});
+
+			Path.map("#H(/:id_one)(/:id_two)").to(function(){
+				var id_one = this.params["id_one"] || "N/A";
+				var id_two = this.params["id_two"] || "N/A";
+				update("H(one=" + id_one + ", two=" + id_two + ")");
 			});
 
-                        Path.map("#H(/:id_one)(/:id_two)").to(function(){
-	                    var id_one = this.params["id_one"] || "N/A";
-	                    var id_two = this.params["id_two"] || "N/A";
-                            update("H(one=" + id_one + ", two=" + id_two + ")");
-                        });
+			Path.map("#I").to(function() {
+				var output = [];
+				if(this.params.hasOwnProperty("debug")) {
+					output.push("debug=" + this.params["debug"]);
+				}
+				if(this.params.hasOwnProperty("id")) {
+					output.push("id=" + this.params["id"]);
+				}
+				update("I(" + output.join(", ") + ")");
+			});
 			
 			Path.rescue(function(){
-			    update("RESCUE");
+				update("RESCUE");
 			});
 			
 			Path.root("#F");
 			Path.listen();
-		    timer = setInterval(run_route, 500);
-	    }
+			timer = setInterval(run_route, 200);
+		}
 		</script>
 		
 		<style type="text/css">
-		    body {font-family: arial;}
-		    p {width: 600px; text-align: justify;}
-		    table {font-family: courier;}
+			body {font-family: arial;}
+			p {width: 600px; text-align: justify;}
+			table {font-family: courier;}
 		</style>
 	</head>
 	<body onload="define_routes();">
-	    <div id="description">
-		    <h2>Test Suite</h2>
+		<div id="description">
+			<h2>Test Suite</h2>
 			<p>
-			    Path.js uses a very straightforward method of testing.  We manually construct
+				Path.js uses a very straightforward method of testing.  We manually construct
 				a series of method calls that the library should execute under normal working
 				conditions.  We then use JavaScript to simulate the URL changes, and compare
 				the final result with what the result should actually be.  If the end result
@@ -149,39 +164,43 @@ <h2>Test Suite</h2>
 				is not suitable for use. The expected test results are as follows:
 			</p>
 			<table>
-			    <tr><td><b>Token</b></td>          <td><b>Reason</b></td></tr>
-				<tr><td>F[enter]</td>              <td>Enter method of F, as it is root</td></tr>
-				<tr><td>F[action]</td>             <td>True action of F, as it is root</td></tr>
-				<tr><td>A[enter]</td>              <td>Enter method of A, as it is looped</td></tr>
-				<tr><td>A[action]</td>             <td>True action of A, as it is looped</td></tr>
-				<tr><td>A[exit]</td>               <td>Exit method of A, as we move to next route</td></tr>
-				<tr><td>B[enter]</td>              <td>Enter method of B, as it is looped</td></tr>
-				<tr><td>B[action]</td>             <td>True action of B, as it is looped</td></tr>
-				<tr><td>C[action]</td>             <td>True action of C</td></tr>
-				<tr><td>C[exit]</td>               <td>Exit method of C, as we move to next route</td></tr>
-				<tr><td>RESCUE</td>                <td>Rescue a route that wasn't found (D1)</td></tr>
-				<tr><td>RESCUE</td>                <td>Rescue a route that wasn't found (D2)</td></tr>
-				<tr><td>E[enter](parse)</td>       <td>Enter method of a param parsed route</td></tr>
-				<tr><td>E[action](parse id=1)</td> <td>True action of the route, with param of id=1</td></tr>
-				<tr><td>E[enter](parse)</td>       <td>Enter method of the same route again</td></tr>
-				<tr><td>E[action](parse id=2)</td> <td>True action of the route, with param of id=2</td></tr>
-				<tr><td>E[action](check id=3)</td> <td>True action of the next route, with param id=3</td></tr>
-				<tr><td>E[exit](check)</td>        <td>Exit method of parameterized route</td></tr>
-				<tr><td>F[enter]</td>              <td>Enter method of F again, our final route</td></tr>
-				<tr><td>F[action]</td>             <td>True action of F, our final route</td></tr>
-				<tr><td>G[enter 1]</td>            <td>First enter method of G</td></tr>
-				<tr><td>G[enter 2]</td>            <td>Second enter method of G</td></tr>
-				<tr><td>G[enter 3]</td>            <td>Third enter method of G</td></tr>
-				<tr><td>G[enter 4]</td>            <td>Last enter method of G - Returns false, stops execution</td></tr>
-				<tr><td>H(one=N/A, two=N/A)</td>   <td>Optional parameters with only the require part submitted</td></tr>
-				<tr><td>H(one=10, two=N/A)</td>    <td>Optional parameters with one optional part submitted</td></tr>
-				<tr><td>H(one=10, two=20)</td>     <td>Optional parameters two levels deep</td></tr>
-                                <tr><td>H(one=10, two=N/A)</td>    <td>Testing "back" functionality</td></tr>
+				<tr><td><b>Token</b></td>          	<td><b>Reason</b></td></tr>
+				<tr><td>F[enter]</td>              	<td>Enter method of F, as it is root</td></tr>
+				<tr><td>F[action]</td>             	<td>True action of F, as it is root</td></tr>
+				<tr><td>A[enter]</td>              	<td>Enter method of A, as it is looped</td></tr>
+				<tr><td>A[action]</td>             	<td>True action of A, as it is looped</td></tr>
+				<tr><td>A[exit]</td>               	<td>Exit method of A, as we move to next route</td></tr>
+				<tr><td>B[enter]</td>              	<td>Enter method of B, as it is looped</td></tr>
+				<tr><td>B[action]</td>             	<td>True action of B, as it is looped</td></tr>
+				<tr><td>C[action]</td>             	<td>True action of C</td></tr>
+				<tr><td>C[exit]</td>               	<td>Exit method of C, as we move to next route</td></tr>
+				<tr><td>RESCUE</td>                	<td>Rescue a route that wasn't found (D1)</td></tr>
+				<tr><td>RESCUE</td>                	<td>Rescue a route that wasn't found (D2)</td></tr>
+				<tr><td>E[enter](parse id=1)</td>  	<td>Enter method of a param parsed route</td></tr>
+				<tr><td>E[action](parse id=1)</td> 	<td>True action of the route, with param of id=1</td></tr>
+				<tr><td>E[enter](parse id=2)</td>  	<td>Enter method of the same route again</td></tr>
+				<tr><td>E[action](parse id=2)</td> 	<td>True action of the route, with param of id=2</td></tr>
+				<tr><td>E[action](check id=3)</td> 	<td>True action of the next route, with param id=3</td></tr>
+				<tr><td>E[exit](check id=3)</td>   	<td>Exit method of parameterized route</td></tr>
+				<tr><td>F[enter]</td>              	<td>Enter method of F again, our final route</td></tr>
+				<tr><td>F[action]</td>             	<td>True action of F, our final route</td></tr>
+				<tr><td>G[enter 1]</td>            	<td>First enter method of G</td></tr>
+				<tr><td>G[enter 2]</td>            	<td>Second enter method of G</td></tr>
+				<tr><td>G[enter 3]</td>            	<td>Third enter method of G</td></tr>
+				<tr><td>G[enter 4]</td>            	<td>Last enter method of G - Returns false, stops execution</td></tr>
+				<tr><td>H(one=N/A, two=N/A)</td>   	<td>Optional parameters with only the require part submitted</td></tr>
+				<tr><td>H(one=10, two=N/A)</td>    	<td>Optional parameters with one optional part submitted</td></tr>
+				<tr><td>H(one=10, two=20)</td>     	<td>Optional parameters two levels deep</td></tr>
+				<tr><td>I(debug=true)</td>     		<td>Query string parameter present, but not set</td></tr>
+				<tr><td>I(debug=false)</td>     	<td>Query string parameter set</td></tr>
+				<tr><td>I(debug=true, id=10)</td>   <td>Multiple query string parameters, one present (but unset), one set</td></tr>
+				<tr><td>RESCUE</td>   				<td>Empty query string with ? should fail to match</td></tr>
+				<tr><td>H(one=10, two=N/A)</td>    	<td>Testing "back" functionality</td></tr>
 			</table>
 		</div><br /><br />
 		<div id="console">
-		    <h3>Expected</h3>
-		    <div id="expected">F[enter]::F[action]::A[enter]::A[action]::A[exit]::B[enter]::B[action]::C[action]::C[exit]::RESCUE::RESCUE::E[enter](parse)::E[action](parse id=1)::E[enter](parse)::E[action](parse id=2)::E[action](check id=3)::E[exit](check)::F[enter]::F[action]::G[enter 1]::G[enter 2]::G[enter 3]::G[enter 4]::H(one=N/A, two=N/A)::H(one=10, two=N/A)::H(one=10, two=20)::H(one=10, two=N/A)</div>
+			<h3>Expected</h3>
+			<div id="expected">F[enter]::F[action]::A[enter]::A[action]::A[exit]::B[enter]::B[action]::C[action]::C[exit]::RESCUE::RESCUE::E[enter](parse id=1)::E[action](parse id=1)::E[enter](parse id=2)::E[action](parse id=2)::E[action](check id=3)::E[exit](check id=3)::F[enter]::F[action]::G[enter 1]::G[enter 2]::G[enter 3]::G[enter 4]::H(one=N/A, two=N/A)::H(one=10, two=N/A)::H(one=10, two=20)::I(debug=true)::I(debug=false)::I(debug=true, id=10)::RESCUE::H(one=10, two=N/A)</div>
 			<h3>Actual</h3>
 			<div id="actual"></div>
 			<h3>Grade</h3>