diff --git a/dist/url.js b/dist/url.js
index 4fe2cf9..e9922ff 100644
--- a/dist/url.js
+++ b/dist/url.js
@@ -7,10 +7,21 @@
 })(this, function(exports) {
     'use strict';
 
+    /**
+     * Thanks https://gist.github.com/bchapuis/5575512
+     *
+     * @param string
+     * @returns {string}
+     */
+    function decodeUrlParameter(string) {
+        return decodeURIComponent(''.concat(string).replace(/\+/g, '%20'));
+    }
+
     /**
      * @param query
      * @returns {{}}
      */
+
     function _buildParams(query) {
         var params = {};
 
@@ -31,9 +42,9 @@
                         params[key] = [];
                     }
 
-                    params[key].push(decodeURIComponent(value));
+                    params[key].push(decodeUrlParameter(value));
                 } else {
-                    params[key] = decodeURIComponent(value);
+                    params[key] = decodeUrlParameter(value);
                 }
             });
         }
@@ -126,7 +137,7 @@
                 var array = raw.split('][');
                 array.unshift(match[1]);
 
-                var nesting = _buildNesting(array, value);
+                var nesting = _buildNesting(array, decodeUrlParameter(value));
 
                 params = _mergeObjectsDeep(params, nesting);
             }
