diff --git a/tableExport.js b/tableExport.js
index 1bfaa0fc..3c008f32 100644
--- a/tableExport.js
+++ b/tableExport.js
@@ -21,41 +21,65 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.*/
 
 (function($){
+
+        //taken from http://stackoverflow.com/questions/283956/is-there-any-way-to-specify-a-suggested-filename-when-using-data-uri#15832569
+        function downloadWithName(uri, name) {
+          function eventFire(el, etype){
+            if (el.fireEvent) {
+              (el.fireEvent('on' + etype));
+            } else {
+              var evObj = document.createEvent('Events');
+              evObj.initEvent(etype, true, false);
+              el.dispatchEvent(evObj);
+            }
+          }
+
+          var link = document.createElement("a");
+          link.download = name;
+          link.href = uri;
+          eventFire(link, "click");
+        }
+
         $.fn.extend({
             tableExport: function(options) {
                 var defaults = {
-						separator: ',',
-						ignoreColumn: [],
-						tableName:'yourTableName',
-						type:'csv',
-						pdfFontSize:14,
-						pdfLeftMargin:20,
-						escape:'true',
-						htmlContent:'false',
-						consoleLog:'false'
-				};
-                
+      						separator: ',',
+      						ignoreColumn: [],
+      						tableName:'yourTableName',
+      						type:'csv',
+      						pdfFontSize:14,
+      						pdfLeftMargin:20,
+      						escape:'true',
+      						htmlContent:'false',
+      						consoleLog:'false'
+  				      };
+
 				var options = $.extend(defaults, options);
 				var el = this;
-				
+        var available_types = ["csv", "txt", "sql", "json", "xml", "excel", "doc", "powerpoint", "png", "pdf"];
+
+        var mime_type = '';
+        var base64data = '';
+        var file_name = '';
+
 				if(defaults.type == 'csv' || defaults.type == 'txt'){
-				
+
 					// Header
 					var tdData ="";
 					$(el).find('thead').find('tr').each(function() {
-					tdData += "\n";					
+					tdData += "\n";
 						$(this).filter(':visible').find('th').each(function(index,data) {
 							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
-									tdData += '"' + parseString($(this)) + '"' + defaults.separator;									
+									tdData += '"' + parseString($(this)) + '"' + defaults.separator;
 								}
 							}
-							
+
 						});
 						tdData = $.trim(tdData);
 						tdData = $.trim(tdData).substring(0, tdData.length -1);
 					});
-					
+
 					// Row vs Column
 					$(el).find('tbody').find('tr').each(function() {
 					tdData += "\n";
@@ -69,26 +93,28 @@ THE SOFTWARE.*/
 						//tdData = $.trim(tdData);
 						tdData = $.trim(tdData).substring(0, tdData.length -1);
 					});
-					
+
 					//output
 					if(defaults.consoleLog == 'true'){
 						console.log(tdData);
 					}
-					var base64data = "base64," + $.base64.encode(tdData);
-					window.open('data:application/'+defaults.type+';filename=exportData;' + base64data);
+
+          base64data = "base64," + $.base64.encode(tdData);
+          mime_type = "data:application/"+defaults.type;
+          file_name = "exported_data."+defaults.type;
 				}else if(defaults.type == 'sql'){
-				
+
 					// Header
 					var tdData ="INSERT INTO `"+defaults.tableName+"` (";
 					$(el).find('thead').find('tr').each(function() {
-					
+
 						$(this).filter(':visible').find('th').each(function(index,data) {
 							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
-									tdData += '`' + parseString($(this)) + '`,' ;									
+									tdData += '`' + parseString($(this)) + '`,' ;
 								}
 							}
-							
+
 						});
 						tdData = $.trim(tdData);
 						tdData = $.trim(tdData).substring(0, tdData.length -1);
@@ -104,112 +130,115 @@ THE SOFTWARE.*/
 								}
 							}
 						});
-						
+
 						tdData = $.trim(tdData).substring(0, tdData.length -1);
 						tdData += "),";
 					});
 					tdData = $.trim(tdData).substring(0, tdData.length -1);
 					tdData += ";";
-					
+
 					//output
 					//console.log(tdData);
-					
+
 					if(defaults.consoleLog == 'true'){
 						console.log(tdData);
 					}
