diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4db5133..9e0fba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ but not limited to API changes and file location changes.  Minor behavioral
 changes may not be included if they are not expected to break existing code.
 
 
+## Unreleased
+
+* `cellDates` affects parsing in non-XLSX formats
+
 ## 0.9.3 (2017-03-15)
 
 * XLML property names are more closely mapped to the XLSX equivalent
diff --git a/LICENSE b/LICENSE
index b5cebe6..bf49d68 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,192 @@
-Copyright (C) 2012-present  SheetJS
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (C) 2012-present   SheetJS LLC 
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -11,7 +199,3 @@ Copyright (C) 2012-present  SheetJS
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-Except where noted, this license applies to any and all software programs and associated documentation files created by the Original Author and distributed with the Software:
-
-'jszip.js' is a modified version of JSZip, Copyright (c) Stuart Knightley, David Duponchel, Franz Buchinger, Ant'onio Afonso.  JSZip is dual licensed and is used according to the terms of the MIT License.
diff --git a/README.md b/README.md
index 5cf85a6..857cb1e 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ with a unified JS representation, and ES3/ES5 browser compatibility back to IE6.
   * [General Structures](#general-structures)
   * [Cell Object](#cell-object)
     + [Data Types](#data-types)
+    + [Dates](#dates)
   * [Worksheet Object](#worksheet-object)
   * [Workbook Object](#workbook-object)
   * [Document Features](#document-features)
@@ -484,6 +485,19 @@ Type `z` represents blank stub cells.  These do not have any data or type, and
 are not processed by any of the core library functions.  By default these cells
 will not be generated; the parser `sheetStubs` option must be set to `true`.
 
+#### Dates
+
+By default, Excel stores dates as numbers with a format code that specifies date
+processing.  For example, the date `19-Feb-17` is stored as the number `42785`
+with a number format of `d-mmm-yy`.  The `SSF` module understands number formats
+and performs the appropriate conversion.
+
+XLSX also supports a special date type `d` where the data is an ISO 8601 date
+string.  The formatter converts the date back to a number.
+
+The default behavior for all parsers is to generate number cells.  Setting
+`cellDates` to true will force the generators to store dates.
+
 ### Worksheet Object
 
 Each key that does not start with `!` maps to a cell (using `A-1` notation)
@@ -1117,7 +1131,7 @@ Worksheet File Format (From Lotus) December 1984
 
 ## Badges
 
-[![Build Status](https://saucelabs.com/browser-matrix/xlsx.svg)](https://saucelabs.com/u/xlsx)
+[![Build Status](https://saucelabs.com/browser-matrix/sheetjs.svg)](https://saucelabs.com/u/sheetjs)
 
 [![Build Status](https://travis-ci.org/SheetJS/js-xlsx.svg?branch=master)](https://travis-ci.org/SheetJS/js-xlsx)
 
diff --git a/bits/10_ssf.js b/bits/10_ssf.js
index 715a869..2a2f67d 100644
--- a/bits/10_ssf.js
+++ b/bits/10_ssf.js
@@ -2,7 +2,7 @@
 /*jshint -W041 */
 var SSF = {};
 var make_ssf = function make_ssf(SSF){
-SSF.version = '0.8.1';
+SSF.version = '0.9.0';
 function _strrev(x/*:string*/)/*:string*/ { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; }
 function fill(c/*:string*/,l/*:number*/)/*:string*/ { var o = ""; while(o.length < l) o+=c; return o; }
 function pad0(v/*:any*/,d/*:number*/)/*:string*/{var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
@@ -55,7 +55,7 @@ var table_fmt = {
 	/*::[*/56/*::]*/: '"上午/下午 "hh"時"mm"分"ss"秒 "',
 	/*::[*/65535/*::]*/: 'General'
 };
-var days = [
+var days/*:Array<Array<string> >*/ = [
 	['Sun', 'Sunday'],
 	['Mon', 'Monday'],
 	['Tue', 'Tuesday'],
@@ -64,7 +64,7 @@ var days = [
 	['Fri', 'Friday'],
 	['Sat', 'Saturday']
 ];
-var months = [
+var months/*:Array<Array<string> >*/ = [
 	['J', 'Jan', 'January'],
 	['F', 'Feb', 'February'],
 	['M', 'Mar', 'March'],
@@ -452,8 +452,11 @@ function write_num_int(type/*:string*/, fmt/*:string*/, val/*:number*/)/*:string
 	if((r = fmt.match(frac1))) return write_num_f2(r, aval, sign);
 	if(fmt.match(/^#+0+$/)) return sign + pad0(aval,fmt.length - fmt.indexOf("0"));
 	if((r = fmt.match(dec1))) {
-		// $FlowIgnore
-		o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.(\d*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); });
+		/*:: if(!Array.isArray(r)) throw "unreachable"; */
+		o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]);
+		o = o.replace(/\.(\d*)$/,function($$, $1) {
+		/*:: if(!Array.isArray(r)) throw "unreachable"; */
+			return "." + $1 + fill("0", r[1].length-$1.length); });
 		return fmt.indexOf("0.") !== -1 ? o : o.replace(/^0\./,".");
 	}
 	fmt = fmt.replace(/^#+([0.])/, "$1");
@@ -533,6 +536,47 @@ function split_fmt(fmt/*:string*/)/*:Array<string>*/ {
 }
 SSF._split = split_fmt;
 var abstime = /\[[HhMmSs]*\]/;
+function fmt_is_date(fmt/*:string*/)/*:boolean*/ {
+	var i = 0, cc = 0, c = "", o = "";
+	while(i < fmt.length) {
+		switch((c = fmt.charAt(i))) {
+			case 'G': if(isgeneral(fmt, i)) i+= 6; i++; break;
+			case '"': for(;(cc=fmt.charCodeAt(++i)) !== 34 && i < fmt.length;) ++i; ++i; break;
+			case '\\': i+=2; break;
+			case '_': i+=2; break;
+			case '@': ++i; break;
+			case 'B': case 'b':
+				if(fmt.charAt(i+1) === "1" || fmt.charAt(i+1) === "2") return true;
+				/* falls through */
+			case 'M': case 'D': case 'Y': case 'H': case 'S': case 'E':
+				/* falls through */
+			case 'm': case 'd': case 'y': case 'h': case 's': case 'e': case 'g': return true;
+			case 'A':
+				if(fmt.substr(i, 3) === "A/P") return true;
+				if(fmt.substr(i, 5) === "AM/PM") return true;
+				++i; break;
+			case '[':
+				o = c;
+				while(fmt.charAt(i++) !== ']' && i < fmt.length) o += fmt.charAt(i);
+				if(o.match(abstime)) return true;
+				break;
+			case '.':
+				/* falls through */
+			case '0': case '#':
+				while(i < fmt.length && ("0#?.,E+-%".indexOf(c=fmt.charAt(++i)) > -1 || c=='\\' && fmt.charAt(i+1) == "-" && "0#".indexOf(fmt.charAt(i+2))>-1));
+				break;
+			case '?': while(fmt.charAt(++i) === c); break;
+			case '*': ++i; if(fmt.charAt(i) == ' ' || fmt.charAt(i) == '*') ++i; break;
+			case '(': case ')': ++i; break;
+			case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+				while(i < fmt.length && "0123456789".indexOf(fmt.charAt(++i)) > -1); break;
+			case ' ': ++i; break;
+			default: ++i; break;
+		}
+	}
+	return false;
+}
+SSF.is_date = fmt_is_date;
 function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 	var out = [], o = "", i = 0, c = "", lst='t', q, dt, j, cc;
 	var hr='H';
@@ -545,14 +589,14 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 			case '"': /* Literal text */
 				for(o="";(cc=fmt.charCodeAt(++i)) !== 34 && i < fmt.length;) o += String.fromCharCode(cc);
 				out[out.length] = {t:'t', v:o}; ++i; break;
-			case '\\': var w = fmt[++i], t = (w === "(" || w === ")") ? w : 't';
+			case '\\': var w = fmt.charAt(++i), t = (w === "(" || w === ")") ? w : 't';
 				out[out.length] = {t:t, v:w}; ++i; break;
 			case '_': out[out.length] = {t:'t', v:" "}; i+=2; break;
 			case '@': /* Text Placeholder */
 				out[out.length] = {t:'T', v:v}; ++i; break;
 			case 'B': case 'b':
-				if(fmt[i+1] === "1" || fmt[i+1] === "2") {
-					if(dt==null) { dt=parse_date_code(v, opts, fmt[i+1] === "2"); if(dt==null) return ""; }
+				if(fmt.charAt(i+1) === "1" || fmt.charAt(i+1) === "2") {
+					if(dt==null) { dt=parse_date_code(v, opts, fmt.charAt(i+1) === "2"); if(dt==null) return ""; }
 					out[out.length] = {t:'X', v:fmt.substr(i,2)}; lst = c; i+=2; break;
 				}
 				/* falls through */
@@ -562,7 +606,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 			case 'm': case 'd': case 'y': case 'h': case 's': case 'e': case 'g':
 				if(v < 0) return "";
 				if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; }
-				o = c; while(++i<fmt.length && fmt[i].toLowerCase() === c) o+=c;
+				o = c; while(++i<fmt.length && fmt.charAt(i).toLowerCase() === c) o+=c;
 				if(c === 'm' && lst.toLowerCase() === 'h') c = 'M'; /* m = minute */
 				if(c === 'h') c = hr;
 				out[out.length] = {t:c, v:o}; lst = c; break;
@@ -576,8 +620,8 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 				out[out.length] = q; lst = c; break;
 			case '[':
 				o = c;
-				while(fmt[i++] !== ']' && i < fmt.length) o += fmt[i];
-				if(o.substr(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
+				while(fmt.charAt(i++) !== ']' && i < fmt.length) o += fmt.charAt(i);
+				if(o.slice(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
 				if(o.match(abstime)) {
 					if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; }
 					out[out.length] = {t:'Z', v:o.toLowerCase()};
@@ -586,20 +630,20 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 			/* Numbers */
 			case '.':
 				if(dt != null) {
-					o = c; while((c=fmt[++i]) === "0") o += c;
+					o = c; while((c=fmt.charAt(++i)) === "0") o += c;
 					out[out.length] = {t:'s', v:o}; break;
 				}
 				/* falls through */
 			case '0': case '#':
-				o = c; while("0#?.,E+-%".indexOf(c=fmt[++i]) > -1 || c=='\\' && fmt[i+1] == "-" && "0#".indexOf(fmt[i+2])>-1) o += c;
+				o = c; while(++i < fmt.length && "0#?.,E+-%".indexOf(c=fmt.charAt(i)) > -1 || c=='\\' && fmt.charAt(i+1) == "-" && "0#".indexOf(fmt.charAt(i+2))>-1) o += c;
 				out[out.length] = {t:'n', v:o}; break;
 			case '?':
-				o = c; while(fmt[++i] === c) o+=c;
+				o = c; while(fmt.charAt(++i) === c) o+=c;
 				q={t:c, v:o}; out[out.length] = q; lst = c; break;
-			case '*': ++i; if(fmt[i] == ' ' || fmt[i] == '*') ++i; break; // **
+			case '*': ++i; if(fmt.charAt(i) == ' ' || fmt.charAt(i) == '*') ++i; break; // **
 			case '(': case ')': out[out.length] = {t:(flen===1?'t':c), v:c}; ++i; break;
 			case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				o = c; while("0123456789".indexOf(fmt[++i]) > -1) o+=fmt[i];
+				o = c; while(i < fmt.length && "0123456789".indexOf(fmt.charAt(++i)) > -1) o+=fmt.charAt(i);
 				out[out.length] = {t:'D', v:o}; break;
 			case ' ': out[out.length] = {t:c, v:c}; ++i; break;
 			default:
diff --git a/bits/42_sstxml.js b/bits/42_sstxml.js
index f2c30f9..f49643a 100644
--- a/bits/42_sstxml.js
+++ b/bits/42_sstxml.js
@@ -31,7 +31,7 @@ var parse_rs = (function parse_rs_factory() {
 		var m = rpr.match(tagregex), i = 0;
 		if(m) for(;i!=m.length; ++i) {
 			var y = parsexmltag(m[i]);
-			switch(y[0]) {
+			switch(y[0].replace(/\w*:/g,"")) {
 				/* 18.8.12 condense CT_BooleanProperty */
 				/* ** not required . */
 				case '<condense': break;
diff --git a/bits/67_wsxml.js b/bits/67_wsxml.js
index fc2c1fb..a2390b8 100644
--- a/bits/67_wsxml.js
+++ b/bits/67_wsxml.js
@@ -249,7 +249,9 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 			if(guess.e.c < idx) guess.e.c = idx;
 			/* 18.18.11 t ST_CellType */
 			switch(p.t) {
-				case 'n': p.v = parseFloat(p.v); break;
+				case 'n':
+					p.v = parseFloat(p.v);
+					break;
 				case 's':
 					sstr = strs[parseInt(p.v, 10)];
 					if(typeof p.v == 'undefined') {
@@ -274,7 +276,7 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 				case 'd':
 					if(!opts.cellDates) { p.v = datenum(new Date(p.v)); p.t = 'n'; }
 					break;
-				/* error string in .v, number in .v */
+				/* error string in .w, number in .v */
 				case 'e': p.w = p.v; p.v = RBErr[p.v]; break;
 			}
 			/* formatting */
@@ -287,6 +289,9 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 				}
 			}
 			safe_format(p, fmtid, fillid, opts, themes, styles);
+			if(opts.cellDates && do_format && p.t == 'n' && SSF.is_date(SSF._table[fmtid])) {
+				var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+			}
 			s[tag.r] = p;
 		}
 	}
diff --git a/bits/68_wsbin.js b/bits/68_wsbin.js
index 0232b05..c705b57 100644
--- a/bits/68_wsbin.js
+++ b/bits/68_wsbin.js
@@ -332,6 +332,9 @@ function parse_ws_bin(data, opts, rels, wb, themes, styles)/*:Worksheet*/ {
 				if(refguess.s.c > C) refguess.s.c = C;
 				if(refguess.e.r < row.r) refguess.e.r = row.r;
 				if(refguess.e.c < C) refguess.e.c = C;
+				if(opts.cellDates && cf && p.t == 'n' && SSF.is_date(SSF._table[cf.ifmt])) {
+					var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+				}
 				break;
 
 			case 'BrtCellBlank': if(!opts.sheetStubs) break;
diff --git a/bits/75_xlml.js b/bits/75_xlml.js
index 6bc3882..b540485 100644
--- a/bits/75_xlml.js
+++ b/bits/75_xlml.js
@@ -69,7 +69,11 @@ function safe_format_xlml(cell/*:Cell*/, nf, o) {
 			else cell.w = SSF._general(cell.v);
 		}
 		else cell.w = xlml_format(nf||"General", cell.v);
-		if(o.cellNF) cell.z = XLMLFormatMap[nf]||nf||"General";
+		var z = XLMLFormatMap[nf]||nf||"General";
+		if(o.cellNF) cell.z = z;
+		if(o.cellDates && cell.t == 'n' && SSF.is_date(z)) {
+			var _d = SSF.parse_date_code(cell.v); if(_d) { cell.t = 'd'; cell.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+		}
 	} catch(e) { if(o.WTF) throw e; }
 }
 
@@ -801,7 +805,7 @@ function write_ws_xlml_cell(cell, ref, ws, opts, idx, wb, addr)/*:string*/{
 	if(opts && opts.type == 'binary' && typeof cptable !== 'undefined' && cell.t == 's') {
 		_v = cptable.utils.encode(65001, _v);
 		var __v = "";
-		for(__i = 0; __i < _v.length; ++__i) __v += String.fromCharCode(_v[__i]);
+		for(var __i = 0; __i < _v.length; ++__i) __v += String.fromCharCode(_v[__i]);
 		_v = __v;
 	}
 	var m = '<Data ss:Type="' + t + '">' + _v + '</Data>';
diff --git a/bits/76_xls.js b/bits/76_xls.js
index 0e4a8f4..bd4d2f0 100644
--- a/bits/76_xls.js
+++ b/bits/76_xls.js
@@ -67,6 +67,9 @@ function safe_format_xf(p/*:any*/, opts/*:ParseOpts*/, date1904/*:?boolean*/) {
 			else p.w = SSF._general(p.v);
 		}
 		else p.w = SSF.format(fmtid,p.v, {date1904:!!date1904});
+		if(opts.cellDates && fmtid && p.t == 'n' && SSF.is_date(SSF._table[fmtid])) {
+			var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+		}
 		if(opts.cellNF) p.z = SSF._table[fmtid];
 	} catch(e) { if(opts.WTF) throw e; }
 }
diff --git a/bits/90_utils.js b/bits/90_utils.js
index fccdd0c..1c12129 100644
--- a/bits/90_utils.js
+++ b/bits/90_utils.js
@@ -123,8 +123,7 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/){
 			switch(val.t){
 				case 'z': continue;
 				case 'e': continue;
-				case 's': break;
-				case 'b': case 'n': break;
+				case 's': case 'd': case 'b': case 'n': break;
 				default: throw 'unrecognized type ' + val.t;
 			}
 			if(v !== undefined) {
diff --git a/dist/LICENSE b/dist/LICENSE
index b5cebe6..bf49d68 100644
--- a/dist/LICENSE
+++ b/dist/LICENSE
@@ -1,4 +1,192 @@
-Copyright (C) 2012-present  SheetJS
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (C) 2012-present   SheetJS LLC 
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -11,7 +199,3 @@ Copyright (C) 2012-present  SheetJS
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-Except where noted, this license applies to any and all software programs and associated documentation files created by the Original Author and distributed with the Software:
-
-'jszip.js' is a modified version of JSZip, Copyright (c) Stuart Knightley, David Duponchel, Franz Buchinger, Ant'onio Afonso.  JSZip is dual licensed and is used according to the terms of the MIT License.
diff --git a/docbits/52_datatype.md b/docbits/52_datatype.md
index 48690ee..f157435 100644
--- a/docbits/52_datatype.md
+++ b/docbits/52_datatype.md
@@ -37,3 +37,16 @@ Type `z` represents blank stub cells.  These do not have any data or type, and
 are not processed by any of the core library functions.  By default these cells
 will not be generated; the parser `sheetStubs` option must be set to `true`.
 
+#### Dates
+
+By default, Excel stores dates as numbers with a format code that specifies date
+processing.  For example, the date `19-Feb-17` is stored as the number `42785`
+with a number format of `d-mmm-yy`.  The `SSF` module understands number formats
+and performs the appropriate conversion.
+
+XLSX also supports a special date type `d` where the data is an ISO 8601 date
+string.  The formatter converts the date back to a number.
+
+The default behavior for all parsers is to generate number cells.  Setting
+`cellDates` to true will force the generators to store dates.
+
diff --git a/package.json b/package.json
index 9cc72e1..51926f2 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
 	},
 	"dependencies": {
 		"exit-on-epipe":"~1.0.0",
-		"ssf":"~0.8.1",
+		"ssf":"~0.9.0",
 		"codepage":"~1.7.0",
 		"cfb":"~0.11.0",
 		"crc-32":"~1.0.0",
diff --git a/shim.js b/shim.js
index e3d7840..b674683 100644
--- a/shim.js
+++ b/shim.js
@@ -235,3 +235,69 @@ if (typeof ArrayBuffer !== 'undefined' && !ArrayBuffer.prototype.slice) {
     return target;
   };
 }
+
+// https://github.com/davidchambers/Base64.js
+// (C) 2015 David Chambers
+// Base64.js may be freely distributed under the Apache 2.0 License.
+
+;(function () {
+
+  var object = typeof exports != 'undefined' ? exports : self; // #8: web workers
+  var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+  function InvalidCharacterError(message) {
+    this.message = message;
+  }
+  InvalidCharacterError.prototype = new Error;
+  InvalidCharacterError.prototype.name = 'InvalidCharacterError';
+
+  // encoder
+  // [https://gist.github.com/999166] by [https://github.com/nignag]
+  object.btoa || (
+  object.btoa = function (input) {
+    var str = String(input);
+    for (
+      // initialize result and counter
+      var block, charCode, idx = 0, map = chars, output = '';
+      // if the next str index does not exist:
+      //   change the mapping table to "="
+      //   check if d has no fractional digits
+      str.charAt(idx | 0) || (map = '=', idx % 1);
+      // "8 - idx % 1 * 8" generates the sequence 2, 4, 6, 8
+      output += map.charAt(63 & block >> 8 - idx % 1 * 8)
+    ) {
+      charCode = str.charCodeAt(idx += 3/4);
+      if (charCode > 0xFF) {
+        throw new InvalidCharacterError("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range.");
+      }
+      block = block << 8 | charCode;
+    }
+    return output;
+  });
+
+  // decoder
+  // [https://gist.github.com/1020396] by [https://github.com/atk]
+  object.atob || (
+  object.atob = function (input) {
+    var str = String(input).replace(/=+$/, '');
+    if (str.length % 4 == 1) {
+      throw new InvalidCharacterError("'atob' failed: The string to be decoded is not correctly encoded.");
+    }
+    for (
+      // initialize result and counters
+      var bc = 0, bs, buffer, idx = 0, output = '';
+      // get next character
+      buffer = str.charAt(idx++);
+      // character found in table? initialize bit storage and add its ascii value;
+      ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer,
+        // and if not first of each 4 characters,
+        // convert the first 8 bits to one ascii character
+        bc++ % 4) ? output += String.fromCharCode(255 & bs >> (-2 * bc & 6)) : 0
+    ) {
+      // try to find character in table (0-63, not found => -1)
+      buffer = chars.indexOf(buffer);
+    }
+    return output;
+  });
+
+}());
diff --git a/test.js b/test.js
index 62ac8aa..5bde88a 100644
--- a/test.js
+++ b/test.js
@@ -64,6 +64,8 @@ var paths = {
 	nfxml:  dir + 'number_format.xls.xml',
 	nfxlsx:  dir + 'number_format.xlsm',
 	nfxlsb:  dir + 'number_format.xlsb',
+	dtxls:  dir + 'xlsx-stream-d-date-cell.xls',
+	dtxml:  dir + 'xlsx-stream-d-date-cell.xls.xml',
 	dtxlsx:  dir + 'xlsx-stream-d-date-cell.xlsx',
 	dtxlsb:  dir + 'xlsx-stream-d-date-cell.xlsb',
 	cwxls:  dir + 'column_width.xlsx',
@@ -71,7 +73,6 @@ var paths = {
 	cwxml:  dir + 'column_width.xml',
 	cwxlsx:  dir + 'column_width.xlsx',
 	cwxlsb:  dir + 'column_width.xlsx',
-	dtxlsb:  dir + 'xlsx-stream-d-date-cell.xlsb',
 	swcxls: dir + 'apachepoi_SimpleWithComments.xls',
 	swcxml: dir + '2011/apachepoi_SimpleWithComments.xls.xml',
 	swcxlsx: dir + 'apachepoi_SimpleWithComments.xlsx',
@@ -324,16 +325,6 @@ describe('parse options', function() {
 				});
 			});
 		});
-		it('XLSB should not generate cell dates', function() {
-			var wb = X.readFile(paths.dtxlsb, {cellDates: true});
-			wb.SheetNames.forEach(function(s) {
-				var ws = wb.Sheets[s];
-				Object.keys(ws).forEach(function(addr) {
-					if(addr[0] === "!" || !ws.hasOwnProperty(addr)) return;
-					assert(ws[addr].t !== 'd');
-				});
-			});
-		});
 		it('XLSX should generate cell dates when requested', function() {
 			var wb = X.readFile(paths.dtxlsx, {cellDates: true});
 			var found = false;
@@ -804,6 +795,31 @@ describe('parse features', function() {
 		});
 	});
 
+	describe('cellDates', function() {
+		var fmts = [
+			/* desc     path        sheet     cell   formatted */
+			['XLSX', paths.dtxlsx, 'Sheet1',  'B5',  '2/14/14'],
+			['XLSB', paths.dtxlsb, 'Sheet1',  'B5',  '2/14/14'],
+			['XLS',  paths.dtxls,  'Sheet1',  'B5',  '2/14/14'],
+			['XLML', paths.dtxml,  'Sheet1',  'B5',  '2/14/14'],
+			['XLSM', paths.nfxlsx, 'Implied', 'B13', '18-Oct-33']
+		];
+		it('should not generate date cells by default', function() { fmts.forEach(function(f) {
+			var wb, ws;
+			wb = X.readFile(f[1]);
+			ws = wb.Sheets[f[2]];
+			assert.equal(ws[f[3]].w, f[4]);
+			assert.equal(ws[f[3]].t, 'n');
+		}); });
+		it('should generate date cells if cellDates is true', function() { fmts.forEach(function(f) {
+			var wb, ws;
+			wb = X.readFile(f[1], {cellDates:true});
+			ws = wb.Sheets[f[2]];
+			assert.equal(ws[f[3]].w, f[4]);
+			assert.equal(ws[f[3]].t, 'd');
+		}); });
+	});
+
 	describe('should correctly handle styles', function() {
 		var wsxls, wsxlsx, rn, rn2;
 		var bef = (function() {
@@ -937,18 +953,13 @@ describe('roundtrip features', function() {
 			else { f = paths.nfxlsx; sheet = '2011'; addr = 'J36'; }
 			it('[' + a + '] -> (' + b + ') -> [' + c + '] -> (' + d + ')', function() {
 				var wb1 = X.readFile(f, {cellNF: true, cellDates: di, WTF: opts.WTF});
-				var wb2 = X.read(X.write(wb1, {type:'binary', cellDates:dj, WTF:opts.WTF}), {type:'binary', cellDates: dk, WTF: opts.WTF});
+				var  _f = X.write(wb1, {type:'binary', cellDates:dj, WTF:opts.WTF});
+				var wb2 = X.read(_f, {type:'binary', cellDates: dk, WTF: opts.WTF});
 				var m = [wb1,wb2].map(function(x) { return x.Sheets[sheet][addr]; });
 				assert.equal(m[0].w, m[1].w);
 
-				/* wb1 cellDates */
-				if(dh && di) assert.equal(m[0].t, 'd');
-				//else if(a !== 'd' && di) assert.equal(m[0].t, 'd'); /* TODO */
-				else assert.equal(m[0].t, 'n');
-				/* wb2 cellDates */
-				if(dh && di && dj && dk) assert.equal(m[1].t, 'd');
-				else if(dj && dk && !di); /* TODO: convert to date */
-				else assert.equal(m[1].t, 'n');
+				assert.equal(m[0].t, b);
+				assert.equal(m[1].t, d);
 
 				if(m[0].t === 'n' && m[1].t === 'n') assert.equal(m[0].v, m[1].v);
 				else if(m[0].t === 'd' && m[1].t === 'd') assert.equal(m[0].v.toString(), m[1].v.toString());
diff --git a/tests/core.js b/tests/core.js
index 5b9414f..42156ad 100644
--- a/tests/core.js
+++ b/tests/core.js
@@ -184,16 +184,6 @@ describe('parse options', function() {
 				});
 			});
 		});
-		it('XLSB should not generate cell dates', function() {
-			var wb = X.read(fs.readFileSync(paths.dtxlsb), {type:"binary", cellDates: true});
-			wb.SheetNames.forEach(function(s) {
-				var ws = wb.Sheets[s];
-				Object.keys(ws).forEach(function(addr) {
-					if(addr[0] === "!" || !ws.hasOwnProperty(addr)) return;
-					assert(ws[addr].t !== 'd');
-				});
-			});
-		});
 		it('XLSX should generate cell dates when requested', function() {
 			var wb = X.read(fs.readFileSync(paths.dtxlsx), {type:"binary", cellDates: true});
 			var found = false;
diff --git a/tests/fs_.js b/tests/fs_.js
index 7ee4cbb..eab468b 100644
--- a/tests/fs_.js
+++ b/tests/fs_.js
@@ -31,6 +31,7 @@ fs.readdirSync = function(p) { return Object.keys(fs).filter(function(n) {
 };
 fs.readFileSync = function(f, enc) {
 	if(!fs[f]) throw "File not found: " + f;
+	fs[f].length;
 	switch(enc) {
 		case 'base64': return fs[f];
 		case 'buffer':
diff --git a/tests/index.html b/tests/index.html
new file mode 100644
index 0000000..21ac1b9
--- /dev/null
+++ b/tests/index.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>JS-XLSX Core Test Runner</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="mocha.css" />
+    <link rel="icon" type="image/png" href="//oss.sheetjs.com/assets/img/logo.png" />
+    <style>
+      #t { font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 0px 60px; font-weight: bold; }
+      #tt{ font: 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 0px 60px; }
+      th { font: 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 0px 60px; font-weight: bold; text-align: left; }
+    </style>
+  </head>
+  <body>
+    <h1 id="t">JS-XLSX Browser-based Parsing Tests</h1>
+    <table id="tt">
+      <tr>
+        <th>File Formats</th>
+        <td><a href="http://github.com/SheetJS/js-xlsx">Library Source</a></td>
+        <td><a href="http://SheetJS.github.io/js-xls">Interactive Demo</a></td>
+        <td><a href="http://npm.im/xlsx">"xlsx" on npm</a></td>
+        <td><a href="https://travis-ci.org/SheetJS/js-xlsx">node CI status</a></td>
+      </tr>
+      <tr><td colspan="5">Tests compiled from <a href="http://github.com/SheetJS/test_files">test_files repo</a> and are located at /test_files<br /></td></tr>
+    </table>
+<script type="text/javascript">
+	var _gaq = _gaq || [];
+	_gaq.push(['_setAccount', 'UA-36810333-1']);
+	_gaq.push(['_trackPageview']);
+
+	(function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	})();
+</script>
+    <script src="shim.js"></script>
+    <script src="fs_.js"></script>
+    <script src="fixtures.js"></script>
+    <script src="xlsx.full.min.js"></script>
+    <!--[if IE]>
+      <script type="text/javascript" src="xhr-hack.js"></script>
+    <![endif]-->
+    <div id="mocha"></div>
+    <script src="mocha.js"></script>
+    <script>
+      window.initMochaPhantomJS && window.initMochaPhantomJS();
+      mocha.setup('bdd');
+    </script>
+    <script src="core.js"></script>
+    <script>
+      if(typeof mochaSaucePlease !== "undefined") mochaSaucePlease();
+      else if(window.mochaPhantomJS) mochaPhantomJS.run();
+      else mocha.run();
+    </script>
+  </body>
+</html>
diff --git a/xlsx.flow.js b/xlsx.flow.js
index a4d0402..f7d1455 100644
--- a/xlsx.flow.js
+++ b/xlsx.flow.js
@@ -114,7 +114,7 @@ type StringConv = {(string):string};
 /*jshint -W041 */
 var SSF = {};
 var make_ssf = function make_ssf(SSF){
-SSF.version = '0.8.1';
+SSF.version = '0.9.0';
 function _strrev(x/*:string*/)/*:string*/ { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; }
 function fill(c/*:string*/,l/*:number*/)/*:string*/ { var o = ""; while(o.length < l) o+=c; return o; }
 function pad0(v/*:any*/,d/*:number*/)/*:string*/{var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
@@ -167,7 +167,7 @@ var table_fmt = {
 	/*::[*/56/*::]*/: '"上午/下午 "hh"時"mm"分"ss"秒 "',
 	/*::[*/65535/*::]*/: 'General'
 };
-var days = [
+var days/*:Array<Array<string> >*/ = [
 	['Sun', 'Sunday'],
 	['Mon', 'Monday'],
 	['Tue', 'Tuesday'],
@@ -176,7 +176,7 @@ var days = [
 	['Fri', 'Friday'],
 	['Sat', 'Saturday']
 ];
-var months = [
+var months/*:Array<Array<string> >*/ = [
 	['J', 'Jan', 'January'],
 	['F', 'Feb', 'February'],
 	['M', 'Mar', 'March'],
@@ -564,8 +564,11 @@ function write_num_int(type/*:string*/, fmt/*:string*/, val/*:number*/)/*:string
 	if((r = fmt.match(frac1))) return write_num_f2(r, aval, sign);
 	if(fmt.match(/^#+0+$/)) return sign + pad0(aval,fmt.length - fmt.indexOf("0"));
 	if((r = fmt.match(dec1))) {
-		// $FlowIgnore
-		o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.(\d*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); });
+		/*:: if(!Array.isArray(r)) throw "unreachable"; */
+		o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]);
+		o = o.replace(/\.(\d*)$/,function($$, $1) {
+		/*:: if(!Array.isArray(r)) throw "unreachable"; */
+			return "." + $1 + fill("0", r[1].length-$1.length); });
 		return fmt.indexOf("0.") !== -1 ? o : o.replace(/^0\./,".");
 	}
 	fmt = fmt.replace(/^#+([0.])/, "$1");
@@ -645,6 +648,47 @@ function split_fmt(fmt/*:string*/)/*:Array<string>*/ {
 }
 SSF._split = split_fmt;
 var abstime = /\[[HhMmSs]*\]/;
+function fmt_is_date(fmt/*:string*/)/*:boolean*/ {
+	var i = 0, cc = 0, c = "", o = "";
+	while(i < fmt.length) {
+		switch((c = fmt.charAt(i))) {
+			case 'G': if(isgeneral(fmt, i)) i+= 6; i++; break;
+			case '"': for(;(cc=fmt.charCodeAt(++i)) !== 34 && i < fmt.length;) ++i; ++i; break;
+			case '\\': i+=2; break;
+			case '_': i+=2; break;
+			case '@': ++i; break;
+			case 'B': case 'b':
+				if(fmt.charAt(i+1) === "1" || fmt.charAt(i+1) === "2") return true;
+				/* falls through */
+			case 'M': case 'D': case 'Y': case 'H': case 'S': case 'E':
+				/* falls through */
+			case 'm': case 'd': case 'y': case 'h': case 's': case 'e': case 'g': return true;
+			case 'A':
+				if(fmt.substr(i, 3) === "A/P") return true;
+				if(fmt.substr(i, 5) === "AM/PM") return true;
+				++i; break;
+			case '[':
+				o = c;
+				while(fmt.charAt(i++) !== ']' && i < fmt.length) o += fmt.charAt(i);
+				if(o.match(abstime)) return true;
+				break;
+			case '.':
+				/* falls through */
+			case '0': case '#':
+				while(i < fmt.length && ("0#?.,E+-%".indexOf(c=fmt.charAt(++i)) > -1 || c=='\\' && fmt.charAt(i+1) == "-" && "0#".indexOf(fmt.charAt(i+2))>-1));
+				break;
+			case '?': while(fmt.charAt(++i) === c); break;
+			case '*': ++i; if(fmt.charAt(i) == ' ' || fmt.charAt(i) == '*') ++i; break;
+			case '(': case ')': ++i; break;
+			case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+				while(i < fmt.length && "0123456789".indexOf(fmt.charAt(++i)) > -1); break;
+			case ' ': ++i; break;
+			default: ++i; break;
+		}
+	}
+	return false;
+}
+SSF.is_date = fmt_is_date;
 function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 	var out = [], o = "", i = 0, c = "", lst='t', q, dt, j, cc;
 	var hr='H';
@@ -657,14 +701,14 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 			case '"': /* Literal text */
 				for(o="";(cc=fmt.charCodeAt(++i)) !== 34 && i < fmt.length;) o += String.fromCharCode(cc);
 				out[out.length] = {t:'t', v:o}; ++i; break;
-			case '\\': var w = fmt[++i], t = (w === "(" || w === ")") ? w : 't';
+			case '\\': var w = fmt.charAt(++i), t = (w === "(" || w === ")") ? w : 't';
 				out[out.length] = {t:t, v:w}; ++i; break;
 			case '_': out[out.length] = {t:'t', v:" "}; i+=2; break;
 			case '@': /* Text Placeholder */
 				out[out.length] = {t:'T', v:v}; ++i; break;
 			case 'B': case 'b':
-				if(fmt[i+1] === "1" || fmt[i+1] === "2") {
-					if(dt==null) { dt=parse_date_code(v, opts, fmt[i+1] === "2"); if(dt==null) return ""; }
+				if(fmt.charAt(i+1) === "1" || fmt.charAt(i+1) === "2") {
+					if(dt==null) { dt=parse_date_code(v, opts, fmt.charAt(i+1) === "2"); if(dt==null) return ""; }
 					out[out.length] = {t:'X', v:fmt.substr(i,2)}; lst = c; i+=2; break;
 				}
 				/* falls through */
@@ -674,7 +718,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 			case 'm': case 'd': case 'y': case 'h': case 's': case 'e': case 'g':
 				if(v < 0) return "";
 				if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; }
-				o = c; while(++i<fmt.length && fmt[i].toLowerCase() === c) o+=c;
+				o = c; while(++i<fmt.length && fmt.charAt(i).toLowerCase() === c) o+=c;
 				if(c === 'm' && lst.toLowerCase() === 'h') c = 'M'; /* m = minute */
 				if(c === 'h') c = hr;
 				out[out.length] = {t:c, v:o}; lst = c; break;
@@ -688,8 +732,8 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 				out[out.length] = q; lst = c; break;
 			case '[':
 				o = c;
-				while(fmt[i++] !== ']' && i < fmt.length) o += fmt[i];
-				if(o.substr(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
+				while(fmt.charAt(i++) !== ']' && i < fmt.length) o += fmt.charAt(i);
+				if(o.slice(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
 				if(o.match(abstime)) {
 					if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; }
 					out[out.length] = {t:'Z', v:o.toLowerCase()};
@@ -698,20 +742,20 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
 			/* Numbers */
 			case '.':
 				if(dt != null) {
-					o = c; while((c=fmt[++i]) === "0") o += c;
+					o = c; while((c=fmt.charAt(++i)) === "0") o += c;
 					out[out.length] = {t:'s', v:o}; break;
 				}
 				/* falls through */
 			case '0': case '#':
-				o = c; while("0#?.,E+-%".indexOf(c=fmt[++i]) > -1 || c=='\\' && fmt[i+1] == "-" && "0#".indexOf(fmt[i+2])>-1) o += c;
+				o = c; while(++i < fmt.length && "0#?.,E+-%".indexOf(c=fmt.charAt(i)) > -1 || c=='\\' && fmt.charAt(i+1) == "-" && "0#".indexOf(fmt.charAt(i+2))>-1) o += c;
 				out[out.length] = {t:'n', v:o}; break;
 			case '?':
-				o = c; while(fmt[++i] === c) o+=c;
+				o = c; while(fmt.charAt(++i) === c) o+=c;
 				q={t:c, v:o}; out[out.length] = q; lst = c; break;
-			case '*': ++i; if(fmt[i] == ' ' || fmt[i] == '*') ++i; break; // **
+			case '*': ++i; if(fmt.charAt(i) == ' ' || fmt.charAt(i) == '*') ++i; break; // **
 			case '(': case ')': out[out.length] = {t:(flen===1?'t':c), v:c}; ++i; break;
 			case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				o = c; while("0123456789".indexOf(fmt[++i]) > -1) o+=fmt[i];
+				o = c; while(i < fmt.length && "0123456789".indexOf(fmt.charAt(++i)) > -1) o+=fmt.charAt(i);
 				out[out.length] = {t:'D', v:o}; break;
 			case ' ': out[out.length] = {t:c, v:c}; ++i; break;
 			default:
@@ -4598,7 +4642,7 @@ var parse_rs = (function parse_rs_factory() {
 		var m = rpr.match(tagregex), i = 0;
 		if(m) for(;i!=m.length; ++i) {
 			var y = parsexmltag(m[i]);
-			switch(y[0]) {
+			switch(y[0].replace(/\w*:/g,"")) {
 				/* 18.8.12 condense CT_BooleanProperty */
 				/* ** not required . */
 				case '<condense': break;
@@ -8743,7 +8787,9 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 			if(guess.e.c < idx) guess.e.c = idx;
 			/* 18.18.11 t ST_CellType */
 			switch(p.t) {
-				case 'n': p.v = parseFloat(p.v); break;
+				case 'n':
+					p.v = parseFloat(p.v);
+					break;
 				case 's':
 					sstr = strs[parseInt(p.v, 10)];
 					if(typeof p.v == 'undefined') {
@@ -8768,7 +8814,7 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 				case 'd':
 					if(!opts.cellDates) { p.v = datenum(new Date(p.v)); p.t = 'n'; }
 					break;
-				/* error string in .v, number in .v */
+				/* error string in .w, number in .v */
 				case 'e': p.w = p.v; p.v = RBErr[p.v]; break;
 			}
 			/* formatting */
@@ -8781,6 +8827,9 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 				}
 			}
 			safe_format(p, fmtid, fillid, opts, themes, styles);
+			if(opts.cellDates && do_format && p.t == 'n' && SSF.is_date(SSF._table[fmtid])) {
+				var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+			}
 			s[tag.r] = p;
 		}
 	}
@@ -9162,6 +9211,9 @@ function parse_ws_bin(data, opts, rels, wb, themes, styles)/*:Worksheet*/ {
 				if(refguess.s.c > C) refguess.s.c = C;
 				if(refguess.e.r < row.r) refguess.e.r = row.r;
 				if(refguess.e.c < C) refguess.e.c = C;
+				if(opts.cellDates && cf && p.t == 'n' && SSF.is_date(SSF._table[cf.ifmt])) {
+					var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+				}
 				break;
 
 			case 'BrtCellBlank': if(!opts.sheetStubs) break;
@@ -10065,7 +10117,11 @@ function safe_format_xlml(cell/*:Cell*/, nf, o) {
 			else cell.w = SSF._general(cell.v);
 		}
 		else cell.w = xlml_format(nf||"General", cell.v);
-		if(o.cellNF) cell.z = XLMLFormatMap[nf]||nf||"General";
+		var z = XLMLFormatMap[nf]||nf||"General";
+		if(o.cellNF) cell.z = z;
+		if(o.cellDates && cell.t == 'n' && SSF.is_date(z)) {
+			var _d = SSF.parse_date_code(cell.v); if(_d) { cell.t = 'd'; cell.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+		}
 	} catch(e) { if(o.WTF) throw e; }
 }
 
@@ -10797,7 +10853,7 @@ function write_ws_xlml_cell(cell, ref, ws, opts, idx, wb, addr)/*:string*/{
 	if(opts && opts.type == 'binary' && typeof cptable !== 'undefined' && cell.t == 's') {
 		_v = cptable.utils.encode(65001, _v);
 		var __v = "";
-		for(__i = 0; __i < _v.length; ++__i) __v += String.fromCharCode(_v[__i]);
+		for(var __i = 0; __i < _v.length; ++__i) __v += String.fromCharCode(_v[__i]);
 		_v = __v;
 	}
 	var m = '<Data ss:Type="' + t + '">' + _v + '</Data>';
@@ -10928,6 +10984,9 @@ function safe_format_xf(p/*:any*/, opts/*:ParseOpts*/, date1904/*:?boolean*/) {
 			else p.w = SSF._general(p.v);
 		}
 		else p.w = SSF.format(fmtid,p.v, {date1904:!!date1904});
+		if(opts.cellDates && fmtid && p.t == 'n' && SSF.is_date(SSF._table[fmtid])) {
+			var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+		}
 		if(opts.cellNF) p.z = SSF._table[fmtid];
 	} catch(e) { if(opts.WTF) throw e; }
 }
@@ -14048,8 +14107,7 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/){
 			switch(val.t){
 				case 'z': continue;
 				case 'e': continue;
-				case 's': break;
-				case 'b': case 'n': break;
+				case 's': case 'd': case 'b': case 'n': break;
 				default: throw 'unrecognized type ' + val.t;
 			}
 			if(v !== undefined) {
diff --git a/xlsx.js b/xlsx.js
index 203ba0b..668c870 100644
--- a/xlsx.js
+++ b/xlsx.js
@@ -96,7 +96,7 @@ var chr0 = /\u0000/g, chr1 = /[\u0001-\u0006]/;
 /*jshint -W041 */
 var SSF = {};
 var make_ssf = function make_ssf(SSF){
-SSF.version = '0.8.1';
+SSF.version = '0.9.0';
 function _strrev(x) { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; }
 function fill(c,l) { var o = ""; while(o.length < l) o+=c; return o; }
 function pad0(v,d){var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
@@ -545,8 +545,9 @@ function write_num_int(type, fmt, val) {
 	if((r = fmt.match(frac1))) return write_num_f2(r, aval, sign);
 	if(fmt.match(/^#+0+$/)) return sign + pad0(aval,fmt.length - fmt.indexOf("0"));
 	if((r = fmt.match(dec1))) {
-		// $FlowIgnore
-		o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.(\d*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); });
+o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]);
+		o = o.replace(/\.(\d*)$/,function($$, $1) {
+return "." + $1 + fill("0", r[1].length-$1.length); });
 		return fmt.indexOf("0.") !== -1 ? o : o.replace(/^0\./,".");
 	}
 	fmt = fmt.replace(/^#+([0.])/, "$1");
@@ -626,6 +627,47 @@ function split_fmt(fmt) {
 }
 SSF._split = split_fmt;
 var abstime = /\[[HhMmSs]*\]/;
+function fmt_is_date(fmt) {
+	var i = 0, cc = 0, c = "", o = "";
+	while(i < fmt.length) {
+		switch((c = fmt.charAt(i))) {
+			case 'G': if(isgeneral(fmt, i)) i+= 6; i++; break;
+			case '"': for(;(cc=fmt.charCodeAt(++i)) !== 34 && i < fmt.length;) ++i; ++i; break;
+			case '\\': i+=2; break;
+			case '_': i+=2; break;
+			case '@': ++i; break;
+			case 'B': case 'b':
+				if(fmt.charAt(i+1) === "1" || fmt.charAt(i+1) === "2") return true;
+				/* falls through */
+			case 'M': case 'D': case 'Y': case 'H': case 'S': case 'E':
+				/* falls through */
+			case 'm': case 'd': case 'y': case 'h': case 's': case 'e': case 'g': return true;
+			case 'A':
+				if(fmt.substr(i, 3) === "A/P") return true;
+				if(fmt.substr(i, 5) === "AM/PM") return true;
+				++i; break;
+			case '[':
+				o = c;
+				while(fmt.charAt(i++) !== ']' && i < fmt.length) o += fmt.charAt(i);
+				if(o.match(abstime)) return true;
+				break;
+			case '.':
+				/* falls through */
+			case '0': case '#':
+				while(i < fmt.length && ("0#?.,E+-%".indexOf(c=fmt.charAt(++i)) > -1 || c=='\\' && fmt.charAt(i+1) == "-" && "0#".indexOf(fmt.charAt(i+2))>-1));
+				break;
+			case '?': while(fmt.charAt(++i) === c); break;
+			case '*': ++i; if(fmt.charAt(i) == ' ' || fmt.charAt(i) == '*') ++i; break;
+			case '(': case ')': ++i; break;
+			case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+				while(i < fmt.length && "0123456789".indexOf(fmt.charAt(++i)) > -1); break;
+			case ' ': ++i; break;
+			default: ++i; break;
+		}
+	}
+	return false;
+}
+SSF.is_date = fmt_is_date;
 function eval_fmt(fmt, v, opts, flen) {
 	var out = [], o = "", i = 0, c = "", lst='t', q, dt, j, cc;
 	var hr='H';
@@ -638,14 +680,14 @@ function eval_fmt(fmt, v, opts, flen) {
 			case '"': /* Literal text */
 				for(o="";(cc=fmt.charCodeAt(++i)) !== 34 && i < fmt.length;) o += String.fromCharCode(cc);
 				out[out.length] = {t:'t', v:o}; ++i; break;
-			case '\\': var w = fmt[++i], t = (w === "(" || w === ")") ? w : 't';
+			case '\\': var w = fmt.charAt(++i), t = (w === "(" || w === ")") ? w : 't';
 				out[out.length] = {t:t, v:w}; ++i; break;
 			case '_': out[out.length] = {t:'t', v:" "}; i+=2; break;
 			case '@': /* Text Placeholder */
 				out[out.length] = {t:'T', v:v}; ++i; break;
 			case 'B': case 'b':
-				if(fmt[i+1] === "1" || fmt[i+1] === "2") {
-					if(dt==null) { dt=parse_date_code(v, opts, fmt[i+1] === "2"); if(dt==null) return ""; }
+				if(fmt.charAt(i+1) === "1" || fmt.charAt(i+1) === "2") {
+					if(dt==null) { dt=parse_date_code(v, opts, fmt.charAt(i+1) === "2"); if(dt==null) return ""; }
 					out[out.length] = {t:'X', v:fmt.substr(i,2)}; lst = c; i+=2; break;
 				}
 				/* falls through */
@@ -655,7 +697,7 @@ function eval_fmt(fmt, v, opts, flen) {
 			case 'm': case 'd': case 'y': case 'h': case 's': case 'e': case 'g':
 				if(v < 0) return "";
 				if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; }
-				o = c; while(++i<fmt.length && fmt[i].toLowerCase() === c) o+=c;
+				o = c; while(++i<fmt.length && fmt.charAt(i).toLowerCase() === c) o+=c;
 				if(c === 'm' && lst.toLowerCase() === 'h') c = 'M'; /* m = minute */
 				if(c === 'h') c = hr;
 				out[out.length] = {t:c, v:o}; lst = c; break;
@@ -669,8 +711,8 @@ function eval_fmt(fmt, v, opts, flen) {
 				out[out.length] = q; lst = c; break;
 			case '[':
 				o = c;
-				while(fmt[i++] !== ']' && i < fmt.length) o += fmt[i];
-				if(o.substr(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
+				while(fmt.charAt(i++) !== ']' && i < fmt.length) o += fmt.charAt(i);
+				if(o.slice(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
 				if(o.match(abstime)) {
 					if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; }
 					out[out.length] = {t:'Z', v:o.toLowerCase()};
@@ -679,20 +721,20 @@ function eval_fmt(fmt, v, opts, flen) {
 			/* Numbers */
 			case '.':
 				if(dt != null) {
-					o = c; while((c=fmt[++i]) === "0") o += c;
+					o = c; while((c=fmt.charAt(++i)) === "0") o += c;
 					out[out.length] = {t:'s', v:o}; break;
 				}
 				/* falls through */
 			case '0': case '#':
-				o = c; while("0#?.,E+-%".indexOf(c=fmt[++i]) > -1 || c=='\\' && fmt[i+1] == "-" && "0#".indexOf(fmt[i+2])>-1) o += c;
+				o = c; while(++i < fmt.length && "0#?.,E+-%".indexOf(c=fmt.charAt(i)) > -1 || c=='\\' && fmt.charAt(i+1) == "-" && "0#".indexOf(fmt.charAt(i+2))>-1) o += c;
 				out[out.length] = {t:'n', v:o}; break;
 			case '?':
-				o = c; while(fmt[++i] === c) o+=c;
+				o = c; while(fmt.charAt(++i) === c) o+=c;
 				q={t:c, v:o}; out[out.length] = q; lst = c; break;
-			case '*': ++i; if(fmt[i] == ' ' || fmt[i] == '*') ++i; break; // **
+			case '*': ++i; if(fmt.charAt(i) == ' ' || fmt.charAt(i) == '*') ++i; break; // **
 			case '(': case ')': out[out.length] = {t:(flen===1?'t':c), v:c}; ++i; break;
 			case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				o = c; while("0123456789".indexOf(fmt[++i]) > -1) o+=fmt[i];
+				o = c; while(i < fmt.length && "0123456789".indexOf(fmt.charAt(++i)) > -1) o+=fmt.charAt(i);
 				out[out.length] = {t:'D', v:o}; break;
 			case ' ': out[out.length] = {t:c, v:c}; ++i; break;
 			default:
@@ -4546,7 +4588,7 @@ var parse_rs = (function parse_rs_factory() {
 		var m = rpr.match(tagregex), i = 0;
 		if(m) for(;i!=m.length; ++i) {
 			var y = parsexmltag(m[i]);
-			switch(y[0]) {
+			switch(y[0].replace(/\w*:/g,"")) {
 				/* 18.8.12 condense CT_BooleanProperty */
 				/* ** not required . */
 				case '<condense': break;
@@ -8690,7 +8732,9 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 			if(guess.e.c < idx) guess.e.c = idx;
 			/* 18.18.11 t ST_CellType */
 			switch(p.t) {
-				case 'n': p.v = parseFloat(p.v); break;
+				case 'n':
+					p.v = parseFloat(p.v);
+					break;
 				case 's':
 					sstr = strs[parseInt(p.v, 10)];
 					if(typeof p.v == 'undefined') {
@@ -8715,7 +8759,7 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 				case 'd':
 					if(!opts.cellDates) { p.v = datenum(new Date(p.v)); p.t = 'n'; }
 					break;
-				/* error string in .v, number in .v */
+				/* error string in .w, number in .v */
 				case 'e': p.w = p.v; p.v = RBErr[p.v]; break;
 			}
 			/* formatting */
@@ -8728,6 +8772,9 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
 				}
 			}
 			safe_format(p, fmtid, fillid, opts, themes, styles);
+			if(opts.cellDates && do_format && p.t == 'n' && SSF.is_date(SSF._table[fmtid])) {
+				var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+			}
 			s[tag.r] = p;
 		}
 	}
@@ -9109,6 +9156,9 @@ function parse_ws_bin(data, opts, rels, wb, themes, styles) {
 				if(refguess.s.c > C) refguess.s.c = C;
 				if(refguess.e.r < row.r) refguess.e.r = row.r;
 				if(refguess.e.c < C) refguess.e.c = C;
+				if(opts.cellDates && cf && p.t == 'n' && SSF.is_date(SSF._table[cf.ifmt])) {
+					var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+				}
 				break;
 
 			case 'BrtCellBlank': if(!opts.sheetStubs) break;
@@ -10010,7 +10060,11 @@ function safe_format_xlml(cell, nf, o) {
 			else cell.w = SSF._general(cell.v);
 		}
 		else cell.w = xlml_format(nf||"General", cell.v);
-		if(o.cellNF) cell.z = XLMLFormatMap[nf]||nf||"General";
+		var z = XLMLFormatMap[nf]||nf||"General";
+		if(o.cellNF) cell.z = z;
+		if(o.cellDates && cell.t == 'n' && SSF.is_date(z)) {
+			var _d = SSF.parse_date_code(cell.v); if(_d) { cell.t = 'd'; cell.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+		}
 	} catch(e) { if(o.WTF) throw e; }
 }
 
@@ -10740,7 +10794,7 @@ function write_ws_xlml_cell(cell, ref, ws, opts, idx, wb, addr){
 	if(opts && opts.type == 'binary' && typeof cptable !== 'undefined' && cell.t == 's') {
 		_v = cptable.utils.encode(65001, _v);
 		var __v = "";
-		for(__i = 0; __i < _v.length; ++__i) __v += String.fromCharCode(_v[__i]);
+		for(var __i = 0; __i < _v.length; ++__i) __v += String.fromCharCode(_v[__i]);
 		_v = __v;
 	}
 	var m = '<Data ss:Type="' + t + '">' + _v + '</Data>';
@@ -10871,6 +10925,9 @@ function safe_format_xf(p, opts, date1904) {
 			else p.w = SSF._general(p.v);
 		}
 		else p.w = SSF.format(fmtid,p.v, {date1904:!!date1904});
+		if(opts.cellDates && fmtid && p.t == 'n' && SSF.is_date(SSF._table[fmtid])) {
+			var _d = SSF.parse_date_code(p.v); if(_d) { p.t = 'd'; p.v = new Date(Date.UTC(_d.y, _d.m-1,_d.d,_d.H,_d.M,_d.S,_d.u)); }
+		}
 		if(opts.cellNF) p.z = SSF._table[fmtid];
 	} catch(e) { if(opts.WTF) throw e; }
 }
@@ -13983,8 +14040,7 @@ function sheet_to_json(sheet, opts){
 			switch(val.t){
 				case 'z': continue;
 				case 'e': continue;
-				case 's': break;
-				case 'b': case 'n': break;
+				case 's': case 'd': case 'b': case 'n': break;
 				default: throw 'unrecognized type ' + val.t;
 			}
 			if(v !== undefined) {