diff --git a/dist/url.min.js b/dist/url.min.js
index b5c6a04..c2c63a4 100644
--- a/dist/url.min.js
+++ b/dist/url.min.js
@@ -1 +1 @@
-(function(a,b){"object"==typeof exports&&"undefined"!=typeof module?b(exports):"function"==typeof define&&define.amd?define(["exports"],b):(a=a||self,b(a.jcurl={}))})(this,function(a){'use strict';function b(a){var b={};return a&&a.split("&").forEach(function(a){var c=a.split("=",2),d=c[0],e=c[1]||"";"[]"===d.substr(-2)?(d=d.substr(0,d.length-2),(void 0===b[d]||!Array.isArray(b[d]))&&(b[d]=[]),b[d].push(decodeURIComponent(e))):b[d]=decodeURIComponent(e)}),b}function c(a,b){var d={};return d[a[a.length-1]]=b,1===a.length?d:c(a.slice(0,a.length-1),d)}function d(a,b){var c=function(a){return a&&a instanceof Object};return c(a)&&c(b)?(Object.keys(b).forEach(function(e){var f=a[e],g=b[e];a[e]=Array.isArray(f)&&Array.isArray(g)?f.concat(g):c(f)&&c(g)?d(Object.assign({},f),g):g}),a):b}function e(a){var b={};return a.split("&").forEach(function(a,e){var f=a.split("=",2),g=f[0],h=f[1]||"",i=g.match(/(.+?)(\[(.*)\])/i);if(i){var j=i[3]||e+"",k=j.split("][");k.unshift(i[1]);var l=c(k,h);b=d(b,l)}}),b}function f(a){var b=[],c=function(c){if(a.hasOwnProperty(c)){var d=a[c];Array.isArray(d)&&d.length?d.forEach(function(a){b.push("".concat(c,"[]=").concat(a))}):b.push("".concat(c,"=").concat(d))}};for(var d in a)c(d);return b.join("&")}function g(a,b,c){Object.keys(a).forEach(function(d){var e=b.concat([d]),f=a[d];f instanceof Object?g(f,e,c):(e.push(f),c.push(e))})}function h(a){var b=[];g(a,[],b);var c=b.map(function(a){return a.reduce(function(b,c,d){return b?d<a.length-1?"".concat(b,"[").concat(c,"]"):"".concat(b,"=").concat(c):b+c},"")});return c.join("&")}function i(a,b){var c=function(c){if(b.hasOwnProperty(c)){var d=b[c];Array.isArray(d)&&d.length?((a[c]===void 0||!Array.isArray(a[c]))&&(a[c]=[]),d.forEach(function(b){a[c].push(b)})):a[c]=b[c]}};for(var d in b)c(d);return a}function j(){var a=0<arguments.length&&arguments[0]!==void 0?arguments[0]:window.location.href,c=a.split("?",2);return b(2===c.length?c[1]:"")}function k(){var a=0<arguments.length&&arguments[0]!==void 0?arguments[0]:window.location.href,b=a.split("?",2);return e(2===b.length?b[1]:"")}function l(a,b){if(b instanceof Object){var c=a.split("?",2)[0],d=j(a),e=i(d,b);a="".concat(c,"?").concat(f(e))}return a}function m(a,b){if(b instanceof Object){var c=a.split("?",2)[0],e=j(a),f=d(e,b);a="".concat(c,"?").concat(h(f))}return a}a.add=l,a.addExt=m,a.addParams=l,a.addParamsExtended=m,a.get=j,a.getExt=k,a.getParams=j,a.getParamsExtended=k,Object.defineProperty(a,"__esModule",{value:!0})});
\ No newline at end of file
+(function(a,b){"object"==typeof exports&&"undefined"!=typeof module?b(exports):"function"==typeof define&&define.amd?define(["exports"],b):(a=a||self,b(a.jcurl={}))})(this,function(a){'use strict';function b(a){return decodeURIComponent("".concat(a).replace(/\+/g,"%20"))}function c(a){var c={};return a&&a.split("&").forEach(function(a){var d=a.split("=",2),e=d[0],f=d[1]||"";"[]"===e.substr(-2)?(e=e.substr(0,e.length-2),(void 0===c[e]||!Array.isArray(c[e]))&&(c[e]=[]),c[e].push(b(f))):c[e]=b(f)}),c}function d(a,b){var c={};return c[a[a.length-1]]=b,1===a.length?c:d(a.slice(0,a.length-1),c)}function e(a,b){var c=function(a){return a&&a instanceof Object};return c(a)&&c(b)?(Object.keys(b).forEach(function(d){var f=a[d],g=b[d];a[d]=Array.isArray(f)&&Array.isArray(g)?f.concat(g):c(f)&&c(g)?e(Object.assign({},f),g):g}),a):b}function f(a){var c={};return a.split("&").forEach(function(a,f){var g=a.split("=",2),h=g[0],i=g[1]||"",j=h.match(/(.+?)(\[(.*)\])/i);if(j){var k=j[3]||f+"",l=k.split("][");l.unshift(j[1]);var m=d(l,b(i));c=e(c,m)}}),c}function g(a){var b=[],c=function(c){if(a.hasOwnProperty(c)){var d=a[c];Array.isArray(d)&&d.length?d.forEach(function(a){b.push("".concat(c,"[]=").concat(a))}):b.push("".concat(c,"=").concat(d))}};for(var d in a)c(d);return b.join("&")}function h(a,b,c){Object.keys(a).forEach(function(d){var e=b.concat([d]),f=a[d];f instanceof Object?h(f,e,c):(e.push(f),c.push(e))})}function i(a){var b=[];h(a,[],b);var c=b.map(function(a){return a.reduce(function(b,c,d){return b?d<a.length-1?"".concat(b,"[").concat(c,"]"):"".concat(b,"=").concat(c):b+c},"")});return c.join("&")}function j(a,b){var c=function(c){if(b.hasOwnProperty(c)){var d=b[c];Array.isArray(d)&&d.length?((a[c]===void 0||!Array.isArray(a[c]))&&(a[c]=[]),d.forEach(function(b){a[c].push(b)})):a[c]=b[c]}};for(var d in b)c(d);return a}function k(){var a=0<arguments.length&&arguments[0]!==void 0?arguments[0]:window.location.href,b=a.split("?",2);return c(2===b.length?b[1]:"")}function l(){var a=0<arguments.length&&arguments[0]!==void 0?arguments[0]:window.location.href,b=a.split("?",2);return f(2===b.length?b[1]:"")}function m(a,b){if(b instanceof Object){var c=a.split("?",2)[0],d=k(a),e=j(d,b);a="".concat(c,"?").concat(g(e))}return a}function n(a,b){if(b instanceof Object){var c=a.split("?",2)[0],d=k(a),f=e(d,b);a="".concat(c,"?").concat(i(f))}return a}a.add=m,a.addExt=n,a.addParams=m,a.addParamsExtended=n,a.get=k,a.getExt=l,a.getParams=k,a.getParamsExtended=l,Object.defineProperty(a,"__esModule",{value:!0})});
\ No newline at end of file
diff --git a/src/_buildParams.js b/src/_buildParams.js
index 6059459..2b4dc4d 100644
--- a/src/_buildParams.js
+++ b/src/_buildParams.js
@@ -1,3 +1,5 @@
+import _decodeUrlParameter from './_decodeUrlParameter';
+
 /**
  * @param query
  * @returns {{}}
@@ -19,9 +21,9 @@ export default function _buildParams(query) {
                     params[key] = [];
                 }
 
-                params[key].push(decodeURIComponent(value));
+                params[key].push(_decodeUrlParameter(value));
             } else {
-                params[key] = decodeURIComponent(value);
+                params[key] = _decodeUrlParameter(value);
             }
         });
     }
diff --git a/src/_buildParamsExtended.js b/src/_buildParamsExtended.js
index a94b248..92248c0 100644
--- a/src/_buildParamsExtended.js
+++ b/src/_buildParamsExtended.js
@@ -1,5 +1,6 @@
 import _buildNesting from './_buildNesting';
 import _mergeObjectsDeep from './_mergeObjectsDeep';
+import _decodeUrlParameter from './_decodeUrlParameter';
 
 /**
  * @param query
@@ -22,7 +23,7 @@ export default function _buildParamsExtended(query) {
             const array = raw.split('][');
             array.unshift(match[1]);
 
-            const nesting = _buildNesting(array, value);
+            const nesting = _buildNesting(array, _decodeUrlParameter(value));
 
             params = _mergeObjectsDeep(params, nesting);
         }
diff --git a/src/_decodeUrlParameter.js b/src/_decodeUrlParameter.js
new file mode 100644
index 0000000..85225a9
--- /dev/null
+++ b/src/_decodeUrlParameter.js
@@ -0,0 +1,9 @@
+/**
+ * Thanks https://gist.github.com/bchapuis/5575512
+ *
+ * @param string
+ * @returns {string}
+ */
+export default function decodeUrlParameter(string) {
+    return decodeURIComponent(`${ string }`.replace(/\+/g, '%20'));
+}
diff --git a/src/url.test.js b/src/url.test.js
index bd3481f..f1d686e 100644
--- a/src/url.test.js
+++ b/src/url.test.js
@@ -7,9 +7,11 @@ describe('GET', () => {
         expect(getParams('example.com?bar=1&bar=2')).toEqual({ bar: '2' });
         expect(getParams('example.com?bar[]=1&bar[]=2')).toEqual({ bar: ['1', '2'] });
         expect(getParams('example.com?bar=1&bar[]=2')).toEqual({ bar: ['2'] });
+        expect(getParams('example.com?bar=test+test%2Ctest')).toEqual({ bar: 'test test,test' });
     });
 
     test('getParamsExtended()', () => {
+        expect(getParamsExtended('example.com?bar[t]=test+test%2Ctest')).toEqual({ bar: { t: 'test test,test' } });
         expect(getParamsExtended('example.com?bar[t]=1&bar[j]=2')).toEqual({ bar: { t: '1', j: '2' } });
         expect(getParamsExtended('example.com?bar[t]=1&bar[j]=2&bar[j]=3')).toEqual({ bar: { t: '1', j: '3' } });
         expect(getParamsExtended('example.com?b[t]=1&b[j]=2&b[j][g]=3'))