-					
-					var base64data = "base64," + $.base64.encode(tdData);
-					window.open('data:application/sql;filename=exportData;' + base64data);
-					
-				
+
+          base64data = "base64," + $.base64.encode(tdData);
+          mime_type = "data:application/"+defaults.type;
+          file_name = "exported_data."+defaults.type;
+
 				}else if(defaults.type == 'json'){
-				
+
 					var jsonHeaderArray = [];
 					$(el).find('thead').find('tr').each(function() {
-						var tdData ="";	
+						var tdData ="";
 						var jsonArrayTd = [];
-					
+
 						$(this).filter(':visible').find('th').each(function(index,data) {
 							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
-									jsonArrayTd.push(parseString($(this)));									
+									jsonArrayTd.push(parseString($(this)));
 								}
 							}
-						});									
-						jsonHeaderArray.push(jsonArrayTd);						
-						
+						});
+						jsonHeaderArray.push(jsonArrayTd);
+
 					});
-					
+
 					var jsonArray = [];
 					$(el).find('tbody').find('tr').each(function() {
-						var tdData ="";	
+						var tdData ="";
 						var jsonArrayTd = [];
-					
+
 						$(this).filter(':visible').find('td').each(function(index,data) {
 							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
-									jsonArrayTd.push(parseString($(this)));									
+									jsonArrayTd.push(parseString($(this)));
 								}
 							}
-						});									
-						jsonArray.push(jsonArrayTd);									
-						
+						});
+						jsonArray.push(jsonArrayTd);
+
 					});
-					
+
 					var jsonExportArray =[];
 					jsonExportArray.push({header:jsonHeaderArray,data:jsonArray});
-					
+
 					//Return as JSON
 					//console.log(JSON.stringify(jsonExportArray));
-					
+
 					//Return as Array
 					//console.log(jsonExportArray);
 					if(defaults.consoleLog == 'true'){
 						console.log(JSON.stringify(jsonExportArray));
 					}
-					var base64data = "base64," + $.base64.encode(JSON.stringify(jsonExportArray));
-					window.open('data:application/json;filename=exportData;' + base64data);
+
+          base64data = "base64," + $.base64.encode(jsonExportArray);
+          mime_type = "data:application/"+defaults.type;
+          file_name = "exported_data."+defaults.type;
 				}else if(defaults.type == 'xml'){
-				
+
 					var xml = '<?xml version="1.0" encoding="utf-8"?>';
 					xml += '<tabledata><fields>';
 
 					// Header
 					$(el).find('thead').find('tr').each(function() {
 						$(this).filter(':visible').find('th').each(function(index,data) {
-							if ($(this).css('display') != 'none'){					
+							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
 									xml += "<field>" + parseString($(this)) + "</field>";
 								}
 							}
-						});									
-					});					
+						});
+					});
 					xml += '</fields><data>';
-					
+
 					// Row Vs Column
 					var rowCount=1;
 					$(el).find('tbody').find('tr').each(function() {
 						xml += '<row id="'+rowCount+'">';
 						var colCount=0;
 						$(this).filter(':visible').find('td').each(function(index,data) {
-							if ($(this).css('display') != 'none'){	
+							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
 									xml += "<column-"+colCount+">"+parseString($(this))+"</column-"+colCount+">";
 								}
 							}
 							colCount++;
-						});															
+						});
 						rowCount++;
 						xml += '</row>';
-					});					
+					});
 					xml += '</data></tabledata>'
-					
+
 					if(defaults.consoleLog == 'true'){
 						console.log(xml);
 					}
-					
-					var base64data = "base64," + $.base64.encode(xml);
-					window.open('data:application/xml;filename=exportData;' + base64data);
+
+          base64data = "base64," + $.base64.encode(xml);
+          mime_type = "data:application/"+defaults.type;
+          file_name = "exported_data."+defaults.type;
 
 				}else if(defaults.type == 'excel' || defaults.type == 'doc'|| defaults.type == 'powerpoint'  ){
 					//console.log($(this).html());
@@ -218,39 +247,39 @@ THE SOFTWARE.*/
 					$(el).find('thead').find('tr').each(function() {
 						excel += "<tr>";
 						$(this).filter(':visible').find('th').each(function(index,data) {
-							if ($(this).css('display') != 'none'){					
+							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
 									excel += "<td>" + parseString($(this))+ "</td>";
 								}
 							}
-						});	
-						excel += '</tr>';						
-						
-					});					
-					
-					
+						});
+						excel += '</tr>';
+
+					});
+
+
 					// Row Vs Column
 					var rowCount=1;
 					$(el).find('tbody').find('tr').each(function() {
 						excel += "<tr>";
 						var colCount=0;
 						$(this).filter(':visible').find('td').each(function(index,data) {
-							if ($(this).css('display') != 'none'){	
+							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
 									excel += "<td>"+parseString($(this))+"</td>";
 								}
 							}
 							colCount++;
-						});															
+						});
 						rowCount++;
 						excel += '</tr>';
