diff --git a/.jshintrc b/.jshintrc
index 2822d9d..06d7269 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -18,7 +18,7 @@
   "indent": 2,
   "globals": {
     "document": true,
-    "window": true,
+    "global": true,
     "angular": true,
     "sinon": true,
     "module": true,
diff --git a/dist/angular-http-batch.js b/dist/angular-http-batch.js
index f721d9e..38c9851 100644
--- a/dist/angular-http-batch.js
+++ b/dist/angular-http-batch.js
@@ -1,13 +1,15 @@
 /*
- * angular-http-batcher - v1.12.0 - 2015-10-12
+ * angular-http-batcher - v1.12.0 - 2016-02-16
  * https://github.com/jonsamwell/angular-http-batcher
- * Copyright (c) 2015 Jon Samwell
+ * Copyright (c) 2016 Jon Samwell
  */
-(function (window, angular) {
+(function (angular) {
     'use strict';
 
-window.ahb = {
-  name: 'jcs.angular-http-batch'
+var global = {
+  ahb: {
+    name: 'jcs.angular-http-batch'
+  }
 };
 
 /**
@@ -17,7 +19,7 @@ window.ahb = {
  * @description
  * The main module which holds everything together.
  */
-angular.module(window.ahb.name, []);
+angular.module(global.ahb.name, []);
 
 function HttpBatchConfigFn() {
   var allowedBatchDomains = [],
@@ -173,7 +175,7 @@ function HttpBatchConfigFn() {
   ];
 }
 
-angular.module(window.ahb.name).provider('httpBatchConfig', HttpBatchConfigFn);
+angular.module(global.ahb.name).provider('httpBatchConfig', HttpBatchConfigFn);
 
 /**
  *
@@ -192,7 +194,7 @@ function HttpBatchResponseData(request, statusCode, statusText, data, headers) {
   this.headers = headers;
 }
 
-window.ahb.HttpBatchResponseData = HttpBatchResponseData;
+global.ahb.HttpBatchResponseData = HttpBatchResponseData;
 
 function HttpBatchAdapter($document, $window, httpBatchConfig) {
   var self = this,
@@ -260,7 +262,14 @@ function HttpBatchAdapter($document, $window, httpBatchConfig) {
       // angular would have already encoded the parameters *if* the dev passed them in via the params parameter to $http
       // so we only need to url encode the url not the query string part
       relativeUrlParts = urlInfo.relativeUrl.split('?');
-      encodedRelativeUrl = encodeURI(relativeUrlParts[0]) + (relativeUrlParts.length > 1 ? '?' + relativeUrlParts[1] : '');
+      // do a very basic check to see if query strings are encoded as dev might
+      // have just added them to the url and not passed them in via the params config param to $http
+      if (relativeUrlParts.length > 1 && (/%[A-F0-9]{2}/gi).test(relativeUrlParts[1]) === false) {
+        // chances are they are not encoded so encode them
+        encodedRelativeUrl = encodeURI(urlInfo.relativeUrl);
+      } else {
+        encodedRelativeUrl = encodeURI(relativeUrlParts[0]) + (relativeUrlParts.length > 1 ? '?' + relativeUrlParts[1] : '');
+      }
 
       batchBody.push(request.method + ' ' + encodedRelativeUrl + ' ' + constants.httpVersion);
       batchBody.push('Host: ' + urlInfo.host);
@@ -450,7 +459,7 @@ function HttpBatchAdapter($document, $window, httpBatchConfig) {
     }
 
     result.headers[constants.contentType] = result.contentType;
-    return new window.ahb.HttpBatchResponseData(request, result.statusCode, result.statusText, result.data, result.headers);
+    return new global.ahb.HttpBatchResponseData(request, result.statusCode, result.statusText, result.data, result.headers);
   }
 }
 
@@ -460,7 +469,7 @@ HttpBatchAdapter.$inject = [
   'httpBatchConfig'
 ];
 
-angular.module(window.ahb.name).service('httpBatchAdapter', HttpBatchAdapter);
+angular.module(global.ahb.name).service('httpBatchAdapter', HttpBatchAdapter);
 
 function NodeJsMultiFetchAdapter() {
   var self = this;
@@ -526,7 +535,7 @@ function NodeJsMultiFetchAdapter() {
       request = requests[i];
       dataPart = responseData[i.toString()];
 
-      batchResponses.push(new window.ahb.HttpBatchResponseData(
+      batchResponses.push(new global.ahb.HttpBatchResponseData(
         request,
         dataPart.statusCode,
         '',
@@ -547,7 +556,7 @@ function NodeJsMultiFetchAdapter() {
   }
 }
 
-angular.module(window.ahb.name).service('nodeJsMultiFetchAdapter', NodeJsMultiFetchAdapter);
+angular.module(global.ahb.name).service('nodeJsMultiFetchAdapter', NodeJsMultiFetchAdapter);
 
 function convertHeadersToString(headers) {
   var property,
@@ -693,7 +702,7 @@ HttpBatcherFn.$inject = [
   'nodeJsMultiFetchAdapter'
 ];
 
-angular.module(window.ahb.name).service('httpBatcher', HttpBatcherFn);
+angular.module(global.ahb.name).service('httpBatcher', HttpBatcherFn);
 
 function HttpBackendDecorator($delegate, httpBatcher) {
   var $httpBackendFn = function (method, url, post, callback, headers, timeout, withCredentials, responseType) {
@@ -744,6 +753,6 @@ ProviderDecoratorFn.$inject = [
   '$provide'
 ];
 
-angular.module(window.ahb.name).config(ProviderDecoratorFn);
+angular.module(global.ahb.name).config(ProviderDecoratorFn);
 
-}(window, angular));
+}(angular));
diff --git a/dist/angular-http-batch.min.js b/dist/angular-http-batch.min.js
index d6de283..2abdff6 100644
--- a/dist/angular-http-batch.min.js
+++ b/dist/angular-http-batch.min.js
@@ -1,5 +1,5 @@
 /*
- * angular-http-batcher - v1.12.0 - 2015-10-12
+ * angular-http-batcher - v1.12.0 - 2016-02-16
  * https://github.com/jonsamwell/angular-http-batcher
- * Copyright (c) 2015 Jon Samwell;*/
-!function(a,b){"use strict";function c(){var a=[],c="httpBatchAdapter",d={maxBatchedRequestPerCall:10,minimumBatchSize:2,batchRequestCollectionDelay:100,ignoredVerbs:["head"],sendCookies:!1,enabled:!0,adapter:c,uniqueRequestName:null};this.setAllowedBatchEndpoint=function(e,f,g){var h=b.copy(d);void 0!==g&&(b.forEach(g,function(a,b){h[b]=a}),b.forEach(h.ignoredVerbs,function(a,b){h.ignoredVerbs[b]=a.toLowerCase()})),h.serviceUrl=e,h.batchEndpointUrl=f,h.adapter=h.adapter||c,a.push(h)},this.getBatchConfig=function(b){var c,d;for(d=0;d<a.length&&(c=a[d],!(b.indexOf(c.serviceUrl)>-1));d+=1)c=void 0;return c},this.canBatchCall=function(a,b){var c=this.getBatchConfig(a),d=c?c.canBatchRequest:void 0,e=!1;return c&&c.enabled===!0&&(e=d?d(a,b):c.batchEndpointUrl!==a&&-1===a.indexOf(c.batchEndpointUrl)&&-1===c.ignoredVerbs.indexOf(b.toLowerCase())),e},this.calculateBoundary=function(){return(new Date).getTime().toString()},this.$get=[function(){return this}]}function d(a,b,c,d,e){this.request=a,this.statusCode=b,this.statusText=c,this.data=d,this.headers=e}function e(c,d,e){function f(a,b){var d,f,g,h,i,k,l=e.calculateBoundary(),m={method:"POST",url:b.batchEndpointUrl,cache:!1,headers:b.batchRequestHeaders||{}},n=[];for(m.headers[p.contentType]="multipart/mixed; boundary="+l,f=0;f<a.length;f+=1){if(g=a[f],d=j(g.url),n.push(p.doubleDash+l),b.batchPartRequestHeaders)for(h in b.batchPartRequestHeaders)if(b.batchPartRequestHeaders.hasOwnProperty(h)){var o=h+p.colon+p.singleSpace+b.batchPartRequestHeaders[h];"content-disposition"===h.toLowerCase()&&null!==b.uniqueRequestName&&void 0!==b.uniqueRequestName&&(o+=p.semiColon+p.singleSpace+p.requestName+b.uniqueRequestName+f),n.push(o)}n.push("Content-Type: application/http; msgtype=request",p.emptyString),i=d.relativeUrl.split("?"),k=encodeURI(i[0])+(i.length>1?"?"+i[1]:""),n.push(g.method+" "+k+" "+p.httpVersion),n.push("Host: "+d.host);for(h in g.headers)n.push(h+p.colon+p.singleSpace+g.headers[h]);b.sendCookies===!0&&c[0].cookie&&c[0].cookie.length>0&&n.push("Cookie: "+c[0].cookie),n.push(p.emptyString),g.data&&n.push(g.data),n.push(p.emptyString)}return n.push(p.doubleDash+l+p.doubleDash),m.data=n.join(p.newline),m}function g(a,b,c){var d,e,f=[],g=k(b.headers()["content-type"]),h=b.data.split(p.doubleDash+g+p.newline),i=0;for(d=0;d<h.length;d+=1)e=h[d],e!==p.emptyString&&(f.push(n(e,a[i],g)),i+=1);return f}function h(a,b){return!0}function i(a){return a=a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function j(a){var b,c,e,f,g;if(a.indexOf("./")>-1||a.indexOf("../")>-1){var h=document.createElement("a");h.href=a,a=h.href}return a.indexOf("://")>-1?(f=a.indexOf("://")+3,g=a.slice(f).split(p.forwardSlash),b=a.substring(0,f),c=g[0],e=function(){return delete g[0],g.join(p.forwardSlash)}()):(e=a,b=d.location.protocol,c=d.location.host),{protocol:b,host:c,relativeUrl:e}}function k(a){var b="boundary=",c=a.indexOf(b),d=a.indexOf(";",c),e=a.substring(c+b.length,d>0?d:a.length);return e=e.replace(/"/g,p.emptyString)}function l(a){return"string"==typeof a?a.replace(")]}',\n",""):a}function m(a,c){var d=c;return a=a.toLowerCase(),a.indexOf("json")>-1&&(c=l(c),d=b.fromJson(c)),d}function n(b,c,d){var e,f,g,h,j,k,l=b.split(p.newline),n={headers:{}},o=!1;for(f=0;f<l.length;f+=1)if(e=l[f],e!==p.emptyString){if(void 0===n.contentType&&-1!==e.indexOf("-Type")&&-1===e.indexOf("; msgtype=response"))n.contentType=e.split(p.forwardSlash)[1];else if(void 0!==n.contentType&&o===!1)k=e.split(p.colon),n.headers[k[0]]=i(k[1]);else if(void 0===n.statusCode&&-1!==e.indexOf(p.httpVersion))j=e.split(p.singleSpace),n.statusCode=parseInt(j[1],10),n.statusText=j.slice(2).join(p.singleSpace);else if(void 0===n.data&&o){for(n.data="",g=1,h=new RegExp("--"+d+"--","i");h.test(e)===!1&&f+g<=l.length;)n.data+=e,e=l[f+g],g+=1;n.data=m(n.contentType,n.data);break}}else o=void 0!==n.contentType;return n.headers[p.contentType]=n.contentType,new a.ahb.HttpBatchResponseData(c,n.statusCode,n.statusText,n.data,n.headers)}var o=this,p={httpVersion:"HTTP/1.1",contentType:"Content-Type",newline:"\r\n",emptyString:"",singleSpace:" ",forwardSlash:"/",doubleDash:"--",colon:":",semiColon:";",requestName:"name="};o.key="httpBatchAdapter",o.buildRequest=f,o.parseResponse=g,o.canBatchRequest=h}function f(){function b(a,b){var c,d,e,f,g={method:"GET",url:b.batchEndpointUrl+"?",cache:!1,headers:b.batchRequestHeaders||{}};for(d=0;d<a.length;d+=1)e=a[d],f=e.url.split("?"),c=f[0].replace(b.serviceUrl,""),f.length>1&&(c+="?"+encodeURIComponent(f[1])),d>0&&(g.url+="&"),g.url+=d.toString()+"="+c;return g}function c(b,c){var d,e,f,g=[],h=c.data;for(d=0;d<b.length;d+=1)e=b[d],f=h[d.toString()],g.push(new a.ahb.HttpBatchResponseData(e,f.statusCode,"",f.body,f.headers));return g}function d(a){return"GET"===a.method}var e=this;e.key="nodeJsMultiFetchAdapter",e.buildRequest=b,e.parseResponse=c,e.canBatchRequest=d}function g(a){var b,c="";for(b in a)c+=b+": "+a[b]+"\n";return c}function h(){var a=this.config.adapter;if("object"==typeof a){if(void 0===a.buildRequest||void 0===a.parseResponse)throw new Error('A custom adapter must contain the methods "buildRequest" and "parseResponse" - please see the docs')}else if("string"==typeof a&&(a=this.adapters[a],void 0===a))throw new Error("Unknown type of http batch adapter: "+this.config.adapter);return a}function i(a){return this.requests.push(a),this.requests.length>=this.config.maxBatchedRequestPerCall&&this.flush(),!0}function j(){var a=this,c=a.getAdapter(),d=c.buildRequest(a.requests,a.config);a.sendCallback(),a.$injector.get("$http")(d).then(function(d){var e=c.parseResponse(a.requests,d,a.config);b.forEach(e,function(a){a.request.callback(a.statusCode,a.data,g(a.headers),a.statusText)})},function(c){b.forEach(a.requests,function(a){a.callback(c.statusCode,c.data,c.headers,c.statusText)})})}function k(){this.$timeout.cancel(this.currentTimeoutToken),this.currentTimeoutToken=void 0,this.send()}function l(a,c,d,e,f){var g=this;this.$injector=a,this.$timeout=c,this.adapters=d,this.config=e,this.sendCallback=f,this.requests=[],this.currentTimeoutToken=c(function(){g.currentTimeoutToken=void 0,g.requests.length<g.config.minimumBatchSize?(g.sendCallback(),b.forEach(g.requests,function(a){a.continueDownNormalPipeline()})):g.send(a)},e.batchRequestCollectionDelay,!1)}function m(a,c,d,e,f){function g(a,b){return d.canBatchCall(a,b)}function h(b){var e=d.getBatchConfig(b.url),f=k[e.batchEndpointUrl];void 0===f&&(f=new l(a,c,m,e,function(){delete k[e.batchEndpointUrl]}),k[e.batchEndpointUrl]=f),f.addRequest(b)}function i(a){b.forEach(k,function(b,c){var d=void 0===a||a&&c.toLocaleLowerCase()===a.toLocaleLowerCase();d&&b.flush()})}var j=this,k={},m={httpBatchAdapter:e,nodeJsMultiFetchAdapter:f};j.canBatchRequest=g,j.batchRequest=h,j.flush=i}function n(a,c){var d=function(b,d,e,f,g,h,i,j){var k=this,l=arguments;return c.canBatchRequest(d,b)?void c.batchRequest({method:b,url:d,data:e,callback:f,headers:g,timeout:h,withCredentials:i,responseType:j,continueDownNormalPipeline:function(){a.apply(k,l)}}):a.apply(this,arguments)};return b.mock&&b.forEach(a,function(a,b){d[b]=a}),d}function o(a){a.decorator("$httpBackend",n)}a.ahb={name:"jcs.angular-http-batch"},b.module(a.ahb.name,[]),b.module(a.ahb.name).provider("httpBatchConfig",c),a.ahb.HttpBatchResponseData=d,e.$inject=["$document","$window","httpBatchConfig"],b.module(a.ahb.name).service("httpBatchAdapter",e),b.module(a.ahb.name).service("nodeJsMultiFetchAdapter",f),l.prototype.getAdapter=h,l.prototype.send=j,l.prototype.addRequest=i,l.prototype.flush=k,m.$inject=["$injector","$timeout","httpBatchConfig","httpBatchAdapter","nodeJsMultiFetchAdapter"],b.module(a.ahb.name).service("httpBatcher",m),n.$inject=["$delegate","httpBatcher"],o.$inject=["$provide"],b.module(a.ahb.name).config(o)}(window,angular);
\ No newline at end of file
+ * Copyright (c) 2016 Jon Samwell;*/
+!function(a){"use strict";function b(){var b=[],c="httpBatchAdapter",d={maxBatchedRequestPerCall:10,minimumBatchSize:2,batchRequestCollectionDelay:100,ignoredVerbs:["head"],sendCookies:!1,enabled:!0,adapter:c,uniqueRequestName:null};this.setAllowedBatchEndpoint=function(e,f,g){var h=a.copy(d);void 0!==g&&(a.forEach(g,function(a,b){h[b]=a}),a.forEach(h.ignoredVerbs,function(a,b){h.ignoredVerbs[b]=a.toLowerCase()})),h.serviceUrl=e,h.batchEndpointUrl=f,h.adapter=h.adapter||c,b.push(h)},this.getBatchConfig=function(a){var c,d;for(d=0;d<b.length&&(c=b[d],!(a.indexOf(c.serviceUrl)>-1));d+=1)c=void 0;return c},this.canBatchCall=function(a,b){var c=this.getBatchConfig(a),d=c?c.canBatchRequest:void 0,e=!1;return c&&c.enabled===!0&&(e=d?d(a,b):c.batchEndpointUrl!==a&&-1===a.indexOf(c.batchEndpointUrl)&&-1===c.ignoredVerbs.indexOf(b.toLowerCase())),e},this.calculateBoundary=function(){return(new Date).getTime().toString()},this.$get=[function(){return this}]}function c(a,b,c,d,e){this.request=a,this.statusCode=b,this.statusText=c,this.data=d,this.headers=e}function d(b,c,d){function e(a,c){var e,f,g,h,j,k,l=d.calculateBoundary(),m={method:"POST",url:c.batchEndpointUrl,cache:!1,headers:c.batchRequestHeaders||{}},n=[];for(m.headers[p.contentType]="multipart/mixed; boundary="+l,f=0;f<a.length;f+=1){if(g=a[f],e=i(g.url),n.push(p.doubleDash+l),c.batchPartRequestHeaders)for(h in c.batchPartRequestHeaders)if(c.batchPartRequestHeaders.hasOwnProperty(h)){var o=h+p.colon+p.singleSpace+c.batchPartRequestHeaders[h];"content-disposition"===h.toLowerCase()&&null!==c.uniqueRequestName&&void 0!==c.uniqueRequestName&&(o+=p.semiColon+p.singleSpace+p.requestName+c.uniqueRequestName+f),n.push(o)}n.push("Content-Type: application/http; msgtype=request",p.emptyString),j=e.relativeUrl.split("?"),k=j.length>1&&/%[A-F0-9]{2}/gi.test(j[1])===!1?encodeURI(e.relativeUrl):encodeURI(j[0])+(j.length>1?"?"+j[1]:""),n.push(g.method+" "+k+" "+p.httpVersion),n.push("Host: "+e.host);for(h in g.headers)n.push(h+p.colon+p.singleSpace+g.headers[h]);c.sendCookies===!0&&b[0].cookie&&b[0].cookie.length>0&&n.push("Cookie: "+b[0].cookie),n.push(p.emptyString),g.data&&n.push(g.data),n.push(p.emptyString)}return n.push(p.doubleDash+l+p.doubleDash),m.data=n.join(p.newline),m}function f(a,b,c){var d,e,f=[],g=j(b.headers()["content-type"]),h=b.data.split(p.doubleDash+g+p.newline),i=0;for(d=0;d<h.length;d+=1)e=h[d],e!==p.emptyString&&(f.push(m(e,a[i],g)),i+=1);return f}function g(a,b){return!0}function h(a){return a=a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function i(a){var b,d,e,f,g;if(a.indexOf("./")>-1||a.indexOf("../")>-1){var h=document.createElement("a");h.href=a,a=h.href}return a.indexOf("://")>-1?(f=a.indexOf("://")+3,g=a.slice(f).split(p.forwardSlash),b=a.substring(0,f),d=g[0],e=function(){return delete g[0],g.join(p.forwardSlash)}()):(e=a,b=c.location.protocol,d=c.location.host),{protocol:b,host:d,relativeUrl:e}}function j(a){var b="boundary=",c=a.indexOf(b),d=a.indexOf(";",c),e=a.substring(c+b.length,d>0?d:a.length);return e=e.replace(/"/g,p.emptyString)}function k(a){return"string"==typeof a?a.replace(")]}',\n",""):a}function l(b,c){var d=c;return b=b.toLowerCase(),b.indexOf("json")>-1&&(c=k(c),d=a.fromJson(c)),d}function m(a,b,c){var d,e,f,g,i,j,k=a.split(p.newline),m={headers:{}},n=!1;for(e=0;e<k.length;e+=1)if(d=k[e],d!==p.emptyString){if(void 0===m.contentType&&-1!==d.indexOf("-Type")&&-1===d.indexOf("; msgtype=response"))m.contentType=d.split(p.forwardSlash)[1];else if(void 0!==m.contentType&&n===!1)j=d.split(p.colon),m.headers[j[0]]=h(j[1]);else if(void 0===m.statusCode&&-1!==d.indexOf(p.httpVersion))i=d.split(p.singleSpace),m.statusCode=parseInt(i[1],10),m.statusText=i.slice(2).join(p.singleSpace);else if(void 0===m.data&&n){for(m.data="",f=1,g=new RegExp("--"+c+"--","i");g.test(d)===!1&&e+f<=k.length;)m.data+=d,d=k[e+f],f+=1;m.data=l(m.contentType,m.data);break}}else n=void 0!==m.contentType;return m.headers[p.contentType]=m.contentType,new o.ahb.HttpBatchResponseData(b,m.statusCode,m.statusText,m.data,m.headers)}var n=this,p={httpVersion:"HTTP/1.1",contentType:"Content-Type",newline:"\r\n",emptyString:"",singleSpace:" ",forwardSlash:"/",doubleDash:"--",colon:":",semiColon:";",requestName:"name="};n.key="httpBatchAdapter",n.buildRequest=e,n.parseResponse=f,n.canBatchRequest=g}function e(){function a(a,b){var c,d,e,f,g={method:"GET",url:b.batchEndpointUrl+"?",cache:!1,headers:b.batchRequestHeaders||{}};for(d=0;d<a.length;d+=1)e=a[d],f=e.url.split("?"),c=f[0].replace(b.serviceUrl,""),f.length>1&&(c+="?"+encodeURIComponent(f[1])),d>0&&(g.url+="&"),g.url+=d.toString()+"="+c;return g}function b(a,b){var c,d,e,f=[],g=b.data;for(c=0;c<a.length;c+=1)d=a[c],e=g[c.toString()],f.push(new o.ahb.HttpBatchResponseData(d,e.statusCode,"",e.body,e.headers));return f}function c(a){return"GET"===a.method}var d=this;d.key="nodeJsMultiFetchAdapter",d.buildRequest=a,d.parseResponse=b,d.canBatchRequest=c}function f(a){var b,c="";for(b in a)c+=b+": "+a[b]+"\n";return c}function g(){var a=this.config.adapter;if("object"==typeof a){if(void 0===a.buildRequest||void 0===a.parseResponse)throw new Error('A custom adapter must contain the methods "buildRequest" and "parseResponse" - please see the docs')}else if("string"==typeof a&&(a=this.adapters[a],void 0===a))throw new Error("Unknown type of http batch adapter: "+this.config.adapter);return a}function h(a){return this.requests.push(a),this.requests.length>=this.config.maxBatchedRequestPerCall&&this.flush(),!0}function i(){var b=this,c=b.getAdapter(),d=c.buildRequest(b.requests,b.config);b.sendCallback(),b.$injector.get("$http")(d).then(function(d){var e=c.parseResponse(b.requests,d,b.config);a.forEach(e,function(a){a.request.callback(a.statusCode,a.data,f(a.headers),a.statusText)})},function(c){a.forEach(b.requests,function(a){a.callback(c.statusCode,c.data,c.headers,c.statusText)})})}function j(){this.$timeout.cancel(this.currentTimeoutToken),this.currentTimeoutToken=void 0,this.send()}function k(b,c,d,e,f){var g=this;this.$injector=b,this.$timeout=c,this.adapters=d,this.config=e,this.sendCallback=f,this.requests=[],this.currentTimeoutToken=c(function(){g.currentTimeoutToken=void 0,g.requests.length<g.config.minimumBatchSize?(g.sendCallback(),a.forEach(g.requests,function(a){a.continueDownNormalPipeline()})):g.send(b)},e.batchRequestCollectionDelay,!1)}function l(b,c,d,e,f){function g(a,b){return d.canBatchCall(a,b)}function h(a){var e=d.getBatchConfig(a.url),f=l[e.batchEndpointUrl];void 0===f&&(f=new k(b,c,m,e,function(){delete l[e.batchEndpointUrl]}),l[e.batchEndpointUrl]=f),f.addRequest(a)}function i(b){a.forEach(l,function(a,c){var d=void 0===b||b&&c.toLocaleLowerCase()===b.toLocaleLowerCase();d&&a.flush()})}var j=this,l={},m={httpBatchAdapter:e,nodeJsMultiFetchAdapter:f};j.canBatchRequest=g,j.batchRequest=h,j.flush=i}function m(b,c){var d=function(a,d,e,f,g,h,i,j){var k=this,l=arguments;return c.canBatchRequest(d,a)?void c.batchRequest({method:a,url:d,data:e,callback:f,headers:g,timeout:h,withCredentials:i,responseType:j,continueDownNormalPipeline:function(){b.apply(k,l)}}):b.apply(this,arguments)};return a.mock&&a.forEach(b,function(a,b){d[b]=a}),d}function n(a){a.decorator("$httpBackend",m)}var o={ahb:{name:"jcs.angular-http-batch"}};a.module(o.ahb.name,[]),a.module(o.ahb.name).provider("httpBatchConfig",b),o.ahb.HttpBatchResponseData=c,d.$inject=["$document","$window","httpBatchConfig"],a.module(o.ahb.name).service("httpBatchAdapter",d),a.module(o.ahb.name).service("nodeJsMultiFetchAdapter",e),k.prototype.getAdapter=g,k.prototype.send=i,k.prototype.addRequest=h,k.prototype.flush=j,l.$inject=["$injector","$timeout","httpBatchConfig","httpBatchAdapter","nodeJsMultiFetchAdapter"],a.module(o.ahb.name).service("httpBatcher",l),m.$inject=["$delegate","httpBatcher"],n.$inject=["$provide"],a.module(o.ahb.name).config(n)}(angular);
\ No newline at end of file
diff --git a/example/index.html b/example/index.html
index b8ab45a..707c0b3 100644
--- a/example/index.html
+++ b/example/index.html
@@ -22,7 +22,7 @@
 <!--<script src="../src/config/httpBackendDecorator.js"></script>-->
 
 <script type="text/javascript">
-    var app = angular.module('httpBatchExample', [window.ahb.name]);
+    var app = angular.module('httpBatchExample', ['jcs.angular-http-batch']);
 
     app.config([
             'httpBatchConfigProvider',
diff --git a/package.json b/package.json
index b89c20f..8e65c22 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "karma-coverage": "^0.2.4",
     "karma-ie-launcher": "^0.1.5",
     "karma-mocha": "^0.1.3",
-    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-phantomjs-launcher": "^1.0.0",
     "karma-sinon": "^1.0.3",
     "mocha": "^1.20.1",
     "sinon": "^1.10.2"
diff --git a/src/angular-http-batch.js b/src/angular-http-batch.js
index 0f5bf85..cb28bf2 100644
--- a/src/angular-http-batch.js
+++ b/src/angular-http-batch.js
@@ -1,5 +1,7 @@
-window.ahb = {
-  name: 'jcs.angular-http-batch'
+var global = {
+  ahb: {
+    name: 'jcs.angular-http-batch'
+  }
 };
 
 /**
@@ -9,4 +11,4 @@ window.ahb = {
  * @description
  * The main module which holds everything together.
  */
-angular.module(window.ahb.name, []);
+angular.module(global.ahb.name, []);
diff --git a/src/angular-http-batch.postfix.js b/src/angular-http-batch.postfix.js
index 2d8687a..6b0e308 100644
--- a/src/angular-http-batch.postfix.js
+++ b/src/angular-http-batch.postfix.js
@@ -1 +1 @@
-}(window, angular));
+}(angular));
diff --git a/src/angular-http-batch.prefix.js b/src/angular-http-batch.prefix.js
index e328d8d..454f4cd 100644
--- a/src/angular-http-batch.prefix.js
+++ b/src/angular-http-batch.prefix.js
@@ -1,2 +1,2 @@
-(function (window, angular) {
+(function (angular) {
     'use strict';
diff --git a/src/config/httpBackendDecorator.js b/src/config/httpBackendDecorator.js
index 69adb7d..70b3fac 100644
--- a/src/config/httpBackendDecorator.js
+++ b/src/config/httpBackendDecorator.js
@@ -47,4 +47,4 @@ ProviderDecoratorFn.$inject = [
   '$provide'
 ];
 
-angular.module(window.ahb.name).config(ProviderDecoratorFn);
+angular.module(global.ahb.name).config(ProviderDecoratorFn);
diff --git a/src/providers/httpBatchConfig.js b/src/providers/httpBatchConfig.js
index 11a984a..6ef398f 100644
--- a/src/providers/httpBatchConfig.js
+++ b/src/providers/httpBatchConfig.js
@@ -152,4 +152,4 @@ function HttpBatchConfigFn() {
   ];
 }
 
-angular.module(window.ahb.name).provider('httpBatchConfig', HttpBatchConfigFn);
+angular.module(global.ahb.name).provider('httpBatchConfig', HttpBatchConfigFn);
diff --git a/src/services/adapters/httpAdapter.js b/src/services/adapters/httpAdapter.js
index 425ddc0..9661576 100644
--- a/src/services/adapters/httpAdapter.js
+++ b/src/services/adapters/httpAdapter.js
@@ -261,7 +261,7 @@ function HttpBatchAdapter($document, $window, httpBatchConfig) {
     }
 
     result.headers[constants.contentType] = result.contentType;
-    return new window.ahb.HttpBatchResponseData(request, result.statusCode, result.statusText, result.data, result.headers);
+    return new global.ahb.HttpBatchResponseData(request, result.statusCode, result.statusText, result.data, result.headers);
   }
 }
 
@@ -271,4 +271,4 @@ HttpBatchAdapter.$inject = [
   'httpBatchConfig'
 ];
 
-angular.module(window.ahb.name).service('httpBatchAdapter', HttpBatchAdapter);
+angular.module(global.ahb.name).service('httpBatchAdapter', HttpBatchAdapter);
diff --git a/src/services/adapters/httpBatchResponseData.js b/src/services/adapters/httpBatchResponseData.js
index 1cf1e68..cc56892 100644
--- a/src/services/adapters/httpBatchResponseData.js
+++ b/src/services/adapters/httpBatchResponseData.js
@@ -15,4 +15,4 @@ function HttpBatchResponseData(request, statusCode, statusText, data, headers) {
   this.headers = headers;
 }
 
-window.ahb.HttpBatchResponseData = HttpBatchResponseData;
+global.ahb.HttpBatchResponseData = HttpBatchResponseData;
diff --git a/src/services/adapters/nodeJsMultiFetchAdapter.js b/src/services/adapters/nodeJsMultiFetchAdapter.js
index d63eb55..632c654 100644
--- a/src/services/adapters/nodeJsMultiFetchAdapter.js
+++ b/src/services/adapters/nodeJsMultiFetchAdapter.js
@@ -62,7 +62,7 @@ function NodeJsMultiFetchAdapter() {
       request = requests[i];
       dataPart = responseData[i.toString()];
 
-      batchResponses.push(new window.ahb.HttpBatchResponseData(
+      batchResponses.push(new global.ahb.HttpBatchResponseData(
         request,
         dataPart.statusCode,
         '',
@@ -83,4 +83,4 @@ function NodeJsMultiFetchAdapter() {
   }
 }
 
-angular.module(window.ahb.name).service('nodeJsMultiFetchAdapter', NodeJsMultiFetchAdapter);
+angular.module(global.ahb.name).service('nodeJsMultiFetchAdapter', NodeJsMultiFetchAdapter);
diff --git a/src/services/httpBatcher.js b/src/services/httpBatcher.js
index eb0bc19..026e9c1 100644
--- a/src/services/httpBatcher.js
+++ b/src/services/httpBatcher.js
@@ -142,4 +142,4 @@ HttpBatcherFn.$inject = [
   'nodeJsMultiFetchAdapter'
 ];
 
-angular.module(window.ahb.name).service('httpBatcher', HttpBatcherFn);
+angular.module(global.ahb.name).service('httpBatcher', HttpBatcherFn);
diff --git a/tests/config/httpBackendDecorator.spec.js b/tests/config/httpBackendDecorator.spec.js
index afc5b62..62831c6 100644
--- a/tests/config/httpBackendDecorator.spec.js
+++ b/tests/config/httpBackendDecorator.spec.js
@@ -4,7 +4,7 @@
   describe('httpBackend decorator', function () {
     var sandbox, $httpBackend, httpBatcher;
 
-    beforeEach(module(window.ahb.name));
+    beforeEach(module(global.ahb.name));
 
     describe('ngModelDirective', function () {
       beforeEach(inject(function ($injector) {
diff --git a/tests/index-resource.html b/tests/index-resource.html
index c37f9a6..bdc0e92 100644
--- a/tests/index-resource.html
+++ b/tests/index-resource.html
@@ -25,7 +25,7 @@
 <script src="../src/config/httpBackendDecorator.js"></script>
 
 <script type="text/javascript">
-    var app = angular.module('httpBatchExample', ['ngResource', window.ahb.name]);
+    var app = angular.module('httpBatchExample', ['ngResource', global.ahb.name]);
 
     app.config(['$httpProvider', function($httpProvider) {
         $httpProvider.defaults.withCredentials = true;
diff --git a/tests/index.html b/tests/index.html
index 8eb1236..32601b2 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -25,7 +25,7 @@
 <!--<script src="../src/config/httpBackendDecorator.js"></script>-->
 
 <script type="text/javascript">
-    var app = angular.module('httpBatchExample', [window.ahb.name]);
+    var app = angular.module('httpBatchExample', [global.ahb.name]);
 
     app.config(['$httpProvider', function($httpProvider) {
         $httpProvider.defaults.withCredentials = true;
diff --git a/tests/node-multi-fetch.html b/tests/node-multi-fetch.html
index c47ad3b..d6e0b63 100644
--- a/tests/node-multi-fetch.html
+++ b/tests/node-multi-fetch.html
@@ -25,7 +25,7 @@
 <script src="../src/config/httpBackendDecorator.js"></script>
 
 <script type="text/javascript">
-    var app = angular.module('httpBatchExample', [window.ahb.name]);
+    var app = angular.module('httpBatchExample', [global.ahb.name]);
 
     app.config([
             'httpBatchConfigProvider',
diff --git a/tests/providers/httpBatchConfig.spec.js b/tests/providers/httpBatchConfig.spec.js
index d306e08..8ca4c92 100644
--- a/tests/providers/httpBatchConfig.spec.js
+++ b/tests/providers/httpBatchConfig.spec.js
@@ -3,7 +3,7 @@
   describe('httpBatchConfig', function () {
     var sandbox, httpBatchConfig;
 
-    beforeEach(module(window.ahb.name));
+    beforeEach(module(global.ahb.name));
 
     describe('httpBatchConfig', function () {
       beforeEach(inject(function ($injector) {
diff --git a/tests/services/adapters/httpAdapter.spec.js b/tests/services/adapters/httpAdapter.spec.js
index 91f873d..0697c57 100644
--- a/tests/services/adapters/httpAdapter.spec.js
+++ b/tests/services/adapters/httpAdapter.spec.js
@@ -5,7 +5,7 @@
     var sandbox, httpBatchConfig, httpAdapter,
       boundaryText = 'boundary123';
 
-    beforeEach(module(window.ahb.name));
+    beforeEach(module(global.ahb.name));
 
     describe('httpAdapter', function () {
       beforeEach(inject(function ($injector) {
@@ -198,7 +198,7 @@
           expect(result.headers['Content-Type']).to.equal('multipart/mixed; boundary=boundary123');
           expect(result.headers['Content-disposition']).to.equal('form-data');
           expect(result.data).to.equal('--boundary123\r\nContent-disposition: form-data; name=veryUniqueRequestName0\r\nContent-Type: application/http; msgtype=request\r\n\r\n' +
-            'GET api/some%20method?params=123&some%20filter=abc%3D1 HTTP/1.1\r\nHost: localhost:9876\r\n\r\n\r\n--boundary123--');
+            'GET api/some%20method?params=123&some%20filter=1 HTTP/1.1\r\nHost: localhost:9876\r\n\r\n\r\n--boundary123--');
         });
 
         it('should not double encode query string parameters but encode url', function () {
diff --git a/tests/services/adapters/nodeJsMultiFetchAdapter.spec.js b/tests/services/adapters/nodeJsMultiFetchAdapter.spec.js
index 65b65e8..b110b1f 100644
--- a/tests/services/adapters/nodeJsMultiFetchAdapter.spec.js
+++ b/tests/services/adapters/nodeJsMultiFetchAdapter.spec.js
@@ -4,7 +4,7 @@
   describe('nodeJsMultiFetchAdapter', function () {
     var sandbox, adapter;
 
-    beforeEach(module(window.ahb.name));
+    beforeEach(module(global.ahb.name));
 
     describe('nodeJsMultiFetchAdapter', function () {
       beforeEach(inject(function ($injector) {
diff --git a/tests/services/httpBatcher.spec.js b/tests/services/httpBatcher.spec.js
index 08f7ee2..8f1a326 100644
--- a/tests/services/httpBatcher.spec.js
+++ b/tests/services/httpBatcher.spec.js
@@ -38,7 +38,7 @@
     beforeEach(module(function ($provide) {
       $provide.value('$window', $window);
     }));
-    beforeEach(module(window.ahb.name));
+    beforeEach(module(global.ahb.name));
 
     describe('httpBatcher', function () {
       beforeEach(inject(function ($injector) {