diff --git a/bower.json b/bower.json
index b92fc01..d798b72 100644
--- a/bower.json
+++ b/bower.json
@@ -4,7 +4,7 @@
 		"name": "Xavier Badosa",
 		"url": "http://xavierbadosa.com"
 	},
-	"version": "0.8.2",
+	"version": "0.8.3",
 	"main": "json-stat.js",
 	"ignore": [
 		"**/.*"
diff --git a/json-stat.js b/json-stat.js
index d625153..225112a 100644
--- a/json-stat.js
+++ b/json-stat.js
@@ -1,6 +1,6 @@
 /*
 
-JSON-stat Javascript Toolkit v. 0.8.2
+JSON-stat Javascript Toolkit v. 0.8.3
 http://json-stat.org
 https://github.com/badosa/JSON-stat
 
@@ -10,7 +10,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0
+  http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,4 +19,127 @@ or implied. See the License for the specific language governing
 permissions and limitations under the License.
 
 */
-function JSONstat(t,e){return window===this?new JSONstat.jsonstat(t,e):void 0}var JSONstat=JSONstat||{};JSONstat.version="0.8.2",function(){"use strict";function t(t){return"[object Array]"===Object.prototype.toString.call(t)}function e(e,n){var i,s,r,l,u=function(t,e){var n,i,s=e!==!1;if(window.XDomainRequest&&/^(http(s)?:)?\/\//.test(t)){if(!s)return;i=new XDomainRequest,i.onload=function(){n=JSON.parse(i.responseText),e.call(JSONstat(n))},i.open("GET",t),i.send()}else if(i=new XMLHttpRequest,i.onreadystatechange=function(){if(4===i.readyState){var t=i.status;n=t&&i.responseText&&(t>=200&&300>t||304===t)?JSON.parse(i.responseText):null,s&&e.call(JSONstat(n))}},i.open("GET",t,s),i.send(null),!s)return n},a=function(e,n){var i,s=[];if("string"==typeof e&&(e=[e]),t(e)){if(e.length===n)return e;if(1===e.length){for(i=0;n>i;i++)s.push(e[0]);return s}}for(i=0;n>i;i++){var r="undefined"==typeof e[i]?null:e[i];s.push(r)}return s};if(this.length=0,this.id=[],null!==e&&"undefined"!=typeof e)switch(this.class=e.class||"bundle",this.class){case"bundle":var o=[],h=0;if(this.error=null,this.length=0,"string"==typeof e&&e.length>0&&(e=u(e,"function"==typeof n?n:!1)),null===e||"object"!=typeof e)return;if(e.hasOwnProperty("error"))return void(this.error=e.error);if("dataset"===e.class||"collection"===e.class)return JSONstat(e);for(s in e)h++,o.push(s);this.__tree__=e,this.length=h,this.id=o;break;case"dataset":e.hasOwnProperty("__tree__")||(delete e.class,e={__tree__:e}),this.__tree__=i=e.__tree__,this.label=i.label||null,this.note=i.note||null,this.link=i.link||null,this.href=i.href||null,this.updated=i.updated||null,this.source=i.source||null,this.extension=i.extension||null;var f,d=0;if(i.hasOwnProperty("value")&&t(i.value))d=i.value.length;else if(i.hasOwnProperty("status")&&t(i.status))d=i.status.length;else if(i.hasOwnProperty("dimension")){var c=i.dimension.size,p=1;for(f=c.length;f--;)p*=c[f];d=p}if(this.value=a(i.value,d),this.status=i.hasOwnProperty("status")?a(i.status,d):null,i.hasOwnProperty("dimension")){if(!t(i.dimension.id)||!t(i.dimension.size)||i.dimension.id.length!=i.dimension.size.length)return;var y=i.dimension,v=y.role||null,g=y.id,_=y.size.length,b=function(t){v.hasOwnProperty(t)||(v[t]=null)};if(this.length=_,this.id=g,v&&(b("time"),b("geo"),b("metric"),b("classification")),v&&null===v.classification){var m=[],w=["time","geo","metric"],O=function(t,e){for(var n=e.length;n--;)if(t===e[n])return!0;return!1};for(f=0;3>f;f++){var x=v[w[f]];null!==x&&(m=m.concat(x))}for(v.classification=[],f=0;_>f;f++)O(g[f],m)||v.classification.push(g[f]);0===v.classification.length&&(v.classification=null)}this.role=v,this.n=d;for(var S=0,k=this.length;k>S;S++)if(y[y.id[S]].category.hasOwnProperty("index")){if(t(y[y.id[S]].category.index)){var P={},D=y[y.id[S]].category.index;for(r=D.length,l=0;r>l;l++)P[D[l]]=l;y[y.id[S]].category.index=P}}else{var j=0;y[y.id[S]].category.index={};for(s in y[y.id[S]].category.label)y[y.id[S]].category.index[s]=j++}}else this.length=0;break;case"dimension":i=e.__tree__;var J=[],N=i.category;if(!e.hasOwnProperty("__tree__")||!i.hasOwnProperty("category"))return;if(!N.hasOwnProperty("label")){N.label={};for(s in N.index)N.label[s]=s}for(s in N.index)J[N.index[s]]=s;this.__tree__=i,this.label=i.label||null,this.note=i.note||null,this.link=i.link||null,this.href=i.href||null,this.id=J,this.length=J.length,this.role=e.role,this.hierarchy=N.hasOwnProperty("child"),this.extension=i.extension||null;break;case"category":var T=e.child;this.id=T,this.length=null===T?0:T.length,this.index=e.index,this.label=e.label,this.note=e.note||null,this.unit=e.unit,this.coordinates=e.coord;break;case"collection":if(this.length=0,this.label=e.label||null,this.note=e.note||null,this.link=e.link||null,this.href=e.href||null,this.updated=e.updated||null,this.source=e.source||null,this.extension=e.extension||null,null!==this.link&&e.link.item){var z=e.link.item;if(this.length=t(z)?z.length:0,this.length)for(l=0;l<this.length;l++)this.id[l]=z[l].href}}}e.prototype.Item=function(t){if(null===this||"collection"!==this.class||!this.length)return null;if("number"==typeof t)return t>this.length||0>t?null:this.link.item[t];var e,n=[];"object"==typeof t?t.class?e=function(t,e,i){i.class===t.link.item[e].class&&n.push(t.link.item[e])}:t.follow&&(e=function(t,e){n.push(JSONstat(t.id[e]))}):e=function(t,e){n.push(t.link.item[e])};for(var i=0;i<this.length;i++)e(this,i,t);return n},e.prototype.Dataset=function(t){if(null===this)return null;if("dataset"===this.class)return"undefined"!=typeof t?this:[this];if("bundle"!==this.class)return null;if("undefined"==typeof t){for(var n=[],i=0,s=this.id.length;s>i;i++)n.push(this.Dataset(this.id[i]));return n}if("number"==typeof t){var r=this.id[t];return"undefined"!=typeof r?this.Dataset(r):null}var l=this.__tree__[t];return"undefined"==typeof l?null:new e({"class":"dataset",__tree__:l})},e.prototype.Dimension=function(t){var n,i=[],s=this.id.length,r=function(t,e){var n=t.role;if(null!==n)for(var i in n)for(var s=null!==n[i]?n[i].length:0;s--;)if(n[i][s]===e)return i;return null};if(null===this||"dataset"!==this.class)return null;if("undefined"==typeof t){for(n=0;s>n;n++)i.push(this.Dimension(this.id[n]));return i}if("number"==typeof t){var l=this.id[t];return"undefined"!=typeof l?this.Dimension(l):null}var u=this.__tree__.dimension;if("undefined"==typeof u)return null;if("object"==typeof t){if(t.hasOwnProperty("role")){for(n=0;s>n;n++){var a=this.id[n];r(u,a)===t.role&&i.push(this.Dimension(a))}return"undefined"==typeof i[0]?null:i}return null}var o=u[t];return"undefined"==typeof o?null:new e({"class":"dimension",__tree__:o,role:r(u,t)})},e.prototype.Category=function(t){if(null===this||"dimension"!==this.class)return null;if("undefined"==typeof t){for(var n=[],i=0,s=this.id.length;s>i;i++)n.push(this.Category(this.id[i]));return n}if("number"==typeof t){var r=this.id[t];return"undefined"!=typeof r?this.Category(r):null}var l=this.__tree__.category;if("undefined"==typeof l)return null;var u=l.index[t];if("undefined"==typeof u)return null;var a=l.unit&&l.unit[t]||null,o=l.coordinates&&l.coordinates[t]||null,h=l.child&&l.child[t]||null,f=l.note&&l.note[t]||null;return new e({"class":"category",index:u,label:l.label[t],note:f,child:h,unit:a,coord:o})},e.prototype.Data=function(e){var n,i,s=[],r=function(t){for(var e in t)if(t.hasOwnProperty(e))return e},l=function(t,e){for(var n=[],i=t.dimension,s=i.id,l=0,u=s.length;u>l;l++){var a=s[l],o=e[a];n.push("string"==typeof o?o:1===i.size[l]?r(i[a].category.index):null)}return n};if(null===this||"dataset"!==this.class)return null;if("undefined"==typeof e){for(i=this.value.length,n=0;i>n;n++)s.push(this.Data(n));return s}if("number"==typeof e){var u=this.value[e];return"undefined"!=typeof u?{value:u,status:this.status?this.status[e]:null}:null}var a=this.__tree__,o=a.dimension.size,h=o.length;if(t(e)){if(this.length!==e.length)return null;var f=1,d=0,c=[],p=[];for(n=0;h>n;n++)if("undefined"!=typeof e[n]){if("number"!=typeof e[n]||e[n]>=o[n])return null;f*=n>0?o[h-n]:1,d+=f*e[h-n-1]}else c.push(n),p.push(o[n]);if(c.length>1)return null;if(1===c.length){for(var y=0,v=p[0];v>y;y++){var g=[];for(n=0;h>n;n++)g.push(n!==c[0]?e[n]:y);s.push(this.Data(g))}return s}return{value:this.value[d],status:this.status?this.status[d]:null}}var _=l(a,e),b=[],m=a.dimension;for(i=_.length,n=0;i>n;n++)b.push(m[m.id[n]].category.index[_[n]]);return this.Data(b)},e.prototype.toTable=function(t,e){if(null===this||"dataset"!==this.class)return null;1==arguments.length&&"function"==typeof t&&(e=t,t=null);var n,i,s,r,l,u=this.__tree__;if(t=t||{field:"label",content:"label",vlabel:"Value",slabel:"Status",type:"array",status:!1},"function"==typeof e){n=this.toTable(t);var a=[],o="array"!==t.type?0:1,h="object"!==t.type?n.slice(o):n.rows.slice(0);for(l=h.length,i=0;l>i;i++){var f=e.call(this,h[i],i);"undefined"!=typeof f&&a.push(f)}return"object"===t.type?{cols:n.cols,rows:a}:("array"===t.type&&a.unshift(n[0]),a)}if("arrobj"===t.type){n=this.toTable({field:"id",content:t.content,status:t.status});var d=[],c=n.shift();for(l=n.length,i=0;l>i;i++){var p={};for(s=n[i].length;s--;)p[c[s]]=n[i][s];d.push(p)}return d}var y,v,g,_,b="id"===t.field;if("object"===t.type){var m="number"==typeof this.value[0]||null===this.value[0]?"number":"string";y=function(t,e){var n=b&&t||e||t;z.push({id:t,label:n,type:"string"})},v=function(t,e,n){var i=b&&"value"||t||"Value",s=b&&"status"||e||"Status";n&&z.push({id:"status",label:s,type:"string"}),z.push({id:"value",label:i,type:m})},g=function(t){B.push({v:t})},_=function(t){B.push({v:t}),V.push({c:B})}}else y=function(t,e){var n=b&&t||e||t;z.push(n)},v=function(t,e,n){var i=b&&"value"||t||"Value",s=b&&"status"||e||"Status";n&&z.push(s),z.push(i),T.push(z)},g=function(t){B.push(t)},_=function(t){B.push(t),T.push(B)};var w=u.dimension,O=w.id,x=O.length,S=w.size;if(x!=S.length)return!1;var k=[],P=1,D=1,j=[],J=[],N=[],T=[],z=[],V=[];for(i=0;x>i;i++){var q=O[i],C=w[q].label;y(q,C),P*=S[i],D*=S[i];var R=[];for(s=0;s<S[i];s++)for(var X in w[O[i]].category.index)if(w[O[i]].category.index[X]===s){var E="id"!==t.content&&w[O[i]].category.label?w[O[i]].category.label[X]:X;R.push(E)}k.push(R),j.push(D)}for(v(t.vlabel,t.slabel,t.status),l=k.length,i=0;l>i;i++){for(var G=[],A=0,H=k[i].length;H>A;A++)for(var I=0;I<P/j[i];I++)G.push(k[i][A]);J.push(G)}for(l=J.length,i=0;l>i;i++){var L=[],M=0;for(r=0;P>r;r++)L.push(J[i][M]),M++,M===J[i].length&&(M=0);N.push(L)}for(r=0;P>r;r++){var B=[];l=J.length;for(var F=0;l>F;F++)g(N[F][r]);t.status&&g(this.status?this.status[r]:null),_(this.value[r])}return"object"===t.type?{cols:z,rows:V}:T},e.prototype.node=function(){return this.__tree__},e.prototype.toString=function(){return this.class},e.prototype.toValue=function(){return this.length},JSONstat.jsonstat=e}();
\ No newline at end of file
+
+function JSONstat(t,e){return window===this?new JSONstat.jsonstat(t,e):void 0}var JSONstat=JSONstat||{}
+JSONstat.version="0.8.3",function(){"use strict"
+function t(t){return"[object Array]"===Object.prototype.toString.call(t)}function e(e,n){var i,s,r,l,a=function(t,e){var n,i,s=e!==!1
+if(window.XDomainRequest&&/^(http(s)?:)?\/\//.test(t)){if(!s)return
+i=new XDomainRequest,i.onload=function(){n=JSON.parse(i.responseText),e.call(JSONstat(n))},i.open("GET",t),i.send()}else if(i=new XMLHttpRequest,i.onreadystatechange=function(){if(4===i.readyState){var t=i.status
+n=t&&i.responseText&&(t>=200&&300>t||304===t)?JSON.parse(i.responseText):null,s&&e.call(JSONstat(n))}},i.open("GET",t,s),i.send(null),!s)return n},o=function(e,n){var i,s=[]
+if("string"==typeof e&&(e=[e]),t(e)){if(e.length===n)return e
+if(1===e.length){for(i=0;n>i;i++)s.push(e[0])
+return s}}for(i=0;n>i;i++){var r=void 0===e[i]?null:e[i]
+s.push(r)}return s}
+if(this.length=0,this.id=[],null!==e&&void 0!==e)switch(this["class"]=e["class"]||"bundle",this["class"]){case"bundle":var u=[],h=0
+if(this.error=null,this.length=0,"string"==typeof e&&e.length>0&&(e=a(e,"function"==typeof n?n:!1)),null===e||"object"!=typeof e)return this["class"]=null,void(void 0===e&&(delete this.id,delete this["class"],delete this.error,delete this.length))
+if(e.hasOwnProperty("error"))return void(this.error=e.error)
+if("dataset"===e["class"]||"collection"===e["class"])return JSONstat(e)
+for(s in e)h++,u.push(s)
+this.__tree__=e,this.length=h,this.id=u
+break
+case"dataset":e.hasOwnProperty("__tree__")||(delete e["class"],e={__tree__:e}),this.__tree__=i=e.__tree__,this.label=i.label||null,this.note=i.note||null,this.link=i.link||null,this.href=i.href||null,this.updated=i.updated||null,this.source=i.source||null,this.extension=i.extension||null
+var f,c=0
+if(i.hasOwnProperty("value")&&t(i.value))c=i.value.length
+else if(i.hasOwnProperty("status")&&t(i.status))c=i.status.length
+else if(i.hasOwnProperty("dimension")){var d=i.dimension.size,p=1
+for(f=d.length;f--;)p*=d[f]
+c=p}if(this.value=o(i.value,c),this.status=i.hasOwnProperty("status")?o(i.status,c):null,i.hasOwnProperty("dimension")){if(!t(i.dimension.id)||!t(i.dimension.size)||i.dimension.id.length!=i.dimension.size.length)return
+var v=i.dimension,g=v.role||null,y=v.id,_=v.size.length,b=function(t){g.hasOwnProperty(t)||(g[t]=null)}
+if(this.length=_,this.id=y,g&&(b("time"),b("geo"),b("metric"),b("classification")),g&&null===g.classification){var m=[],w=["time","geo","metric"],O=function(t,e){for(var n=e.length;n--;)if(t===e[n])return!0
+return!1}
+for(f=0;3>f;f++){var x=g[w[f]]
+null!==x&&(m=m.concat(x))}for(g.classification=[],f=0;_>f;f++)O(y[f],m)||g.classification.push(y[f])
+0===g.classification.length&&(g.classification=null)}this.role=g,this.n=c
+for(var S=0,k=this.length;k>S;S++)if(v[v.id[S]].category.hasOwnProperty("index")){if(t(v[v.id[S]].category.index)){var P={},D=v[v.id[S]].category.index
+for(r=D.length,l=0;r>l;l++)P[D[l]]=l
+v[v.id[S]].category.index=P}}else{var j=0
+v[v.id[S]].category.index={}
+for(s in v[v.id[S]].category.label)v[v.id[S]].category.index[s]=j++}}else this.length=0
+break
+case"dimension":i=e.__tree__
+var J=[],N=i.category
+if(!e.hasOwnProperty("__tree__")||!i.hasOwnProperty("category"))return
+if(!N.hasOwnProperty("label")){N.label={}
+for(s in N.index)N.label[s]=s}for(s in N.index)J[N.index[s]]=s
+this.__tree__=i,this.label=i.label||null,this.note=i.note||null,this.link=i.link||null,this.href=i.href||null,this.id=J,this.length=J.length,this.role=e.role,this.hierarchy=N.hasOwnProperty("child"),this.extension=i.extension||null
+break
+case"category":var T=e.child
+this.id=T,this.length=null===T?0:T.length,this.index=e.index,this.label=e.label,this.note=e.note||null,this.unit=e.unit,this.coordinates=e.coord
+break
+case"collection":if(this.length=0,this.label=e.label||null,this.note=e.note||null,this.link=e.link||null,this.href=e.href||null,this.updated=e.updated||null,this.source=e.source||null,this.extension=e.extension||null,null!==this.link&&e.link.item){var z=e.link.item
+if(this.length=t(z)?z.length:0,this.length)for(l=0;l<this.length;l++)this.id[l]=z[l].href}}}e.prototype.Item=function(t){if(null===this||"collection"!==this["class"]||!this.length)return null
+if("number"==typeof t)return t>this.length||0>t?null:this.link.item[t]
+var e,n=[]
+if("object"==typeof t){if(!t["class"]&&!t.follow)return null
+t["class"]?e=function(t,e,i){i["class"]===t.link.item[e]["class"]&&n.push(t.link.item[e])}:t.follow&&(e=function(t,e){n.push(JSONstat(t.id[e]))})}else e=function(t,e){n.push(t.link.item[e])}
+for(var i=0;i<this.length;i++)e(this,i,t)
+return n},e.prototype.Dataset=function(t){if(null===this)return null
+if("dataset"===this["class"])return void 0!==t?this:[this]
+if("bundle"!==this["class"])return null
+if(void 0===t){for(var n=[],i=0,s=this.id.length;s>i;i++)n.push(this.Dataset(this.id[i]))
+return n}if("number"==typeof t){var r=this.id[t]
+return void 0!==r?this.Dataset(r):null}var l=this.__tree__[t]
+return void 0===l?null:new e({"class":"dataset",__tree__:l})},e.prototype.Dimension=function(t){var n,i=[],s=this.id.length,r=function(t,e){var n=t.role
+if(null!==n)for(var i in n)for(var s=null!==n[i]?n[i].length:0;s--;)if(n[i][s]===e)return i
+return null}
+if(null===this||"dataset"!==this["class"])return null
+if(void 0===t){for(n=0;s>n;n++)i.push(this.Dimension(this.id[n]))
+return i}if("number"==typeof t){var l=this.id[t]
+return void 0!==l?this.Dimension(l):null}var a=this.__tree__.dimension
+if(void 0===a)return null
+if("object"==typeof t){if(t.hasOwnProperty("role")){for(n=0;s>n;n++){var o=this.id[n]
+r(a,o)===t.role&&i.push(this.Dimension(o))}return void 0===i[0]?null:i}return null}var u=a[t]
+return void 0===u?null:new e({"class":"dimension",__tree__:u,role:r(a,t)})},e.prototype.Category=function(t){if(null===this||"dimension"!==this["class"])return null
+if(void 0===t){for(var n=[],i=0,s=this.id.length;s>i;i++)n.push(this.Category(this.id[i]))
+return n}if("number"==typeof t){var r=this.id[t]
+return void 0!==r?this.Category(r):null}var l=this.__tree__.category
+if(void 0===l)return null
+var a=l.index[t]
+if(void 0===a)return null
+var o=l.unit&&l.unit[t]||null,u=l.coordinates&&l.coordinates[t]||null,h=l.child&&l.child[t]||null,f=l.note&&l.note[t]||null
+return new e({"class":"category",index:a,label:l.label[t],note:f,child:h,unit:o,coord:u})},e.prototype.Data=function(e){var n,i,s=[],r=function(t){for(var e in t)if(t.hasOwnProperty(e))return e},l=function(t,e){for(var n=[],i=t.dimension,s=i.id,l=0,a=s.length;a>l;l++){var o=s[l],u=e[o]
+n.push("string"==typeof u?u:1===i.size[l]?r(i[o].category.index):null)}return n}
+if(null===this||"dataset"!==this["class"])return null
+if(void 0===e){for(i=this.value.length,n=0;i>n;n++)s.push(this.Data(n))
+return s}if("number"==typeof e){var a=this.value[e]
+return void 0!==a?{value:a,status:this.status?this.status[e]:null}:null}var o=this.__tree__,u=o.dimension.size,h=u.length
+if(t(e)){if(this.length!==e.length)return null
+var f=1,c=0,d=[],p=[]
+for(n=0;h>n;n++)if(void 0!==e[n]){if("number"!=typeof e[n]||e[n]>=u[n])return null
+f*=n>0?u[h-n]:1,c+=f*e[h-n-1]}else d.push(n),p.push(u[n])
+if(d.length>1)return null
+if(1===d.length){for(var v=0,g=p[0];g>v;v++){var y=[]
+for(n=0;h>n;n++)y.push(n!==d[0]?e[n]:v)
+s.push(this.Data(y))}return s}return{value:this.value[c],status:this.status?this.status[c]:null}}var _=l(o,e),b=[],m=o.dimension
+for(i=_.length,n=0;i>n;n++)b.push(m[m.id[n]].category.index[_[n]])
+return this.Data(b)},e.prototype.toTable=function(t,e){if(null===this||"dataset"!==this["class"])return null
+1==arguments.length&&"function"==typeof t&&(e=t,t=null)
+var n,i,s,r,l,a=this.__tree__
+if(t=t||{field:"label",content:"label",vlabel:"Value",slabel:"Status",type:"array",status:!1},"function"==typeof e){n=this.toTable(t)
+var o=[],u="array"!==t.type?0:1,h="object"!==t.type?n.slice(u):n.rows.slice(0)
+for(l=h.length,i=0;l>i;i++){var f=e.call(this,h[i],i)
+void 0!==f&&o.push(f)}return"object"===t.type?{cols:n.cols,rows:o}:("array"===t.type&&o.unshift(n[0]),o)}if("arrobj"===t.type){n=this.toTable({field:"id",content:t.content,status:t.status})
+var c=[],d=n.shift()
+for(l=n.length,i=0;l>i;i++){var p={}
+for(s=n[i].length;s--;)p[d[s]]=n[i][s]
+c.push(p)}return c}var v,g,y,_,b="id"===t.field
+if("object"===t.type){var m="number"==typeof this.value[0]||null===this.value[0]?"number":"string"
+v=function(t,e){var n=b&&t||e||t
+z.push({id:t,label:n,type:"string"})},g=function(t,e,n){var i=b&&"value"||t||"Value",s=b&&"status"||e||"Status"
+n&&z.push({id:"status",label:s,type:"string"}),z.push({id:"value",label:i,type:m})},y=function(t){B.push({v:t})},_=function(t){B.push({v:t}),V.push({c:B})}}else v=function(t,e){var n=b&&t||e||t
+z.push(n)},g=function(t,e,n){var i=b&&"value"||t||"Value",s=b&&"status"||e||"Status"
+n&&z.push(s),z.push(i),T.push(z)},y=function(t){B.push(t)},_=function(t){B.push(t),T.push(B)}
+var w=a.dimension,O=w.id,x=O.length,S=w.size
+if(x!=S.length)return!1
+var k=[],P=1,D=1,j=[],J=[],N=[],T=[],z=[],V=[]
+for(i=0;x>i;i++){var q=O[i],C=w[q].label
+v(q,C),P*=S[i],D*=S[i]
+var R=[]
+for(s=0;s<S[i];s++)for(var X in w[O[i]].category.index)if(w[O[i]].category.index[X]===s){var E="id"!==t.content&&w[O[i]].category.label?w[O[i]].category.label[X]:X
+R.push(E)}k.push(R),j.push(D)}for(g(t.vlabel,t.slabel,t.status),l=k.length,i=0;l>i;i++){for(var G=[],A=0,H=k[i].length;H>A;A++)for(var I=0;I<P/j[i];I++)G.push(k[i][A])
+J.push(G)}for(l=J.length,i=0;l>i;i++){var L=[],M=0
+for(r=0;P>r;r++)L.push(J[i][M]),M++,M===J[i].length&&(M=0)
+N.push(L)}for(r=0;P>r;r++){var B=[]
+l=J.length
+for(var F=0;l>F;F++)y(N[F][r])
+t.status&&y(this.status?this.status[r]:null),_(this.value[r])}return"object"===t.type?{cols:z,rows:V}:T},e.prototype.node=function(){return this.__tree__},e.prototype.toString=function(){return this["class"]},e.prototype.toValue=function(){return this.length},JSONstat.jsonstat=e}()
diff --git a/json-stat.max.js b/json-stat.max.js
index 786f19e..8e127e9 100644
--- a/json-stat.max.js
+++ b/json-stat.max.js
@@ -1,6 +1,6 @@
 /*
 
-JSON-stat Javascript Toolkit v. 0.8.2
+JSON-stat Javascript Toolkit v. 0.8.3
 http://json-stat.org
 https://github.com/badosa/JSON-stat
 
@@ -10,7 +10,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0
+  http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,875 +22,888 @@ permissions and limitations under the License.
 
 var JSONstat = JSONstat || {};
 
-JSONstat.version="0.8.2";
+JSONstat.version="0.8.3";
 
 /* jshint newcap:false */
 function JSONstat(resp,f){
-	if(window===this){
-		return new JSONstat.jsonstat(resp,f);
-	}
+  if(window===this){
+    return new JSONstat.jsonstat(resp,f);
+  }
 }
 
 (function(){
-	"use strict";
-
-	function isArray(o) {
-		return Object.prototype.toString.call(o) === "[object Array]";
-	}
-	function Jsonstat(o,f){
-		var
-			xhr=function(uri, func){
-				var json, async=(func!==false), req;
-				if(window.XDomainRequest && /^(http(s)?:)?\/\//.test(uri)){ //IE9 cross-domain (assuming access to same domain won't be specified using an absolute address). Not integrated because it will be removed someday...
-					if(!async){ //JSONstat: IE9 sync cross-domain request? Sorry, not supported (only async if IE9 and cross-domain).
-						return;
-					}
-					req=new XDomainRequest();
-					/*
-					req.onerror=function(){
-						return;  //JSONstat: Can't access "+uri;
-					}
-					*/
-					req.onload=function(){
-						json=JSON.parse(req.responseText);
-						func.call(JSONstat(json));
-					};
-					req.open("GET", uri);
-					req.send();
-				}else{ //Standard xhr
-					req=new XMLHttpRequest();
-					req.onreadystatechange=function(){
-						if(req.readyState===4){
-							var s=req.status;
-							json=(s && req.responseText && (s>=200 && s<300 || s===304)) ? JSON.parse(req.responseText) : null;
-							if(async){
-								func.call(JSONstat(json));
-							}
-						}
-					};
-					req.open("GET",uri,async);
-					req.send(null);
-					if(!async){
-						return json;
-					}
-				}
-			},
-			//sparse cube (value or status)
-			//If only one value/status is provided it means same for all (if more than one, then missing values/statuses are nulled).
-			normalize=function(s,len){
-				var ret=[], l;
-
-				if(typeof s==="string"){
-					s=[s];
-				}
-				if(isArray(s)){
-					if(s.length===len){ //normal case
-						return s;
-					}
-					if(s.length===1){ //all obs same status
-						for(l=0; l<len; l++){
-							ret.push(s[0]);
-						}
-						return ret;
-					}
-				}
-
-				//It's an object (sparse cube) or an incomplete array that must be filled with nulls
-				for(l=0; l<len; l++){
-					var e=(typeof s[l]==="undefined") ? null: s[l];
-					ret.push(e);
-				}
-				return ret;
-			},
-			ot, prop, ilen, i
-		;
-
-		this.length=0;
-		this.id=[];
-		if (o===null || typeof o==="undefined"){
-			return;
-		}
-
-		this.class=o.class || "bundle";
-		switch(this.class){
-			case "bundle" : //Real bundle, or URL (bundle, dataset, collection [dimension, pending]), or error
-				var arr=[], ds=0;
-				this.error=null;
-				this.length=0;
-
-				//URI assumed
-				if(typeof o==="string" && o.length>0){
-					o=xhr(o, typeof f==="function"? f : false);//If second argument is function then async
-				}
-
-				// Wrong input object or wrong URI or connection problem
-				if(o===null || typeof o!=="object"){
-					return;
-				}
-
-				// Explicit error
-				if(o.hasOwnProperty("error")){
-					this.error=o.error;
-					return;
-				}
-
-				//When o is a URI, class won't be set before the request
-				//and it will enter the bundle case: once we have a response
-				//if class if dataset we redirect to case "dataset". 0.7.5
-				if(o.class==="dataset" || o.class==="collection"){
-					return JSONstat(o);
-				}
-
-				for (prop in o){
-					ds++;
-					/* If sparse cube, we can't rely on value to check size
-					if (isArray(o[prop].value)){
-						a++;
-					}
-					*/
-					arr.push(prop);
-				}
-				this.__tree__=o;
-				this.length=ds;
-				this.id=arr;
-			break;
-
-			case "dataset" :
-				//It's a native response of class "dataset"
-				if (!o.hasOwnProperty("__tree__")){
-					delete o.class; //class shouldn't go inside __tree__
-					o={ "__tree__": o }; //remove all elements from o (native response "dataset"), put everything inside __tree__  (native response "bundle")
-				}
-
-				this.__tree__=ot=o.__tree__;
-				this.label=ot.label || null;
-				this.note=ot.note || null; //v.0.7.0
-				this.link=ot.link || null; //v.0.7.0
-				this.href=ot.href || null; //v.0.7.0
-				this.updated=ot.updated || null;
-				this.source=ot.source || null; //v.0.5.0
-				this.extension=ot.extension || null; //v.0.7.0
-
-				//Sparse cube (If toTable() removed, this logic can be moved inside Data()
-				//which is more efficient when retrieving a single value/status.
-				var s, dsize=0; //data size
-				if (ot.hasOwnProperty("value") && isArray(ot.value)){
-					dsize=ot.value.length;
-				}else{
-					if (ot.hasOwnProperty("status") && isArray(ot.status)){
-						dsize=ot.status.length;
-					}else{
-						if(ot.hasOwnProperty("dimension")) {
-							var size=ot.dimension.size, length=1;
-							for(s=size.length; s--;){
-								length*=size[s];
-							}
-							dsize=length;
-						}
-					}
-				}
-
-				this.value=normalize(ot.value,dsize);
-				this.status=(!(ot.hasOwnProperty("status"))) ? null : normalize(ot.status,dsize);
-
-				// if dimensions are defined, id and size arrays are required and must have equal length
-				if (ot.hasOwnProperty("dimension")){
-					if (
-						!(isArray(ot.dimension.id)) ||
-						!(isArray(ot.dimension.size)) ||
-						ot.dimension.id.length!=ot.dimension.size.length
-						){
-						return;
-					}
-					var
-						otd=ot.dimension,
-						otr=otd.role || null,
-						otdi=otd.id,
-						otdl=otd.size.length,
-						createRole=function(s){
-							if(!otr.hasOwnProperty(s)){
-								otr[s]=null;
-							}
-						}
-					;
-
-					this.length=otdl;
-					this.id=otdi;
-
-					if(otr){
-						createRole("time");
-						createRole("geo");
-						createRole("metric");
-						createRole("classification");
-					}
-
-					//If role not null, leave it as it is but add a classification role if it's null. Added in 0.7.1
-					if (otr && otr.classification===null){
-						var
-							gmt=[],
-							roles=["time","geo","metric"],
-							//Replace with polyfill of Array.indefOf at some point?
-							inArray=function(e, a){
-								for(var i=a.length;i--;){
-									if(e===a[i]){
-										return true;
-									}
-								}
-								return false;
-							}
-						;
-
-						for(s=0; s<3; s++){
-							var rr=otr[roles[s]];
-							if(rr!==null){
-								gmt=gmt.concat(rr);
-							}
-						}
-
-						otr.classification=[];
-
-						//not inverse looping to preserve dim order
-						for(s=0; s<otdl; s++){
-							if(!inArray(otdi[s], gmt)){
-								otr.classification.push(otdi[s]);
-							}
-						}
-
-						if(otr.classification.length===0){
-							otr.classification=null;
-						}
-					}
-
-					this.role=otr;
-
-					this.n=dsize; //number of obs added in 0.4.2
-
-					//If only one category, no need of index according to the spec
-					//This actually will recreate an index even if there are more than one category and no index is provided
-					//but because there's no guarantee that properties are retrieved in a particular order (even though it worked in Ch,FF,IE,Sa,Op)
-					//(Main problem in fact is that you don't have to WRITE them in a particular order) the original order of categories could
-					//theoretically be changed. That's why the procedure will only be valid when there's only one category.
-					//Note: If toTable() is removed it would make more sense to move this loop inside Dimension() as it is not needed for Data().
-					for(var d=0, len=this.length; d<len; d++){
-						if (!(otd[otd.id[d]].category.hasOwnProperty("index"))){
-							var c=0;
-							otd[otd.id[d]].category.index={};
-							for (prop in otd[otd.id[d]].category.label){
-								otd[otd.id[d]].category.index[prop]=c++;
-							}
-						}else{
-							// If index is array instead of object convert into object
-							// That is: we normalize it (instead of defining a function depending on
-							// index type to read categories -maybe in the future when indexOf can be
-							// assumed for all browsers and default is array instead of object-)
-							if(isArray(otd[otd.id[d]].category.index)){
-								var oindex={}, index=otd[otd.id[d]].category.index;
-
-								ilen=index.length;
-								for (i=0; i<ilen; i++){
-									oindex[index[i]]=i;
-								}
-								otd[otd.id[d]].category.index=oindex;
-							}
-						}
-					}
-				}else{
-					this.length=0;
-				}
-			break;
-			case "dimension" :
-				ot=o.__tree__;
-				var cats=[], otc=ot.category;
-				if(
-					!o.hasOwnProperty("__tree__") ||
-					!ot.hasOwnProperty("category") //Already tested in the Dimension() / Category() ? method
-					){
-					return;
-				}
-
-				//If no category label, use IDs
-				if(!otc.hasOwnProperty("label")){
-					otc.label={};
-					for (prop in otc.index){
-						otc.label[prop]=prop;
-					}
-				}
-
-				//Array conversion
-				for (prop in otc.index){
-					cats[otc.index[prop]]=prop; //0.4.3 cats.push(prop) won't do because order not in control when index was originally an array and was converted to object by the Toolkit.
-				}
-
-				this.__tree__=ot;
-				//When no dimension label, undefined is returned.
-				//Discarded options: null / dim
-				this.label=ot.label || null;
-				this.note=ot.note || null; //v.0.7.0
-				this.link=ot.link || null; //v.0.7.0
-				this.href=ot.href || null; //v.0.7.0
-				this.id=cats;
-				this.length=cats.length;
-				this.role=o.role;
-				this.hierarchy=otc.hasOwnProperty("child"); //0.6.0
-				this.extension=ot.extension || null; //v.0.7.0
-			break;
-			case "category" :
-				var par=o.child;
-
-				//0.5.0 changed. It was autoreference: id. And length was 0 always
-				this.id=par;
-				this.length=(par===null) ? 0 : par.length;
-
-				this.index=o.index;
-				this.label=o.label;
-				this.note=o.note || null; //v.0.7.0
-
-				this.unit=o.unit; //v.0.5.0
-				this.coordinates=o.coord; //v.0.5.0
-			break;
-			case "collection" : //0.8.0
-				this.length=0;
-				this.label=o.label || null;
-				this.note=o.note || null;
-				this.link=o.link || null;
-				this.href=o.href || null;
-				this.updated=o.updated || null;
-				this.source=o.source || null;
-				this.extension=o.extension || null;
-
-				if(this.link!==null && o.link.item){
-					var item=o.link.item;
-
-					this.length=( isArray(item) ) ? item.length : 0;
-					if(this.length){
-						for(i=0; i<this.length; i++){
-							this.id[i]=item[i].href;
-						}
-					}
-				}
-			break;
-		}
-	}
-
-	Jsonstat.prototype.Item=function(o){ //0.8.0
-		if (this===null || this.class!=="collection" || !this.length){
-			return null;
-		}
-
-		if(typeof o==="number"){
-			if(o>this.length || o<0){
-				return null;
-			}
-			return this.link.item[o];
-		}
-
-		var ret=[], func;
-
-		if(typeof o==="object"){
-			if(o.class){
-				func=function(t,i,c){
-					if(c.class===t.link.item[i].class){
-						ret.push(t.link.item[i]);
-					}
-				};
-			}else{
-				//{follow: true} not documented because sync xhr are deprecated outside of workers. Use only for testing and demoing. That's why it's been defined as incompatible with {class: ...}
-				if(o.follow){
-					func=function(t,i){
-						ret.push(JSONstat(t.id[i]));
-					};
-				}
-			}
-		}else{ //not object, not number: void or string (ignore)
-			func=function(t,i){
-				ret.push(t.link.item[i]);
-			};
-		}
-
-		for(var i=0; i<this.length; i++){
-			func(this,i,o);
-		}
-		return ret;
-	};
-
-	Jsonstat.prototype.Dataset=function(ds){
-		if (this===null){
-			return null;
-		}
-
-		//0.8.1 Dataset responses can be treated as bundle ones
-		if(this.class==="dataset"){
-			return (typeof ds!=="undefined") ? this : [this];
-		}
-
-		if(this.class!=="bundle"){
-			return null;
-		}
-
-		if(typeof ds==="undefined"){
-			var ar=[];
-			for(var c=0, len=this.id.length; c<len; c++){
-				ar.push(this.Dataset(this.id[c]));
-			}
-			return ar;
-		}
-		if(typeof ds==="number"){
-			var num=this.id[ds];
-			return (typeof num!=="undefined") ? this.Dataset(num) : null;
-		}
-
-		var tds=this.__tree__[ds];
-		if(typeof tds==="undefined"){
-			return null;
-		}
-
-		return new Jsonstat({"class" : "dataset", "__tree__": tds});
-	};
-
-	Jsonstat.prototype.Dimension=function(dim){
-		var
-			ar=[],
-			c,
-			len=this.id.length,
-			role=function(otd,dim){
-				var otdr=otd.role;
-				if(otdr!==null){
-					for(var prop in otdr){
-						for(var p=(otdr[prop]!==null ? otdr[prop].length : 0); p--;){
-							if(otdr[prop][p]===dim){
-								return prop;
-							}
-						}
-					}
-				}
-				return null;
-			}
-		;
-
-		if (this===null || this.class!=="dataset"){
-			return null;
-		}
-		if(typeof dim==="undefined"){
-			for(c=0; c<len; c++){
-				ar.push(this.Dimension(this.id[c]));
-			}
-			return ar;
-		}
-		if(typeof dim==="number"){
-			var num=this.id[dim];
-			return (typeof num!=="undefined") ? this.Dimension(num) : null;
-		}
-
-		var otd=this.__tree__.dimension;
-		if(typeof otd==="undefined"){
-			return null;
-		}
-
-		//currently only "role" is supported as filter criterion
-		if(typeof dim==="object"){
-			if(dim.hasOwnProperty("role")){
-				for(c=0; c<len; c++){
-					var oid=this.id[c];
-					if(role(otd,oid)===dim.role){
-						ar.push(this.Dimension(oid));
-					}
-				}
-				return (typeof ar[0]==="undefined") ? null : ar;
-			}else{
-				return null;
-			}
-		}
-
-		var otdd=otd[dim];
-		if(typeof otdd==="undefined"){
-			return null;
-		}
-
-		return new Jsonstat({"class" : "dimension", "__tree__": otdd, "role": role(otd,dim)});
-	};
-
-	Jsonstat.prototype.Category=function(cat){
-		if (this===null || this.class!=="dimension"){
-			return null;
-		}
-		if(typeof cat==="undefined"){
-			var ar=[];
-			for(var c=0, len=this.id.length; c<len; c++){
-				ar.push(this.Category(this.id[c]));
-			}
-			return ar;
-		}
-		if(typeof cat==="number"){
-			var num=this.id[cat];
-			return (typeof num!=="undefined") ? this.Category(num) : null;
-		}
-
-		var oc=this.__tree__.category;
-		if(typeof oc==="undefined"){
-			return null;
-		}
-		var index=oc.index[cat];
-		if(typeof index==="undefined"){
-			return null;
-		}
-
-		var
-			unit=(oc.unit && oc.unit[cat]) || null,
-			coord=(oc.coordinates && oc.coordinates[cat]) || null,
-			child=(oc.child && oc.child[cat]) || null,
-			note=(oc.note && oc.note[cat]) || null
-		;
-		return new Jsonstat({"class" : "category", "index": index, "label": oc.label[cat], "note": note, "child" : child, "unit" : unit, "coord" : coord});
-	};
-
-	Jsonstat.prototype.Data=function(e){
-		var
-			i,
-			ret=[], len,
-			firstprop=function(o){
-				for (var p in o) {
-					if(o.hasOwnProperty(p)){
-						return p;
-					}
-				}
-			},
-			dimObj2Array=function(thisds, obj){
-				var a=[], dim=thisds.dimension, di=dim.id;
-				for (var d=0, len=di.length; d<len; d++){
-					var id=di[d], cat=obj[id];
-					//If dimension not defined and dim size=1, take first category (user not forced to specify single cat dimensions)
-					a.push(typeof cat==="string" ? cat : dim.size[d]===1 ? firstprop(dim[id].category.index) : null);
-				}
-				return a;
-			}
-		;
-
-		if(this===null || this.class!=="dataset"){
-			return null;
-		}
-
-		if(typeof e==="undefined"){
-			//Before 0.4.2
-			//return {"value" : this.value, "status": this.status, "label": tree.label, "length" : this.value.length};
-			//Since 0.4.2: normalized as array of objects
-			len=this.value.length;
-			for(i=0; i<len; i++){
-				ret.push(this.Data(i));
-			}
-			return ret;
-		}
-
-		//Data By Position in original array
-		if(typeof e==="number"){
-			var num=this.value[e];
-			return (typeof num!=="undefined") ?
-				{"value" : num, "status":
-					(this.status) ?
-					this.status[e]
-					:
-					null
-				}
-				:
-				null
-			; /* removed in 0.5.2.2 length: 1 {"value" : undefined, "status": undefined, "length" : 0};*/
-		}
-
-		var tree=this.__tree__, n=tree.dimension.size, dims=n.length;//same as this.length
-
-		//DataByPosition in every dim
-		//If more positions than needed are provided, they will be ignored.
-		//Less positions than needed will return undefined
-		if(isArray(e)){
-			if(this.length!==e.length){ //0.5.2.2
-				return null;
-			}
-			var
-				mult=1,
-				res=0,
-				miss=[],
-				nmiss=[]
-			;
-			//Validate dim index
-			//And loop to find missing dimensions
-			for(i=0; i<dims; i++){
-				if(typeof e[i]!=="undefined"){
-					if(typeof e[i]!=="number" || e[i]>=n[i]){
-						return null; /* removed in 0.5.2.2 {"value" : undefined, "status": undefined, "length" : 0};*/
-					}
-					//Used if normal case (miss.length===0)
-					mult*=(i>0) ? n[(dims-i)] : 1;
-					res+=mult*e[dims-i-1]; //simplified in 0.4.3
-				}else{
-					//Used if missing dimensions miss.length>0
-					miss.push(i); //missing dims
-					nmiss.push(n[i]); //missing dims size
-				}
-			}
-
-			//If all dims are specified, go ahead as usual.
-			//If one non-single dimension is missing create array of results
-			//If more than one non-single dimension is missing, WARNING
-			if(miss.length>1){
-				return null; /* removed in 0.5.2.2 {"value" : undefined, "status": undefined, "length" : 0};*/
-			}
-			if(miss.length===1){
-				for(var c=0, clen=nmiss[0]; c<clen; c++){
-					var na=[]; //new array
-					for(i=0; i<dims; i++){
-						if(i!==miss[0]){
-							na.push(e[i]);
-						}else{
-							na.push(c);
-						}
-					}
-					ret.push(this.Data(na));
-				}
-				return ret;
-			}
-
-			//miss.length===0 (use previously computed res) //simplified in 0.4.3
-			return {"value" : this.value[res], "status": (this.status) ? this.status[res] : null/*, "length" : 1*/};
-		}
-
-		var id=dimObj2Array(tree, e);
-		var pos=[], otd=tree.dimension;
-		len=id.length;
-		for(i=0; i<len; i++){
-			pos.push(otd[otd.id[i]].category.index[id[i]]);
-		}
-		//Dimension cat undefined means a loop (by position) is necessary
-		return this.Data(pos);
-	};
-
-	/*
-		Transformation method: output in DataTable format (array or object)
-		Setup: opts={status: false, slabel: "Status", vlabel: "Value", field: "label", content: "label", type: "array"} (type values: "array" / "object" / "arrobj")
-
-		PENDING: use metric or any dim cat IDs instead of "value" and assign as many fields as metrics (pivot "by").
-	*/
-	Jsonstat.prototype.toTable=function(opts, func){
-		if(this===null || this.class!=="dataset"){
-			return null;
-		}
-
-		if(arguments.length==1 && typeof opts==="function"){
-			func=opts;
-			opts=null;
-		}
-
-		var
-			totbl,
-			dataset=this.__tree__,
-			i, j, x,
-			len
-		;
-
-		opts=opts || {field: "label", content: "label", vlabel: "Value", slabel: "Status", type: "array", status: false} //default: use label for field names and content instead of "id"
-		;
-
-		if(typeof func==="function"){
-			totbl=this.toTable(opts);
-			var
-				ret=[],
-				start=(opts.type!=="array") ? 0 : 1, //first row is header in array and object
-				arr=(opts.type!=="object") ? totbl.slice(start) : totbl.rows.slice(0)
-			;
-
-			len=arr.length;
-			for(i=0; i<len; i++){
-				var a=func.call(
-					this, //0.5.3
-					arr[i], //Discarded for efficiency: (opts.type!=='object') ? arr[i] : arr[i].c,
-					i
-				);
-				if (typeof a!=="undefined"){
-					ret.push(a);
-				}
-			}
-			if (opts.type==='object'){
-				return {cols: totbl.cols, rows: ret};
-			}
-			if(opts.type==='array'){
-				ret.unshift(totbl[0]);
-			}
-			return ret;
-		}
-
-		//For example, as D3 input
-		if(opts.type==="arrobj"){
-			totbl=this.toTable({field: "id", content: opts.content, status: opts.status});// At the moment, options besides "type" are not passed
-
-			var
-				tbl=[],
-				head=totbl.shift()
-			;
-
-			len=totbl.length;
-			for(i=0; i<len; i++){ //Can't be done with i-- as we want to keep the original order
-				var tblr={};
-				for(j=totbl[i].length;j--;){
-					tblr[head[j]]=totbl[i][j];
-				}
-				tbl.push(tblr);
-			}
-			return tbl;
-		}
-
-		var
-			addCol,
-			addColValue,
-			addRow,
-			addRowValue,
-			useid=(opts.field==="id")
-		;
-
-		if(opts.type==="object"){
-			//Object
-			var valuetype=(typeof this.value[0]==="number" || this.value[0]===null) ? "number" : "string"; //cell type inferred from first cell. If null, number is assumed (naif)
-
-			addCol=function(dimid,dimlabel){
-				var label=(useid && dimid) || dimlabel || dimid; //if userid then id; else label; then id if not label
-				cols.push({id: dimid, label: label, type: "string"}); //currently not using datetime Google type (requires a Date object)
-			};
-
-			addColValue=function(str1,str2,status){
-				var
-					vlabel=(useid && "value") || str1|| "Value",
-					slabel=(useid && "status") || str2|| "Status"
-				;
-				if(status){
-					cols.push({id: "status", label: slabel, type: "string"});
-				}
-				cols.push({id: "value", label: vlabel, type: valuetype});
-			};
-
-			addRow=function(r){
-				row.push({v: r});
-			};
-
-			addRowValue=function(r){
-				//At the moment, no support for formatted values (f: formatted)
-				row.push({v: r});
-				rows.push({c: row});
-			};
-
-		}else{
-			//Array
-			addCol=function(dimid,dimlabel){
-				var colid=(useid && dimid) || dimlabel || dimid; //if userid then id; else label; then id if not label
-				cols.push(colid);
-			};
-
-			addColValue=function(str1,str2,status){
-				var
-					vlabel=(useid && "value") || str1 || "Value",
-					slabel=(useid && "status") || str2 || "Status"
-				;
-				if(status){
-					cols.push(slabel);
-				}
-				cols.push(vlabel);
-				table.push(cols);
-			};
-
-			addRow=function(r){
-				row.push(r);
-			};
-
-			addRowValue=function(r){
-				row.push(r);
-				table.push(row);
-			};
-		}
-
-		var
-			dd=dataset.dimension,
-			ddi=dd.id, ddil=ddi.length,
-			dds=dd.size
-		;
-
-		if (ddil!=dds.length){
-			return false;
-		}
-
-		var dim=[], total=1, m=1, mult=[], dimexp=[], label=[], table=[], cols=[], rows=[];
-
-		for (i=0; i<ddil; i++){
-			var	dimid=ddi[i],
-					dimlabel=dd[dimid].label
-			;
-			addCol(dimid,dimlabel); //Global cols
-
-			total*=dds[i];
-			m*=dds[i];
-			var cat=[];
-			for (j=0; j<dds[i]; j++){
-				for (var catid in dd[ddi[i]].category.index){
-					if (dd[ddi[i]].category.index[catid]===j){
-						var rowid=(opts.content!=="id" && dd[ddi[i]].category.label) ? dd[ddi[i]].category.label[catid] : catid; //id if not label (Maybe move label normalization from "dimension" to "dataset"?)
-						cat.push(rowid);
-					}
-				}
-			}
-			dim.push(cat);
-			mult.push(m);
-		}
-		addColValue(opts.vlabel,opts.slabel,opts.status); //Global cols and table
-
-		//end of inversion: now use dim array
-		len=dim.length;
-		for (i=0; i<len; i++){
-			var catexp=[];
-			for (var c=0, len2=dim[i].length; c<len2; c++){
-				//get the label repetitions
-				for (var n=0; n<total/mult[i]; n++){
-					catexp.push(dim[i][c]);
-				}
-			}
-			dimexp.push(catexp);
-		}
-		len=dimexp.length;
-		for (i=0; i<len; i++){
-			var l=[], e=0;
-			for (x=0; x<total; x++){
-				l.push(dimexp[i][e]);
-				e++;
-				if (e===dimexp[i].length){
-					e=0;
-				}
-			}
-			label.push(l);
-		}
-		for (x=0; x<total; x++){
-			var row=[];
-			len=dimexp.length;
-			for (var d=0; d<len; d++){
-				addRow(label[d][x]); //Global row
-			}
-			if(opts.status){
-				addRow(
-					(this.status) ? this.status[x] : null
-				);
-			}
-			addRowValue(this.value[x]); //Global row, rows and table
-		}
-
-		if(opts.type==="object"){
-			return {cols: cols, rows: rows};
-		}else{
-			return table;
-		}
-	};
-
-	Jsonstat.prototype.node=function(){
-		return this.__tree__;
-	};
-	Jsonstat.prototype.toString=function(){
-		return this.class; //improve?
-	};
-	Jsonstat.prototype.toValue=function(){
-		return this.length;
-	};
-
-	JSONstat.jsonstat=Jsonstat;
+  "use strict";
+
+  function isArray(o) {
+    return Object.prototype.toString.call(o) === "[object Array]";
+  }
+  function Jsonstat(o,f){
+    var
+      xhr=function(uri, func){
+        var json, async=(func!==false), req;
+        if(window.XDomainRequest && /^(http(s)?:)?\/\//.test(uri)){ //IE9 cross-domain (assuming access to same domain won't be specified using an absolute address). Not integrated because it will be removed someday...
+          if(!async){ //JSONstat: IE9 sync cross-domain request? Sorry, not supported (only async if IE9 and cross-domain).
+            return;
+          }
+          req=new XDomainRequest();
+          /*
+          req.onerror=function(){
+            return;  //JSONstat: Can't access "+uri;
+          }
+          */
+          req.onload=function(){
+            json=JSON.parse(req.responseText);
+            func.call(JSONstat(json));
+          };
+          req.open("GET", uri);
+          req.send();
+        }else{ //Standard xhr
+          req=new XMLHttpRequest();
+          req.onreadystatechange=function(){
+            if(req.readyState===4){
+              var s=req.status;
+              json=(s && req.responseText && (s>=200 && s<300 || s===304)) ? JSON.parse(req.responseText) : null;
+              if(async){
+                func.call(JSONstat(json));
+              }
+            }
+          };
+          req.open("GET",uri,async);
+          req.send(null);
+          if(!async){
+            return json;
+          }
+        }
+      },
+      //sparse cube (value or status)
+      //If only one value/status is provided it means same for all (if more than one, then missing values/statuses are nulled).
+      normalize=function(s,len){
+        var ret=[], l;
+
+        if(typeof s==="string"){
+          s=[s];
+        }
+        if(isArray(s)){
+          if(s.length===len){ //normal case
+            return s;
+          }
+          if(s.length===1){ //all obs same status
+            for(l=0; l<len; l++){
+              ret.push(s[0]);
+            }
+            return ret;
+          }
+        }
+
+        //It's an object (sparse cube) or an incomplete array that must be filled with nulls
+        for(l=0; l<len; l++){
+          var e=(typeof s[l]==="undefined") ? null: s[l];
+          ret.push(e);
+        }
+        return ret;
+      },
+      ot, prop, ilen, i
+    ;
+
+    this.length=0;
+    this.id=[];
+    if (o===null || typeof o==="undefined"){
+      return;
+    }
+
+    this.class=o.class || "bundle";
+    switch(this.class){
+      case "bundle" : //Real bundle, or URL (bundle, dataset, collection [dimension, pending]), or error
+        var arr=[], ds=0;
+        this.error=null;
+        this.length=0;
+
+        //URI assumed
+        if(typeof o==="string" && o.length>0){
+          o=xhr(o, typeof f==="function"? f : false);//If second argument is function then async
+        }
+
+        // Wrong input object or wrong URI or connection problem
+        // Or async (o is undefined)
+        if(o===null || typeof o!=="object"){
+          this.class=null;
+          // Async: remove properties: they are meaningless (0.8.3)
+          if(typeof o==="undefined"){
+            delete(this.id);
+            delete(this.class);
+            delete(this.error);
+            delete(this.length);
+          }
+          return;
+        }
+
+        // Explicit error
+        if(o.hasOwnProperty("error")){
+          this.error=o.error;
+          return;
+        }
+
+        //When o is a URI, class won't be set before the request
+        //and it will enter the bundle case: once we have a response
+        //if class if dataset we redirect to case "dataset". 0.7.5
+        if(o.class==="dataset" || o.class==="collection"){
+          return JSONstat(o);
+        }
+
+        for (prop in o){
+          ds++;
+          /* If sparse cube, we can't rely on value to check size
+          if (isArray(o[prop].value)){
+            a++;
+          }
+          */
+          arr.push(prop);
+        }
+        this.__tree__=o;
+        this.length=ds;
+        this.id=arr;
+      break;
+
+      case "dataset" :
+        //It's a native response of class "dataset"
+        if (!o.hasOwnProperty("__tree__")){
+          delete o.class; //class shouldn't go inside __tree__
+          o={ "__tree__": o }; //remove all elements from o (native response "dataset"), put everything inside __tree__  (native response "bundle")
+        }
+
+        this.__tree__=ot=o.__tree__;
+        this.label=ot.label || null;
+        this.note=ot.note || null; //v.0.7.0
+        this.link=ot.link || null; //v.0.7.0
+        this.href=ot.href || null; //v.0.7.0
+        this.updated=ot.updated || null;
+        this.source=ot.source || null; //v.0.5.0
+        this.extension=ot.extension || null; //v.0.7.0
+
+        //Sparse cube (If toTable() removed, this logic can be moved inside Data()
+        //which is more efficient when retrieving a single value/status.
+        var s, dsize=0; //data size
+        if (ot.hasOwnProperty("value") && isArray(ot.value)){
+          dsize=ot.value.length;
+        }else{
+          if (ot.hasOwnProperty("status") && isArray(ot.status)){
+            dsize=ot.status.length;
+          }else{
+            if(ot.hasOwnProperty("dimension")) {
+              var size=ot.dimension.size, length=1;
+              for(s=size.length; s--;){
+                length*=size[s];
+              }
+              dsize=length;
+            }
+          }
+        }
+
+        this.value=normalize(ot.value,dsize);
+        this.status=(!(ot.hasOwnProperty("status"))) ? null : normalize(ot.status,dsize);
+
+        // if dimensions are defined, id and size arrays are required and must have equal length
+        if (ot.hasOwnProperty("dimension")){
+          if (
+            !(isArray(ot.dimension.id)) ||
+            !(isArray(ot.dimension.size)) ||
+            ot.dimension.id.length!=ot.dimension.size.length
+            ){
+            return;
+          }
+          var
+            otd=ot.dimension,
+            otr=otd.role || null,
+            otdi=otd.id,
+            otdl=otd.size.length,
+            createRole=function(s){
+              if(!otr.hasOwnProperty(s)){
+                otr[s]=null;
+              }
+            }
+          ;
+
+          this.length=otdl;
+          this.id=otdi;
+
+          if(otr){
+            createRole("time");
+            createRole("geo");
+            createRole("metric");
+            createRole("classification");
+          }
+
+          //If role not null, leave it as it is but add a classification role if it's null. Added in 0.7.1
+          if (otr && otr.classification===null){
+            var
+              gmt=[],
+              roles=["time","geo","metric"],
+              //Replace with polyfill of Array.indefOf at some point?
+              inArray=function(e, a){
+                for(var i=a.length;i--;){
+                  if(e===a[i]){
+                    return true;
+                  }
+                }
+                return false;
+              }
+            ;
+
+            for(s=0; s<3; s++){
+              var rr=otr[roles[s]];
+              if(rr!==null){
+                gmt=gmt.concat(rr);
+              }
+            }
+
+            otr.classification=[];
+
+            //not inverse looping to preserve dim order
+            for(s=0; s<otdl; s++){
+              if(!inArray(otdi[s], gmt)){
+                otr.classification.push(otdi[s]);
+              }
+            }
+
+            if(otr.classification.length===0){
+              otr.classification=null;
+            }
+          }
+
+          this.role=otr;
+
+          this.n=dsize; //number of obs added in 0.4.2
+
+          //If only one category, no need of index according to the spec
+          //This actually will recreate an index even if there are more than one category and no index is provided
+          //but because there's no guarantee that properties are retrieved in a particular order (even though it worked in Ch,FF,IE,Sa,Op)
+          //(Main problem in fact is that you don't have to WRITE them in a particular order) the original order of categories could
+          //theoretically be changed. That's why the procedure will only be valid when there's only one category.
+          //Note: If toTable() is removed it would make more sense to move this loop inside Dimension() as it is not needed for Data().
+          for(var d=0, len=this.length; d<len; d++){
+            if (!(otd[otd.id[d]].category.hasOwnProperty("index"))){
+              var c=0;
+              otd[otd.id[d]].category.index={};
+              for (prop in otd[otd.id[d]].category.label){
+                otd[otd.id[d]].category.index[prop]=c++;
+              }
+            }else{
+              // If index is array instead of object convert into object
+              // That is: we normalize it (instead of defining a function depending on
+              // index type to read categories -maybe in the future when indexOf can be
+              // assumed for all browsers and default is array instead of object-)
+              if(isArray(otd[otd.id[d]].category.index)){
+                var oindex={}, index=otd[otd.id[d]].category.index;
+
+                ilen=index.length;
+                for (i=0; i<ilen; i++){
+                  oindex[index[i]]=i;
+                }
+                otd[otd.id[d]].category.index=oindex;
+              }
+            }
+          }
+        }else{
+          this.length=0;
+        }
+      break;
+      case "dimension" :
+        ot=o.__tree__;
+        var cats=[], otc=ot.category;
+        if(
+          !o.hasOwnProperty("__tree__") ||
+          !ot.hasOwnProperty("category") //Already tested in the Dimension() / Category() ? method
+          ){
+          return;
+        }
+
+        //If no category label, use IDs
+        if(!otc.hasOwnProperty("label")){
+          otc.label={};
+          for (prop in otc.index){
+            otc.label[prop]=prop;
+          }
+        }
+
+        //Array conversion
+        for (prop in otc.index){
+          cats[otc.index[prop]]=prop; //0.4.3 cats.push(prop) won't do because order not in control when index was originally an array and was converted to object by the Toolkit.
+        }
+
+        this.__tree__=ot;
+        //When no dimension label, undefined is returned.
+        //Discarded options: null / dim
+        this.label=ot.label || null;
+        this.note=ot.note || null; //v.0.7.0
+        this.link=ot.link || null; //v.0.7.0
+        this.href=ot.href || null; //v.0.7.0
+        this.id=cats;
+        this.length=cats.length;
+        this.role=o.role;
+        this.hierarchy=otc.hasOwnProperty("child"); //0.6.0
+        this.extension=ot.extension || null; //v.0.7.0
+      break;
+      case "category" :
+        var par=o.child;
+
+        //0.5.0 changed. It was autoreference: id. And length was 0 always
+        this.id=par;
+        this.length=(par===null) ? 0 : par.length;
+
+        this.index=o.index;
+        this.label=o.label;
+        this.note=o.note || null; //v.0.7.0
+
+        this.unit=o.unit; //v.0.5.0
+        this.coordinates=o.coord; //v.0.5.0
+      break;
+      case "collection" : //0.8.0
+        this.length=0;
+        this.label=o.label || null;
+        this.note=o.note || null;
+        this.link=o.link || null;
+        this.href=o.href || null;
+        this.updated=o.updated || null;
+        this.source=o.source || null;
+        this.extension=o.extension || null;
+
+        if(this.link!==null && o.link.item){
+          var item=o.link.item;
+
+          this.length=( isArray(item) ) ? item.length : 0;
+          if(this.length){
+            for(i=0; i<this.length; i++){
+              this.id[i]=item[i].href;
+            }
+          }
+        }
+      break;
+    }
+  }
+
+  Jsonstat.prototype.Item=function(o){ //0.8.0
+    if (this===null || this.class!=="collection" || !this.length){
+      return null;
+    }
+
+    if(typeof o==="number"){
+      if(o>this.length || o<0){
+        return null;
+      }
+      return this.link.item[o];
+    }
+
+    var ret=[], func;
+
+    if(typeof o==="object"){
+      //Do not accept invalid objects (0.8.3)
+      if(!o.class && !o.follow){
+        return null;
+      }
+      if(o.class){
+        func=function(t,i,c){
+          if(c.class===t.link.item[i].class){
+            ret.push(t.link.item[i]);
+          }
+        };
+      }else{
+        //{follow: true} not documented because sync xhr are deprecated outside of workers. Use only for testing and demoing. That's why it's been defined as incompatible with {class: ...}
+        if(o.follow){
+          func=function(t,i){
+            ret.push(JSONstat(t.id[i]));
+          };
+        }
+      }
+    }else{ //not object, not number: void or string (ignore)
+      func=function(t,i){
+        ret.push(t.link.item[i]);
+      };
+    }
+
+    for(var i=0; i<this.length; i++){
+      func(this,i,o);
+    }
+    return ret;
+  };
+
+  Jsonstat.prototype.Dataset=function(ds){
+    if (this===null){
+      return null;
+    }
+
+    //0.8.1 Dataset responses can be treated as bundle ones
+    if(this.class==="dataset"){
+      return (typeof ds!=="undefined") ? this : [this];
+    }
+
+    if(this.class!=="bundle"){
+      return null;
+    }
+
+    if(typeof ds==="undefined"){
+      var ar=[];
+      for(var c=0, len=this.id.length; c<len; c++){
+        ar.push(this.Dataset(this.id[c]));
+      }
+      return ar;
+    }
+    if(typeof ds==="number"){
+      var num=this.id[ds];
+      return (typeof num!=="undefined") ? this.Dataset(num) : null;
+    }
+
+    var tds=this.__tree__[ds];
+    if(typeof tds==="undefined"){
+      return null;
+    }
+
+    return new Jsonstat({"class" : "dataset", "__tree__": tds});
+  };
+
+  Jsonstat.prototype.Dimension=function(dim){
+    var
+      ar=[],
+      c,
+      len=this.id.length,
+      role=function(otd,dim){
+        var otdr=otd.role;
+        if(otdr!==null){
+          for(var prop in otdr){
+            for(var p=(otdr[prop]!==null ? otdr[prop].length : 0); p--;){
+              if(otdr[prop][p]===dim){
+                return prop;
+              }
+            }
+          }
+        }
+        return null;
+      }
+    ;
+
+    if (this===null || this.class!=="dataset"){
+      return null;
+    }
+    if(typeof dim==="undefined"){
+      for(c=0; c<len; c++){
+        ar.push(this.Dimension(this.id[c]));
+      }
+      return ar;
+    }
+    if(typeof dim==="number"){
+      var num=this.id[dim];
+      return (typeof num!=="undefined") ? this.Dimension(num) : null;
+    }
+
+    var otd=this.__tree__.dimension;
+    if(typeof otd==="undefined"){
+      return null;
+    }
+
+    //currently only "role" is supported as filter criterion
+    if(typeof dim==="object"){
+      if(dim.hasOwnProperty("role")){
+        for(c=0; c<len; c++){
+          var oid=this.id[c];
+          if(role(otd,oid)===dim.role){
+            ar.push(this.Dimension(oid));
+          }
+        }
+        return (typeof ar[0]==="undefined") ? null : ar;
+      }else{
+        return null;
+      }
+    }
+
+    var otdd=otd[dim];
+    if(typeof otdd==="undefined"){
+      return null;
+    }
+
+    return new Jsonstat({"class" : "dimension", "__tree__": otdd, "role": role(otd,dim)});
+  };
+
+  Jsonstat.prototype.Category=function(cat){
+    if (this===null || this.class!=="dimension"){
+      return null;
+    }
+    if(typeof cat==="undefined"){
+      var ar=[];
+      for(var c=0, len=this.id.length; c<len; c++){
+        ar.push(this.Category(this.id[c]));
+      }
+      return ar;
+    }
+    if(typeof cat==="number"){
+      var num=this.id[cat];
+      return (typeof num!=="undefined") ? this.Category(num) : null;
+    }
+
+    var oc=this.__tree__.category;
+    if(typeof oc==="undefined"){
+      return null;
+    }
+    var index=oc.index[cat];
+    if(typeof index==="undefined"){
+      return null;
+    }
+
+    var
+      unit=(oc.unit && oc.unit[cat]) || null,
+      coord=(oc.coordinates && oc.coordinates[cat]) || null,
+      child=(oc.child && oc.child[cat]) || null,
+      note=(oc.note && oc.note[cat]) || null
+    ;
+    return new Jsonstat({"class" : "category", "index": index, "label": oc.label[cat], "note": note, "child" : child, "unit" : unit, "coord" : coord});
+  };
+
+  Jsonstat.prototype.Data=function(e){
+    var
+      i,
+      ret=[], len,
+      firstprop=function(o){
+        for (var p in o) {
+          if(o.hasOwnProperty(p)){
+            return p;
+          }
+        }
+      },
+      dimObj2Array=function(thisds, obj){
+        var a=[], dim=thisds.dimension, di=dim.id;
+        for (var d=0, len=di.length; d<len; d++){
+          var id=di[d], cat=obj[id];
+          //If dimension not defined and dim size=1, take first category (user not forced to specify single cat dimensions)
+          a.push(typeof cat==="string" ? cat : dim.size[d]===1 ? firstprop(dim[id].category.index) : null);
+        }
+        return a;
+      }
+    ;
+
+    if(this===null || this.class!=="dataset"){
+      return null;
+    }
+
+    if(typeof e==="undefined"){
+      //Before 0.4.2
+      //return {"value" : this.value, "status": this.status, "label": tree.label, "length" : this.value.length};
+      //Since 0.4.2: normalized as array of objects
+      len=this.value.length;
+      for(i=0; i<len; i++){
+        ret.push(this.Data(i));
+      }
+      return ret;
+    }
+
+    //Data By Position in original array
+    if(typeof e==="number"){
+      var num=this.value[e];
+      return (typeof num!=="undefined") ?
+        {"value" : num, "status":
+          (this.status) ?
+          this.status[e]
+          :
+          null
+        }
+        :
+        null
+      ; /* removed in 0.5.2.2 length: 1 {"value" : undefined, "status": undefined, "length" : 0};*/
+    }
+
+    var tree=this.__tree__, n=tree.dimension.size, dims=n.length;//same as this.length
+
+    //DataByPosition in every dim
+    //If more positions than needed are provided, they will be ignored.
+    //Less positions than needed will return undefined
+    if(isArray(e)){
+      if(this.length!==e.length){ //0.5.2.2
+        return null;
+      }
+      var
+        mult=1,
+        res=0,
+        miss=[],
+        nmiss=[]
+      ;
+      //Validate dim index
+      //And loop to find missing dimensions
+      for(i=0; i<dims; i++){
+        if(typeof e[i]!=="undefined"){
+          if(typeof e[i]!=="number" || e[i]>=n[i]){
+            return null; /* removed in 0.5.2.2 {"value" : undefined, "status": undefined, "length" : 0};*/
+          }
+          //Used if normal case (miss.length===0)
+          mult*=(i>0) ? n[(dims-i)] : 1;
+          res+=mult*e[dims-i-1]; //simplified in 0.4.3
+        }else{
+          //Used if missing dimensions miss.length>0
+          miss.push(i); //missing dims
+          nmiss.push(n[i]); //missing dims size
+        }
+      }
+
+      //If all dims are specified, go ahead as usual.
+      //If one non-single dimension is missing create array of results
+      //If more than one non-single dimension is missing, WARNING
+      if(miss.length>1){
+        return null; /* removed in 0.5.2.2 {"value" : undefined, "status": undefined, "length" : 0};*/
+      }
+      if(miss.length===1){
+        for(var c=0, clen=nmiss[0]; c<clen; c++){
+          var na=[]; //new array
+          for(i=0; i<dims; i++){
+            if(i!==miss[0]){
+              na.push(e[i]);
+            }else{
+              na.push(c);
+            }
+          }
+          ret.push(this.Data(na));
+        }
+        return ret;
+      }
+
+      //miss.length===0 (use previously computed res) //simplified in 0.4.3
+      return {"value" : this.value[res], "status": (this.status) ? this.status[res] : null/*, "length" : 1*/};
+    }
+
+    var id=dimObj2Array(tree, e);
+    var pos=[], otd=tree.dimension;
+    len=id.length;
+    for(i=0; i<len; i++){
+      pos.push(otd[otd.id[i]].category.index[id[i]]);
+    }
+    //Dimension cat undefined means a loop (by position) is necessary
+    return this.Data(pos);
+  };
+
+  /*
+    Transformation method: output in DataTable format (array or object)
+    Setup: opts={status: false, slabel: "Status", vlabel: "Value", field: "label", content: "label", type: "array"} (type values: "array" / "object" / "arrobj")
+
+    PENDING: use metric or any dim cat IDs instead of "value" and assign as many fields as metrics (pivot "by").
+  */
+  Jsonstat.prototype.toTable=function(opts, func){
+    if(this===null || this.class!=="dataset"){
+      return null;
+    }
+
+    if(arguments.length==1 && typeof opts==="function"){
+      func=opts;
+      opts=null;
+    }
+
+    var
+      totbl,
+      dataset=this.__tree__,
+      i, j, x,
+      len
+    ;
+
+    opts=opts || {field: "label", content: "label", vlabel: "Value", slabel: "Status", type: "array", status: false} //default: use label for field names and content instead of "id"
+    ;
+
+    if(typeof func==="function"){
+      totbl=this.toTable(opts);
+      var
+        ret=[],
+        start=(opts.type!=="array") ? 0 : 1, //first row is header in array and object
+        arr=(opts.type!=="object") ? totbl.slice(start) : totbl.rows.slice(0)
+      ;
+
+      len=arr.length;
+      for(i=0; i<len; i++){
+        var a=func.call(
+          this, //0.5.3
+          arr[i], //Discarded for efficiency: (opts.type!=='object') ? arr[i] : arr[i].c,
+          i
+        );
+        if (typeof a!=="undefined"){
+          ret.push(a);
+        }
+      }
+      if (opts.type==='object'){
+        return {cols: totbl.cols, rows: ret};
+      }
+      if(opts.type==='array'){
+        ret.unshift(totbl[0]);
+      }
+      return ret;
+    }
+
+    //For example, as D3 input
+    if(opts.type==="arrobj"){
+      totbl=this.toTable({field: "id", content: opts.content, status: opts.status});// At the moment, options besides "type" are not passed
+
+      var
+        tbl=[],
+        head=totbl.shift()
+      ;
+
+      len=totbl.length;
+      for(i=0; i<len; i++){ //Can't be done with i-- as we want to keep the original order
+        var tblr={};
+        for(j=totbl[i].length;j--;){
+          tblr[head[j]]=totbl[i][j];
+        }
+        tbl.push(tblr);
+      }
+      return tbl;
+    }
+
+    var
+      addCol,
+      addColValue,
+      addRow,
+      addRowValue,
+      useid=(opts.field==="id")
+    ;
+
+    if(opts.type==="object"){
+      //Object
+      var valuetype=(typeof this.value[0]==="number" || this.value[0]===null) ? "number" : "string"; //cell type inferred from first cell. If null, number is assumed (naif)
+
+      addCol=function(dimid,dimlabel){
+        var label=(useid && dimid) || dimlabel || dimid; //if userid then id; else label; then id if not label
+        cols.push({id: dimid, label: label, type: "string"}); //currently not using datetime Google type (requires a Date object)
+      };
+
+      addColValue=function(str1,str2,status){
+        var
+          vlabel=(useid && "value") || str1|| "Value",
+          slabel=(useid && "status") || str2|| "Status"
+        ;
+        if(status){
+          cols.push({id: "status", label: slabel, type: "string"});
+        }
+        cols.push({id: "value", label: vlabel, type: valuetype});
+      };
+
+      addRow=function(r){
+        row.push({v: r});
+      };
+
+      addRowValue=function(r){
+        //At the moment, no support for formatted values (f: formatted)
+        row.push({v: r});
+        rows.push({c: row});
+      };
+
+    }else{
+      //Array
+      addCol=function(dimid,dimlabel){
+        var colid=(useid && dimid) || dimlabel || dimid; //if userid then id; else label; then id if not label
+        cols.push(colid);
+      };
+
+      addColValue=function(str1,str2,status){
+        var
+          vlabel=(useid && "value") || str1 || "Value",
+          slabel=(useid && "status") || str2 || "Status"
+        ;
+        if(status){
+          cols.push(slabel);
+        }
+        cols.push(vlabel);
+        table.push(cols);
+      };
+
+      addRow=function(r){
+        row.push(r);
+      };
+
+      addRowValue=function(r){
+        row.push(r);
+        table.push(row);
+      };
+    }
+
+    var
+      dd=dataset.dimension,
+      ddi=dd.id, ddil=ddi.length,
+      dds=dd.size
+    ;
+
+    if (ddil!=dds.length){
+      return false;
+    }
+
+    var dim=[], total=1, m=1, mult=[], dimexp=[], label=[], table=[], cols=[], rows=[];
+
+    for (i=0; i<ddil; i++){
+      var	dimid=ddi[i],
+          dimlabel=dd[dimid].label
+      ;
+      addCol(dimid,dimlabel); //Global cols
+
+      total*=dds[i];
+      m*=dds[i];
+      var cat=[];
+      for (j=0; j<dds[i]; j++){
+        for (var catid in dd[ddi[i]].category.index){
+          if (dd[ddi[i]].category.index[catid]===j){
+            var rowid=(opts.content!=="id" && dd[ddi[i]].category.label) ? dd[ddi[i]].category.label[catid] : catid; //id if not label (Maybe move label normalization from "dimension" to "dataset"?)
+            cat.push(rowid);
+          }
+        }
+      }
+      dim.push(cat);
+      mult.push(m);
+    }
+    addColValue(opts.vlabel,opts.slabel,opts.status); //Global cols and table
+
+    //end of inversion: now use dim array
+    len=dim.length;
+    for (i=0; i<len; i++){
+      var catexp=[];
+      for (var c=0, len2=dim[i].length; c<len2; c++){
+        //get the label repetitions
+        for (var n=0; n<total/mult[i]; n++){
+          catexp.push(dim[i][c]);
+        }
+      }
+      dimexp.push(catexp);
+    }
+    len=dimexp.length;
+    for (i=0; i<len; i++){
+      var l=[], e=0;
+      for (x=0; x<total; x++){
+        l.push(dimexp[i][e]);
+        e++;
+        if (e===dimexp[i].length){
+          e=0;
+        }
+      }
+      label.push(l);
+    }
+    for (x=0; x<total; x++){
+      var row=[];
+      len=dimexp.length;
+      for (var d=0; d<len; d++){
+        addRow(label[d][x]); //Global row
+      }
+      if(opts.status){
+        addRow(
+          (this.status) ? this.status[x] : null
+        );
+      }
+      addRowValue(this.value[x]); //Global row, rows and table
+    }
+
+    if(opts.type==="object"){
+      return {cols: cols, rows: rows};
+    }else{
+      return table;
+    }
+  };
+
+  Jsonstat.prototype.node=function(){
+    return this.__tree__;
+  };
+  Jsonstat.prototype.toString=function(){
+    return this.class; //improve?
+  };
+  Jsonstat.prototype.toValue=function(){
+    return this.length;
+  };
+
+  JSONstat.jsonstat=Jsonstat;
 })();
diff --git a/module.js b/module.js
index 18cd26d..4ceb4e9 100644
--- a/module.js
+++ b/module.js
@@ -1,6 +1,6 @@
 /*
 
-JSON-stat Javascript Toolkit v. 0.8.2 (Nodejs module)
+JSON-stat Javascript Toolkit v. 0.8.3 (Nodejs module)
 http://json-stat.org
 https://github.com/badosa/JSON-stat
 
@@ -22,7 +22,7 @@ permissions and limitations under the License.
 
 var JSONstat = JSONstat || {};
 
-JSONstat.version="0.8.2";
+JSONstat.version="0.8.3";
 
 /* jshint newcap:false */
 function JSONstat(resp,f){
@@ -86,8 +86,9 @@ function JSONstat(resp,f){
 					console.log("Module does not accept a URI string, must be an object."); //nodejs
 				}
 
-				// Wrong input object or wrong URI or connection problem
+				// Wrong input object (nodejs)
 				if(o===null || typeof o!=="object"){
+          this.class=null;
 					return;
 				}
 
@@ -350,6 +351,10 @@ function JSONstat(resp,f){
 		var ret=[], func;
 
 		if(typeof o==="object"){
+      //Do not accept invalid objects (0.8.3)
+      if(!o.class && !o.follow){
+        return null;
+      }
 			if(o.class){
 				func=function(t,i,c){
 					if(c.class===t.link.item[i].class){
diff --git a/package.json b/package.json
index 0378ff7..0879b4e 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {},
 	"devDependencies": {},
-	"version"       : "0.8.2",
+	"version"       : "0.8.3",
 	"license"       : "Apache",
 	"files"         : ["module.js", "LICENSE", "README.md", "nodejs.js"]
-}
\ No newline at end of file
+}