diff --git a/README.md b/README.md
index f4f66e7..a8fad78 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # o.js
-*o.js beta v0.2.1*
+*o.js beta v0.2.2*
 
 o.js is a client side Odata Javascript library to simplify the request of data. The main goal is to build a **standalone, lightweight and easy** to understand Odata lib.
 
diff --git a/o.js b/o.js
index 8420bfa..0787e20 100644
--- a/o.js
+++ b/o.js
@@ -1,5 +1,5 @@
 // +++
-// o.js  v0.2.1
+// o.js  v0.2.2
 //
 // o.js is a simple oData wrapper for JavaScript.
 // Currently supporting the following operations:
diff --git a/o.min.js b/o.min.js
index 972aaf4..9fd17a0 100644
--- a/o.min.js
+++ b/o.min.js
@@ -1 +1 @@
-!function(e,n){"function"==typeof define&&define.amd?define(["q"],n):"object"==typeof exports?module.exports=n(require("q")):e.o=n(e.Q)}(this,function(e){function n(e){function n(){for(var e,n={},t=0,r=arguments.length;r>t;t++)for(e in arguments[t])arguments[t].hasOwnProperty(e)&&(n[e]=arguments[t][e]);return n}var r=this;return r.oConfig=r.oConfig||{endpoint:null,format:"json",version:4,strictMode:!0,start:null,ready:null,error:null,headers:[],username:null,password:null,isAsync:!0,isCors:!0,openAjaxRequests:0,isHashRoute:!0,appending:""},r.config=function(e){r.oConfig=n(r.oConfig,e)},r.isEndpoint=function(){return null!==r.oConfig.endpoint},"undefined"==typeof e?r:new t(e,r.oConfig)}function t(n,t){function r(){if("undefined"!=typeof e){var n=e;return n}if("undefined"==typeof window){var n=require("q");return n}return null}function o(e,n,t,r){if(A(n)){var o="",a=[];for(i=0;i<n.length;++i)a[i]="("+e+" "+t+" "+n[i][e]+")";return o=a.join(" "+r+" ")}return""}function a(e,n,t){t=t||(4==oConfig.version?"contains":"substringof");for(var r=n.split(" "),o="contains"===t||"substringof"===t,i=[],a=0;a<e.length;a++){var u=[];if(o)for(var s=0;s<r.length;s++)4==oConfig.version?u.push(t+"("+e[a]+",'"+r[s]+"')"):u.push(t+"('"+r[s]+"',"+e[a]+")");else u.push(e[a]+" "+t+" '"+n+"'");i.push("("+u.join(" and ")+")")}return i.join("or")}function u(e){var n=e||M;n&&0!==n.path.length||L('No resource defined. Define a resource first with o("YourResourcePath").');var t="";X&&(t=G.oConfig.endpoint+(N(G.oConfig.endpoint,"/")?"":"/"));for(var r=0;r<n.path.length;r++)t+=n.path[r].resource,n.path[r].get&&(t+="("+(K[n.path[r].get]||n.path[r].get)+")"),t+="/";return t+n.appending+s()}function s(){var e="";for(queryName in M.query)M.query.hasOwnProperty(queryName)&&null!=M.query[queryName]&&(e+="&"+M.queryList[M.query[queryName]].name+"="+Y(M.queryList[M.query[queryName]].value,K));return e.length>0?"?"+e.substring(1):""}function f(e){for(var n=0;n<I.length;n++)if(I[n].route.regex.test(e)){K={};var t={},r=I[n].route.regex.exec(e);if("undefined"!=typeof I[n].route.param){var o=1;for(prop in I[n].route.param)K[prop]=r[o],t[prop.substring(1)]=r[o],o++}else for(var o=1;o<r.length;o++)K[":"+(o-1)]=r[o],t[o-1]=r[o];F(t)||y(I[n].callback,t),G.param=t}}function l(e){var n=e;if(!(e instanceof RegExp)){oConfig.isHashRoute&&!k(e,"#")&&(e="#"+e);for(var t=e.split("/"),r={},o=0;o<t.length;o++)k(t[o],":")&&(r[t[o]]=!0,t[o]="([\\w| |-]+|\\[W| |-]+)");n=new RegExp("^"+t.join("/")+"$")}return{regex:n,param:r}}function d(e){return JSON?JSON.parse(JSON.stringify(e)):void L("No JSON Support.")}function h(e){var n=new RegExp("'.*?'",""),t=n.exec(e);e=e.replace(n,"{0}");for(key in V)e=e.split(key).join(" "+V[key]+" ");if(null!=t)for(var r=0;r<t.length;r++)e=e.replace("{0}",t[r]);return e}function c(e){M&&U.push(M),M="string"==typeof e?m(e):e,$("$format")||x("$format",G.oConfig.format);for(var n=0;n<oConfig.appending.length;n++)x(oConfig.appending[n].name,oConfig.appending[n].value)}function g(e,n,t,r){if(null===M&&L('You must define a resource to perform a get(), post(), put() or delete() function. Define a resource with o("YourODataResource").'),0!==U.length||t){U.push(M);var o=J(M.method,u());if(P(["POST","PATCH","DELETE"])<=1&&t&&!W)H(o,R(M.data),e,n,!1,[{name:"Accept",value:"application/json"},{name:"Content-Type",value:"application/json"}],r,U[U.length-1].progress),b(["POST","PATCH","DELETE"]);else{for(var i=S(),a=G.oConfig.endpoint+(N(G.oConfig.endpoint,"/")?"":"/")+"$batch",s=0;s<oConfig.appending.length;s++)a+=(0===s?"?":"&")+oConfig.appending[s].name+"="+oConfig.appending[s].value;H(J("POST",a),j(i,t),e,n,!0,[{name:"Content-Type",value:"multipart/mixed; boundary=batch_"+i}],r,U[U.length-1].progress),t&&b(["POST","PUT","DELETE"])}}else H(J("GET",u()),null,e,n,!1,null,r,M.progress)}function y(e,n){""!==M.path[0].resource?g(e,null,!1,n):e.call(G,n)}function v(e){return"undefined"==typeof e?G:(e.toUpperCase().indexOf("HTTP://")>-1||e.toUpperCase().indexOf("HTTPS://")>-1?X=!1:G.oConfig.endpoint||L("You can not use resource query without defining your oData endpoint. Use o().config({endpoint:youeEndpoint}) to define your oData endpoint."),routeName=e,c(e),G)}function C(e){$("$expand")?(M.queryList[M.query.$expand].value+=","+e,M.queryList[M.query.$expand].original=M.queryList[M.query.$expand].value):x("$expand",e,e)}function m(e){var n=e.split("?"),t=e,r="",o={path:[],appending:"",query:{},queryList:[],method:"GET",data:null,progress:null};if(2===n.length){t=n[0],r=n[1];for(var i=r.split("&"),a=0;a<i.length;a++){var u=i[a].split("=");o.queryList.push({name:u[0],value:u[1]}),o.query[u[0]]=o.queryList.length-1}}for(var s=t.split("/"),a=0;a<s.length;a++)if(k(s[a],"$")&&"$link"!==s[a])o.appending=s[a];else{var f=s[a].split("(");1===f.length||k(s[a],"(")?o.path.push({resource:s[a],get:null}):o.path.push({resource:f[0],get:f[1].substring(0,f[1].length-1)})}return o}function x(e,n,t,r){t=t||null,M.queryList.push({name:e,value:n,original:t}),M.query[r||e]=M.queryList.length-1}function q(e,n,t,r,o){t=t||null,r=r||" or ",e=o||e,M.queryList[M.query[e]].value="("+M.queryList[M.query[e]].value+")"+r+"("+n+")",t&&(M.queryList[M.query[e]].original=M.queryList[M.query[e]].value)}function T(e){M.query[e]=null}function w(e){if($(e)){var n=e;return A(n)&&(n=n.join(",")),L("There is already a depending query. You can not use them together/twice: "+n),!0}return!1}function $(e){for(var n=A(e)?e:[e],t=!1,r=0;r<n.length;r++)M.query.hasOwnProperty(n[r])&&(t=!0);return t}function S(){var e=(new Date).getTime(),n="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(n){var t=(e+16*Math.random())%16|0;return e=Math.floor(e/16),("x"==n?t:7&t|8).toString(16)});return n}function O(e,n){return"undefined"!=typeof e&&null!==e&&e.length>0?e:void L(n+": Parameter must be set.")}function E(e,n){if("number"==typeof e)return e;var t=n;return e&&e.length>0&&(isNaN(e)||(t=parseInt(e))),t}function P(e){for(var n=0,t=0;t<U.length;t++)e.indexOf(U[t].method)>-1&&n++;return n}function b(e){for(var n=[],t=0;t<U.length;t++)e.indexOf(U[t].method)>-1&&n.push(t);for(var t=n.length-1;t>=0;t--)U.splice(n[t],1);U[0]&&(M=U[0])}function R(e){return JSON?JSON.stringify(e):(L("No JSON support."),e)}function A(e){return"undefined"==typeof Array.isArray?"[object Array]"===e.toString():Array.isArray(e)}function N(e,n){return e?-1!==e.indexOf(n,e.length-n.length):!1}function k(e,n){return 0===e.indexOf(n)}function L(e){function n(e){this.message=e,this.name="o.js exception"}if(n.prototype=new Error,G.oConfig.strictMode===!0)throw new n(e);console.log("o.js exception: "+e)}function j(e,n){var t="",r=S(),o=!1;n&&(t+="--batch_"+e+"\n",t+="Content-Type: multipart/mixed; boundary=changeset_"+r+"\n\n");for(var i=0;i<U.length;i++){var a=U[i];M=a,"GET"!==a.method||n?"POST"!==a.method&&"PUT"!==a.method&&"PATCH"!==a.method&&"DELETE"!==a.method||!n||(t+="--changeset_"+r+"\n",t+="Content-Type: application/http\n",t+="Content-Transfer-Encoding: binary\n",t+="Content-ID:"+i+"1\n\n",t+=a.method+" "+u(a)+" HTTP/1.1\n",t+="Host: "+G.oConfig.endpoint+"\n",t+="Content-Type: application/json\n",t+=R(M.data)+"\n\n\n",o=!0):(t+="--batch_"+e+"\n",t+="Content-Type: application/http\n",t+="Content-Transfer-Encoding: binary\n\n",t+=a.method+" "+u(a)+" HTTP/1.1\n",t+="Host: "+G.oConfig.endpoint+"\n\n")}return o&&(t+="--changeset_"+r+"--\n\n"),t+="--batch_"+e+"--"}function H(e,n,t,r,o,i,a,s){G.oConfig.start&&null==Q&&(G.oConfig.openAjaxRequests++,G.oConfig.start()),Q&&Q[0]&&Q[0](!0);var f=G;if(W?(e.onload=function(n){e.readyState=4,e.status=200,e.onreadystatechange()},e.onerror=function(n){e.readyState=0,e.status=400,e.onreadystatechange()}):"function"==typeof s&&(e.onprogress=s),e.onreadystatechange=function(){if(4===e.readyState){if(e.status>=200&&e.status<300){if(204!==e.status)if(o){var n,i=[],s=/({[\s\S]*?--batchresponse_)/g;do n=s.exec(e.responseText),n&&(_(n[0].substring(0,n[0].length-16),f),i.push(f.data));while(n);f.data=i}else _(e.responseText,f);z&&z.resolve(f),"function"==typeof t&&t.call(f,f.data,a)}else try{var p=e.responseText;if(JSON&&""!=e.responseText&&(p=JSON.parse(e.responseText)),""!==p&&p["odata.error"]){var l=p["odata.error"].message.value+" | HTTP Status: "+e.status+" | oData Code: "+p["odata.error"].code;L(l)}else L("Request to "+u()+" failed with HTTP status "+(e.status||404)+".")}catch(d){if(D(f,!0,e.status||404,e.responseText),"function"==typeof r)r(e.status||404,d);else{if(!z)throw d;d.status=e.status||404,z.reject(d)}}D(f,!1)}},G.oConfig.username&&G.oConfig.password&&(W&&L("CORS and Basic Auth is not supported for IE <= 9. Try to set isCors:false in the OData config if you do not need CORS support."),e.setRequestHeader("Authorization","Basic "+B(G.oConfig.username+":"+G.oConfig.password))),!W){if(i)for(var p=0;p<i.length;p++)e.setRequestHeader(i[p].name,i[p].value);if(G.oConfig.headers.length>0)for(var p=0;p<G.oConfig.headers.length;p++)e.setRequestHeader(G.oConfig.headers[p].name,G.oConfig.headers[p].value)}e.send(n)}function D(e,n,t,r){e.oConfig.ready&&null==Q&&(e.oConfig.openAjaxRequests--,e.oConfig.openAjaxRequests<=0&&e.oConfig.ready()),Q&&Q[1]&&Q[1](!1),e.oConfig.error&&n&&e.oConfig.error(t,r)}function _(e,n){var t=E(e,-1);if(-1!==t)n.data=t;else if(JSON){var r=JSON.parse(e);r.hasOwnProperty("value")?($(["$first"])&&r.value.length&&r.value.length<=1?n.data=r.value[0]:n.data=r.value,(r.hasOwnProperty("odata.count")||r.hasOwnProperty("@odata.count"))&&(n.inlinecount=r["odata.count"]||r["@odata.count"])):n.data=r,M.data=n.data}else n.data=e}function J(e,n){var t=null;if("undefined"==typeof window){var r=require("xhr2");t=new r}else t=new XMLHttpRequest;return G.oConfig.isCors&&"withCredentials"in t?t.open(e,n,G.oConfig.isAsync):G.oConfig.isCors&&"undefined"!=typeof XDomainRequest?(t=new XDomainRequest,W=!0,"GET"==e?t.open(e,n):t.open("POST",n)):t.open(e,n,G.oConfig.isAsync),t}function Y(){var e=arguments[0],n=arguments[1];for(p in n){var t=new RegExp(p,"g");"string"==typeof e&&(e=e.replace(t,n[p]))}return e}function B(e){var n={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t,r,o,i,a,u,s,f="",p=0;for(e=n._utf8_encode(e);p<e.length;)t=e.charCodeAt(p++),r=e.charCodeAt(p++),o=e.charCodeAt(p++),i=t>>2,a=(3&t)<<4|r>>4,u=(15&r)<<2|o>>6,s=63&o,isNaN(r)?u=s=64:isNaN(o)&&(s=64),f=f+this._keyStr.charAt(i)+this._keyStr.charAt(a)+this._keyStr.charAt(u)+this._keyStr.charAt(s);return f},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");for(var n="",t=0;t<e.length;t++){var r=e.charCodeAt(t);128>r?n+=String.fromCharCode(r):r>127&&2048>r?(n+=String.fromCharCode(r>>6|192),n+=String.fromCharCode(63&r|128)):(n+=String.fromCharCode(r>>12|224),n+=String.fromCharCode(r>>6&63|128),n+=String.fromCharCode(63&r|128))}return n}};return n.encode(e)}var G=this,M=null,U=[],I=[],X=!0,z=null,Q=null,W=!1,F=function(){},K={},V={"==":"eq","===":"eq","!=":"ne","!==":"ne",">":"gt",">=":"ge","<":"lt","<=":"le","&&":"and","||":"or","!":"not","*":"mul","%":"mod"};return G.data=[],G.inlinecount=null,G.param={},G.oConfig=t,G.routes=G.route=function(e,n){A(e)||(e=[e]),"undefined"==typeof window&&L("Routes are only supported in a browser env.");for(var t=window.location.hash,r=0;r<e.length;r++)"undefined"!=typeof n?I.push({name:e[r],route:l(e[r]),callback:n,param:{},interval:setInterval(function(){window.location.hash!=t&&(t=window.location.hash,f(window.location.hash))},100)}):L('Routes without a callback are not supported. Please define a function like .route("YourRoute", function() { }).');return G.triggerRoute(window.location.hash),G},G.beforeRouting=function(e){return F=e,G},G.isEndpoint=function(){return X},G.triggerRoute=function(e){return f(e),G},G.find=function(e){return M.path[M.path.length-1].get=e,G},G.top=G.take=function(e){return w(["$top"])||x("$top",e,e),G},G.skip=function(e){return w("$skip")||x("$skip",e,e),G},G.first=function(){return w(["$top","$first"])||x("$top",1,null,"$first"),G},G.filter=G.where=function(e){var n=O(h(e));return $("$filter")?q("$filter",n,n):x("$filter",n,n),G},G.any=function(e,n){var t=e+"/any(x:x/"+h(O(n))+")";return $("$filter")?q("$filter",t,t):x("$filter",t,t),G},G.orderBy=function(e){return w("$orderby")||x("$orderby",O(e)),G},G.select=function(e){return x("$select",O(e)),G},G.count=function(){return T("$format"),M.appending="$count",G},G.inlineCount=function(e){return 4==oConfig.version?(e=e||"true",w("$count")||x("$count",e)):(e=e||"allpages",w("$inlinecount")||x("$inlinecount",e)),G},G.batch=function(e){return c(e),G},G.expand=function(e){return C(e),G},G.loading=function(e,n){return n=n||e,Q=e?[e,n]:[function(){},function(){}],G},G.ref=G.link=function(e,n){T("$format"),(null==M||M.get)&&L("You need to define a resource with the find() method to append an navigation property"),oConfig.version<4?(M.method="POST",M.path.push("$link"),M.path.push({resource:e,get:null})):(M.method="POST",M.path.push({resource:e,get:null}),M.appending="$ref");var t=m(e);t.path[t.path.length-1].get=n;var r=u(t);return M.data={"@odata.id":r.substring(0,r.length-1)},G},G.removeRef=G.deleteRef=function(e,n){if(T("$format"),(null==M||M.get)&&L("You need to define a resource with the find() method to append an navigation property"),oConfig.version<4?(M.method="POST",M.path.push("$link"),M.path.push({resource:e,get:null})):(M.method="POST",M.path.push({resource:e,get:null}),M.appending="$ref"),n){var t=m(e);t.path[t.path.length-1].get=n;var r=u(t);x("$id",r.substring(0,r.length-1))}return M.method="DELETE",G},G.get=function(e,n){var t=r();return z=t.defer(),g(e,n,!1),"undefined"!=typeof t?z.promise:G},G.save=function(e,n){if("GET"===M.method&&null!==M.data){var t=d(M);t.method="PATCH",t.data=M.data,c(t)}var o=r();return o&&"undefined"==typeof e?(z=o.defer(),g(e,n,!0),z.promise):(g(e,n,!0),G)},G.post=function(e,n){return T("$format"),n&&c(n),M.method="POST",M.data=e,G},G.patch=G.put=function(e,n){return n&&c(n),M.path[M.path.length-1]&&M.path[M.path.length-1].get||L("Bulk updates are not supported. You need to query a unique resource with find() to patch/put it."),M.method="PATCH",M.data=e,G},G.remove=G["delete"]=function(e){return e&&c(e),M.path[M.path.length-1]&&M.path[M.path.length-1].get||L("Bulk deletes are not supported. You need to query a unique resource with find() to delete it."),M.method="DELETE",G},G.query=function(e){return u(e)},G.search=function(e,n,t,r){var o=a(e,n,t);return 4==oConfig.version&&r?w("$search")||x("$search",o,o):w("$filter")||x("$filter",o,o,"$search"),G},G.filterByList=G.exclude=function(e,n){if(!w("$filter")){var t=o(e,n,V["!="],V["&&"]);x("$filter",O(t),t)}return G},G.include=function(e,n){if(!w("$filter")){var t=o(e,n,V["=="],V["||"]);x("$filter",O(t),t)}return G},G.progress=function(e){return null!=M&&(M.progress=e),G},v(n)}return n});
\ No newline at end of file
+!function(e,n){"function"==typeof define&&define.amd?define(["q"],n):"object"==typeof exports?module.exports=n(require("q")):e.o=n(e.Q)}(this,function(e){function n(e){function n(){for(var e,n={},t=0,r=arguments.length;r>t;t++)for(e in arguments[t])arguments[t].hasOwnProperty(e)&&(n[e]=arguments[t][e]);return n}var r=this;return r.oConfig=r.oConfig||{endpoint:null,format:"json",version:4,strictMode:!0,start:null,ready:null,error:null,headers:[],username:null,password:null,isAsync:!0,isCors:!0,openAjaxRequests:0,isHashRoute:!0,appending:""},r.config=function(e){r.oConfig=n(r.oConfig,e)},r.isEndpoint=function(){return null!==r.oConfig.endpoint},"undefined"==typeof e?r:new t(e,r.oConfig)}function t(n,t){function r(){if("undefined"!=typeof e){var n=e;return n}if("undefined"==typeof window){var n=require("q");return n}return null}function o(e,n,t,r){if(A(n)){var o="",a=[];for(i=0;i<n.length;++i)a[i]="("+e+" "+t+" "+n[i][e]+")";return o=a.join(" "+r+" ")}return""}function a(e,n,t){t=t||(4==oConfig.version?"contains":"substringof");for(var r=n.split(" "),o="contains"===t||"substringof"===t,i=[],a=0;a<e.length;a++){var u=[];if(o)for(var s=0;s<r.length;s++)4==oConfig.version?u.push(t+"("+e[a]+",'"+r[s]+"')"):u.push(t+"('"+r[s]+"',"+e[a]+")");else u.push(e[a]+" "+t+" '"+n+"'");i.push("("+u.join(" and ")+")")}return i.join("or")}function u(e){var n=e||M;n&&0!==n.path.length||L('No resource defined. Define a resource first with o("YourResourcePath").');var t="";X&&(t=G.oConfig.endpoint+(N(G.oConfig.endpoint,"/")?"":"/"));for(var r=0;r<n.path.length;r++)t+=n.path[r].resource,n.path[r].get&&(t+="("+(K[n.path[r].get]||n.path[r].get)+")"),t+="/";return t+n.appending+s()}function s(){var e="";for(queryName in M.query)M.query.hasOwnProperty(queryName)&&null!=M.query[queryName]&&(e+="&"+M.queryList[M.query[queryName]].name+"="+Y(M.queryList[M.query[queryName]].value,K));return e.length>0?"?"+e.substring(1):""}function f(e){for(var n=0;n<I.length;n++)if(I[n].route.regex.test(e)){K={};var t={},r=I[n].route.regex.exec(e);if("undefined"!=typeof I[n].route.param){var o=1;for(prop in I[n].route.param)K[prop]=r[o],t[prop.substring(1)]=r[o],o++}else for(var o=1;o<r.length;o++)K[":"+(o-1)]=r[o],t[o-1]=r[o];F(t)||y(I[n].callback,t),G.param=t}}function l(e){var n=e;if(!(e instanceof RegExp)){oConfig.isHashRoute&&!k(e,"#")&&(e="#"+e);for(var t=e.split("/"),r={},o=0;o<t.length;o++)k(t[o],":")&&(r[t[o]]=!0,t[o]="([\\w| |-]+|\\[W| |-]+)");n=new RegExp("^"+t.join("/")+"$")}return{regex:n,param:r}}function d(e){return JSON?JSON.parse(JSON.stringify(e)):void L("No JSON Support.")}function c(e){var n=new RegExp("'.*?'",""),t=n.exec(e);e=e.replace(n,"{0}");for(key in V)e=e.split(key).join(" "+V[key]+" ");if(null!=t)for(var r=0;r<t.length;r++)e=e.replace("{0}",t[r]);return e}function h(e){M&&U.push(M),M="string"==typeof e?C(e):e,$("$format")||x("$format",G.oConfig.format);for(var n=0;n<oConfig.appending.length;n++)x(oConfig.appending[n].name,oConfig.appending[n].value)}function g(e,n,t,r){if(null===M&&L('You must define a resource to perform a get(), post(), put() or delete() function. Define a resource with o("YourODataResource").'),0!==U.length||t){U.push(M);var o=J(M.method,u());if(P(["POST","PATCH","DELETE"])<=1&&t&&!W)H(o,R(M.data),e,n,!1,[{name:"Accept",value:"application/json"},{name:"Content-Type",value:"application/json"}],r,U[U.length-1].progress),b(["POST","PATCH","DELETE"]);else{for(var i=S(),a=G.oConfig.endpoint+(N(G.oConfig.endpoint,"/")?"":"/")+"$batch",s=0;s<oConfig.appending.length;s++)a+=(0===s?"?":"&")+oConfig.appending[s].name+"="+oConfig.appending[s].value;H(J("POST",a),j(i,t),e,n,!0,[{name:"Content-Type",value:"multipart/mixed; boundary=batch_"+i}],r,U[U.length-1].progress),t&&b(["POST","PUT","DELETE"])}}else H(J("GET",u()),null,e,n,!1,null,r,M.progress)}function y(e,n){""!==M.path[0].resource?g(e,null,!1,n):e.call(G,n)}function v(e){return"undefined"==typeof e?G:(e.toUpperCase().indexOf("HTTP://")>-1||e.toUpperCase().indexOf("HTTPS://")>-1?X=!1:G.oConfig.endpoint||L("You can not use resource query without defining your oData endpoint. Use o().config({endpoint:youeEndpoint}) to define your oData endpoint."),routeName=e,h(e),G)}function m(e){$("$expand")?(M.queryList[M.query.$expand].value+=","+e,M.queryList[M.query.$expand].original=M.queryList[M.query.$expand].value):x("$expand",e,e)}function C(e){var n=e.split("?"),t=e,r="",o={path:[],appending:"",query:{},queryList:[],method:"GET",data:null,progress:null};if(2===n.length){t=n[0],r=n[1];for(var i=r.split("&"),a=0;a<i.length;a++){var u=i[a].split("=");o.queryList.push({name:u[0],value:u[1]}),o.query[u[0]]=o.queryList.length-1}}for(var s=t.split("/"),a=0;a<s.length;a++)if(k(s[a],"$")&&"$link"!==s[a])o.appending=s[a];else{var f=s[a].split("(");1===f.length||k(s[a],"(")?o.path.push({resource:s[a],get:null}):o.path.push({resource:f[0],get:f[1].substring(0,f[1].length-1)})}return o}function x(e,n,t,r){t=t||null,M.queryList.push({name:e,value:n,original:t}),M.query[r||e]=M.queryList.length-1}function q(e,n,t,r,o){t=t||null,r=r||" or ",e=o||e,M.queryList[M.query[e]].value="("+M.queryList[M.query[e]].value+")"+r+"("+n+")",t&&(M.queryList[M.query[e]].original=M.queryList[M.query[e]].value)}function T(e){M.query[e]=null}function w(e){if($(e)){var n=e;return A(n)&&(n=n.join(",")),L("There is already a depending query. You can not use them together/twice: "+n),!0}return!1}function $(e){for(var n=A(e)?e:[e],t=!1,r=0;r<n.length;r++)M.query.hasOwnProperty(n[r])&&(t=!0);return t}function S(){var e=(new Date).getTime(),n="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(n){var t=(e+16*Math.random())%16|0;return e=Math.floor(e/16),("x"==n?t:7&t|8).toString(16)});return n}function O(e,n){return"undefined"!=typeof e&&null!==e&&e.length>0?e:void L(n+": Parameter must be set.")}function E(e,n){if("number"==typeof e)return e;var t=n;return e&&e.length>0&&(isNaN(e)||(t=parseInt(e))),t}function P(e){for(var n=0,t=0;t<U.length;t++)e.indexOf(U[t].method)>-1&&n++;return n}function b(e){for(var n=[],t=0;t<U.length;t++)e.indexOf(U[t].method)>-1&&n.push(t);for(var t=n.length-1;t>=0;t--)U.splice(n[t],1);U[0]&&(M=U[0])}function R(e){return JSON?JSON.stringify(e):(L("No JSON support."),e)}function A(e){return"undefined"==typeof Array.isArray?"[object Array]"===e.toString():Array.isArray(e)}function N(e,n){return e?-1!==e.indexOf(n,e.length-n.length):!1}function k(e,n){return 0===e.indexOf(n)}function L(e){function n(e){this.message=e,this.name="o.js exception"}if(n.prototype=new Error,G.oConfig.strictMode===!0)throw new n(e);console.log("o.js exception: "+e)}function j(e,n){var t="",r=S(),o=!1;n&&(t+="--batch_"+e+"\n",t+="Content-Type: multipart/mixed; boundary=changeset_"+r+"\n\n");for(var i=0;i<U.length;i++){var a=U[i];M=a,"GET"!==a.method||n?"POST"!==a.method&&"PUT"!==a.method&&"PATCH"!==a.method&&"DELETE"!==a.method||!n||(t+="--changeset_"+r+"\n",t+="Content-Type: application/http\n",t+="Content-Transfer-Encoding: binary\n",t+="Content-ID:"+i+"1\n\n",t+=a.method+" "+u(a)+" HTTP/1.1\n",t+="Host: "+G.oConfig.endpoint+"\n",t+="Content-Type: application/json\n",t+=R(M.data)+"\n\n\n",o=!0):(t+="--batch_"+e+"\n",t+="Content-Type: application/http\n",t+="Content-Transfer-Encoding: binary\n\n",t+=a.method+" "+u(a)+" HTTP/1.1\n",t+="Host: "+G.oConfig.endpoint+"\n\n")}return o&&(t+="--changeset_"+r+"--\n\n"),t+="--batch_"+e+"--"}function H(e,n,t,r,o,i,a,s){G.oConfig.start&&null==Q&&(G.oConfig.openAjaxRequests++,G.oConfig.start()),Q&&Q[0]&&Q[0](!0);var f=G;if(W?(e.onload=function(n){e.readyState=4,e.status=200,e.onreadystatechange()},e.onerror=function(n){e.readyState=0,e.status=400,e.onreadystatechange()}):"function"==typeof s&&(e.onprogress=s),e.onreadystatechange=function(){if(4===e.readyState){if(e.status>=200&&e.status<300){if(204!==e.status)if(o){var n,i=[],s=/({[\s\S]*?--batchresponse_)/g;do n=s.exec(e.responseText),n&&(_(n[0].substring(0,n[0].length-16),f),i.push(f.data));while(n);f.data=i}else _(e.responseText,f);z&&z.resolve(f),"function"==typeof t&&t.call(f,f.data,a)}else try{var p=e.responseText;if(JSON&&""!=e.responseText&&(p=JSON.parse(e.responseText)),""!==p&&p["odata.error"]){var l=p["odata.error"].message.value+" | HTTP Status: "+e.status+" | oData Code: "+p["odata.error"].code;L(l)}else L("Request to "+u()+" failed with HTTP status "+(e.status||404)+".")}catch(d){if(D(f,!0,e.status||404,e.responseText),"function"==typeof r)r(e.status||404,d);else{if(!z)throw d;d.status=e.status||404,z.reject(d)}}D(f,!1)}},G.oConfig.username&&G.oConfig.password&&(W&&L("CORS and Basic Auth is not supported for IE <= 9. Try to set isCors:false in the OData config if you do not need CORS support."),e.setRequestHeader("Authorization","Basic "+B(G.oConfig.username+":"+G.oConfig.password))),!W){if(i)for(var p=0;p<i.length;p++)e.setRequestHeader(i[p].name,i[p].value);if(G.oConfig.headers.length>0)for(var p=0;p<G.oConfig.headers.length;p++)e.setRequestHeader(G.oConfig.headers[p].name,G.oConfig.headers[p].value)}e.send(n)}function D(e,n,t,r){e.oConfig.ready&&null==Q&&(e.oConfig.openAjaxRequests--,e.oConfig.openAjaxRequests<=0&&e.oConfig.ready()),Q&&Q[1]&&Q[1](!1),e.oConfig.error&&n&&e.oConfig.error(t,r)}function _(e,n){var t=E(e,-1);if(-1!==t)n.data=t;else if(JSON){var r=JSON.parse(e);r.hasOwnProperty("value")?($(["$first"])&&r.value.length&&r.value.length<=1?n.data=r.value[0]:n.data=r.value,(r.hasOwnProperty("odata.count")||r.hasOwnProperty("@odata.count"))&&(n.inlinecount=r["odata.count"]||r["@odata.count"])):n.data=r,M.data=n.data}else n.data=e}function J(e,n){var t=null;if("undefined"==typeof window){var r=require("xhr2");t=new r}else t=new XMLHttpRequest;return G.oConfig.isCors&&"withCredentials"in t?t.open(e,n,G.oConfig.isAsync):G.oConfig.isCors&&"undefined"!=typeof XDomainRequest?(t=new XDomainRequest,W=!0,"GET"==e?t.open(e,n):t.open("POST",n)):t.open(e,n,G.oConfig.isAsync),t}function Y(){var e=arguments[0],n=arguments[1];for(p in n){var t=new RegExp(p,"g");"string"==typeof e&&(e=e.replace(t,n[p]))}return e}function B(e){var n={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t,r,o,i,a,u,s,f="",p=0;for(e=n._utf8_encode(e);p<e.length;)t=e.charCodeAt(p++),r=e.charCodeAt(p++),o=e.charCodeAt(p++),i=t>>2,a=(3&t)<<4|r>>4,u=(15&r)<<2|o>>6,s=63&o,isNaN(r)?u=s=64:isNaN(o)&&(s=64),f=f+this._keyStr.charAt(i)+this._keyStr.charAt(a)+this._keyStr.charAt(u)+this._keyStr.charAt(s);return f},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");for(var n="",t=0;t<e.length;t++){var r=e.charCodeAt(t);128>r?n+=String.fromCharCode(r):r>127&&2048>r?(n+=String.fromCharCode(r>>6|192),n+=String.fromCharCode(63&r|128)):(n+=String.fromCharCode(r>>12|224),n+=String.fromCharCode(r>>6&63|128),n+=String.fromCharCode(63&r|128))}return n}};return n.encode(e)}var G=this,M=null,U=[],I=[],X=!0,z=null,Q=null,W=!1,F=function(){},K={},V={"==":"eq","===":"eq","!=":"ne","!==":"ne",">":"gt",">=":"ge","<":"lt","<=":"le","&&":"and","||":"or","!":"not","*":"mul","%":"mod"};return G.data=[],G.inlinecount=null,G.param={},G.oConfig=t,G.routes=G.route=function(e,n){A(e)||(e=[e]),"undefined"==typeof window&&L("Routes are only supported in a browser env.");for(var t=window.location.hash,r=0;r<e.length;r++)"undefined"!=typeof n?I.push({name:e[r],route:l(e[r]),callback:n,param:{},interval:setInterval(function(){window.location.hash!=t&&(t=window.location.hash,f(window.location.hash))},100)}):L('Routes without a callback are not supported. Please define a function like .route("YourRoute", function() { }).');return G.triggerRoute(window.location.hash),G},G.beforeRouting=function(e){return F=e,G},G.isEndpoint=function(){return X},G.triggerRoute=function(e){return f(e),G},G.find=function(e){return M.path[M.path.length-1].get=e,G},G.top=G.take=function(e){return w(["$top"])||x("$top",e,e),G},G.skip=function(e){return w("$skip")||x("$skip",e,e),G},G.first=function(){return w(["$top","$first"])||x("$top",1,null,"$first"),G},G.filter=G.where=function(e){var n=O(c(e));return $("$filter")?q("$filter",n,n):x("$filter",n,n),G},G.any=function(e,n){var t=e+"/any(x:x/"+c(O(n))+")";return $("$filter")?q("$filter",t,t):x("$filter",t,t),G},G.orderBy=function(e,n){return"undefined"==typeof n&&(n="asc"),w("$orderby")||x("$orderby",O(e)+" "+n),G},G.orderByDesc=function(e){return G.orderBy(e,"desc")},G.select=function(e){return x("$select",O(e)),G},G.count=function(){return T("$format"),M.appending="$count",G},G.inlineCount=function(e){return 4==oConfig.version?(e=e||"true",w("$count")||x("$count",e)):(e=e||"allpages",w("$inlinecount")||x("$inlinecount",e)),G},G.batch=function(e){return h(e),G},G.expand=function(e){return m(e),G},G.loading=function(e,n){return n=n||e,Q=e?[e,n]:[function(){},function(){}],G},G.ref=G.link=function(e,n){T("$format"),(null==M||M.get)&&L("You need to define a resource with the find() method to append an navigation property"),oConfig.version<4?(M.method="POST",M.path.push("$link"),M.path.push({resource:e,get:null})):(M.method="POST",M.path.push({resource:e,get:null}),M.appending="$ref");var t=C(e);t.path[t.path.length-1].get=n;var r=u(t);return M.data={"@odata.id":r.substring(0,r.length-1)},G},G.removeRef=G.deleteRef=function(e,n){if(T("$format"),(null==M||M.get)&&L("You need to define a resource with the find() method to append an navigation property"),oConfig.version<4?(M.method="POST",M.path.push("$link"),M.path.push({resource:e,get:null})):(M.method="POST",M.path.push({resource:e,get:null}),M.appending="$ref"),n){var t=C(e);t.path[t.path.length-1].get=n;var r=u(t);x("$id",r.substring(0,r.length-1))}return M.method="DELETE",G},G.get=function(e,n){var t=r();return z=t.defer(),g(e,n,!1),"undefined"!=typeof t?z.promise:G},G.save=function(e,n){if("GET"===M.method&&null!==M.data){var t=d(M);t.method="PATCH",t.data=M.data,h(t)}var o=r();return o&&"undefined"==typeof e?(z=o.defer(),g(e,n,!0),z.promise):(g(e,n,!0),G)},G.post=function(e,n){return T("$format"),n&&h(n),M.method="POST",M.data=e,G},G.patch=G.put=function(e,n){return n&&h(n),M.path[M.path.length-1]&&M.path[M.path.length-1].get||L("Bulk updates are not supported. You need to query a unique resource with find() to patch/put it."),M.method="PATCH",M.data=e,G},G.remove=G["delete"]=function(e){return e&&h(e),M.path[M.path.length-1]&&M.path[M.path.length-1].get||L("Bulk deletes are not supported. You need to query a unique resource with find() to delete it."),M.method="DELETE",G},G.query=function(e){return u(e)},G.search=function(e,n,t,r){var o=a(e,n,t);return 4==oConfig.version&&r?w("$search")||x("$search",o,o):w("$filter")||x("$filter",o,o,"$search"),G},G.filterByList=G.exclude=function(e,n){if(!w("$filter")){var t=o(e,n,V["!="],V["&&"]);x("$filter",O(t),t)}return G},G.include=function(e,n){if(!w("$filter")){var t=o(e,n,V["=="],V["||"]);x("$filter",O(t),t)}return G},G.progress=function(e){return null!=M&&(M.progress=e),G},v(n)}return n});
\ No newline at end of file
diff --git a/package.json b/package.json
index 38b77c6..4aa0dfc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "o.js",
   "description": "o.js is a client side Odata Javascript library to simplify the request of data. The main goal is to build a standalone, lightweight and easy to understand Odata lib. ",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "main": "o.js",
   "dependencies": {
       "q": "*",