-					});					
+					});
 					excel += '</table>'
-					
+
 					if(defaults.consoleLog == 'true'){
 						console.log(excel);
 					}
-					
+
 					var excelFile = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:"+defaults.type+"' xmlns='http://www.w3.org/TR/REC-html40'>";
 					excelFile += "<head>";
 					excelFile += "<!--[if gte mso 9]>";
@@ -275,85 +304,91 @@ THE SOFTWARE.*/
 					excelFile += "</body>";
 					excelFile += "</html>";
 
-					var base64data = "base64," + $.base64.encode(excelFile);
-					window.open('data:application/vnd.ms-'+defaults.type+';filename=exportData.doc;' + base64data);
-					
+          base64data = "base64," + $.base64.encode(excelFile);
+          mime_type = "data:application/vnd.ms-"+defaults.type;
+
+          switch(defaults.type) {
+            case 'excel':
+              file_name = "exported_data.xls";
+              break;
+            case 'doc':
+              file_name = "exported_data.doc";
+              break;
+            case 'powerpoint':
+              file_name = "exported_data.ppt";
+              break;
+          }
+
 				}else if(defaults.type == 'png'){
 					html2canvas($(el), {
-						onrendered: function(canvas) {										
+						onrendered: function(canvas) {
 							var img = canvas.toDataURL("image/png");
 							window.open(img);
-							
-							
 						}
-					});		
+					});
 				}else if(defaults.type == 'pdf'){
-	
+
 					var doc = new jsPDF('p','pt', 'a4', true);
 					doc.setFontSize(defaults.pdfFontSize);
-					
+
 					// Header
 					var startColPosition=defaults.pdfLeftMargin;
 					$(el).find('thead').find('tr').each(function() {
 						$(this).filter(':visible').find('th').each(function(index,data) {
-							if ($(this).css('display') != 'none'){					
+							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
-									var colPosition = startColPosition+ (index * 50);									
+									var colPosition = startColPosition+ (index * 50);
 									doc.text(colPosition,20, parseString($(this)));
 								}
 							}
-						});									
-					});					
-				
-				
+						});
+					});
+
+
 					// Row Vs Column
 					var startRowPosition = 20; var page =1;var rowPosition=0;
 					$(el).find('tbody').find('tr').each(function(index,data) {
 						rowCalc = index+1;
-						
+
 					if (rowCalc % 26 == 0){
 						doc.addPage();
 						page++;
 						startRowPosition=startRowPosition+10;
 					}
 					rowPosition=(startRowPosition + (rowCalc * 10)) - ((page -1) * 280);
-						
+
 						$(this).filter(':visible').find('td').each(function(index,data) {
-							if ($(this).css('display') != 'none'){	
+							if ($(this).css('display') != 'none'){
 								if(defaults.ignoreColumn.indexOf(index) == -1){
-									var colPosition = startColPosition+ (index * 50);									
+									var colPosition = startColPosition+ (index * 50);
 									doc.text(colPosition,rowPosition, parseString($(this)));
 								}
 							}
-							
-						});															
-						
-					});					
-										
+
+						});
+
+					});
+
 					// Output as Data URI
 					doc.output('datauri');
-	
 				}
-				
-				
+
+        if (available_types.indexOf(defaults.type) != -1){
+          downloadWithName( mime_type + ';' + base64data, file_name); //didnt work when I tested in ff25
+        }
+
 				function parseString(data){
-				
-					if(defaults.htmlContent == 'true'){
+					if(defaults.htmlContent == 'true') {
 						content_data = data.html().trim();
-					}else{
+					} else {
 						content_data = data.text().trim();
 					}
-					
+
 					if(defaults.escape == 'true'){
 						content_data = escape(content_data);
 					}
-					
-					
-					
 					return content_data;
 				}
-			
 			}
         });
     })(jQuery);
-