diff --git a/examples/demo-as-you-type.html b/examples/demo-as-you-type.html
index 9bcab60..914bfdc 100644
--- a/examples/demo-as-you-type.html
+++ b/examples/demo-as-you-type.html
@@ -10,7 +10,7 @@
 		
 		<link rel="stylesheet" href="http://www.teamdf.com/jquery-plugins/resources/stylesheets/prettify.css"/>
 		<link rel="stylesheet" href="http://www.teamdf.com/jquery-plugins/resources/stylesheets/docs.css"/>
-				
+
 		<script type="text/javascript">
 			
 			$(function(){
@@ -28,7 +28,7 @@
 					console.log('Second change event...');
 				});
 				
-				$('#price').number( true, 2 );
+				$('#price').number( true, 2, ",", "." );
 				
 				
 				// Get the value of the number for the demo.
@@ -40,7 +40,7 @@
 				});
 			});
 		</script>
-		
+
 		<link rel="stylesheet" href="http://www.teamdf.com/jquery-plugins/resources/stylesheets/prettify.css" type="text/css" />
 		
 		<style>
diff --git a/jquery.number.js b/jquery.number.js
index e044b32..54bf29d 100644
--- a/jquery.number.js
+++ b/jquery.number.js
@@ -85,6 +85,7 @@
 	 */
 	var _keydown = {
 		codes : {
+      110 : 44,
 			46 : 127,
 			188 : 44,
 			109 : 45,
@@ -99,7 +100,6 @@
 			187 : 61, //IE Key codes
 			186 : 59, //IE Key codes
 			189 : 45, //IE Key codes
-			110 : 46  //IE Key codes
 		},
 		shifts : {
 			96 : "~",
@@ -145,6 +145,9 @@
 			regex_dec_num	= new RegExp('[^'+u_dec+'0-9]','g'),
 			regex_dec		= new RegExp(u_dec,'g');
 
+		var u_tho			= ('\\u'+('0000'+(thousands_sep.charCodeAt(0).toString(16))).slice(-4)),
+			regex_tho		= new RegExp(u_tho,'g');
+
 		// If we've specified to take the number from the target element,
 		// we loop over the collection, and get the number.
 		if( number === true )
@@ -345,6 +348,7 @@
 							if( this.value.slice(start, start+1) != '0' )
 							{
 								val = this.value.slice(0, start) + '0' + this.value.slice(start+1);
+                val = val.replace(regex_tho,'');
 								// The regex replacement below removes negative sign from numbers...
 								// not sure why they're necessary here when none of the other cases use them
 								//$this.val(val.replace(regex_dec_num,'').replace(regex_dec,dec_point));
@@ -369,6 +373,7 @@
 							if( this.value.slice(start-1, start) != '0' )
 							{
 								val = this.value.slice(0, start-1) + '0' + this.value.slice(start);
+                val = val.replace(regex_tho,'');
 								// The regex replacement below removes negative sign from numbers...
 								// not sure why they're necessary here when none of the other cases use them
 								//$this.val(val.replace(regex_dec_num,'').replace(regex_dec,dec_point));
@@ -432,7 +437,7 @@
 						// If we need to re-position the characters.
 						if( setPos !== false )
 						{
-							//console.log('Setpos keydown: ', setPos );
+              //console.log('Setpos keydown: ', setPos );
 							setSelectionRange.apply(this, [setPos, setPos]);
 						}
 
diff --git a/jquery.number.min.js b/jquery.number.min.js
index 330d490..a1d75a8 100644
--- a/jquery.number.min.js
+++ b/jquery.number.min.js
@@ -1,2 +1 @@
-!function(e){"use strict";function t(e,t){if(this.createTextRange){var a=this.createTextRange();a.collapse(!0),a.moveStart("character",e),a.moveEnd("character",t-e),a.select()}else this.setSelectionRange&&(this.focus(),this.setSelectionRange(e,t))}function a(e){var t=this.value.length;if(e="start"==e.toLowerCase()?"Start":"End",document.selection){var a,i,n,l=document.selection.createRange();return a=l.duplicate(),a.expand("textedit"),a.setEndPoint("EndToEnd",l),i=a.text.length-l.text.length,n=i+l.text.length,"Start"==e?i:n}return"undefined"!=typeof this["selection"+e]&&(t=this["selection"+e]),t}var i={codes:{46:127,188:44,109:45,190:46,191:47,192:96,220:92,222:39,221:93,219:91,173:45,187:61,186:59,189:45,110:46},shifts:{96:"~",49:"!",50:"@",51:"#",52:"$",53:"%",54:"^",55:"&",56:"*",57:"(",48:")",45:"_",61:"+",91:"{",93:"}",92:"|",59:":",39:'"',44:"<",46:">",47:"?"}};e.fn.number=function(n,l,s,r){r="undefined"==typeof r?",":r,s="undefined"==typeof s?".":s,l="undefined"==typeof l?0:l;var u="\\u"+("0000"+s.charCodeAt(0).toString(16)).slice(-4),h=new RegExp("[^"+u+"0-9]","g"),o=new RegExp(u,"g");return n===!0?this.is("input:text")?this.on({"keydown.format":function(n){var u=e(this),h=u.data("numFormat"),o=n.keyCode?n.keyCode:n.which,c="",v=a.apply(this,["start"]),d=a.apply(this,["end"]),p="",f=!1;if(i.codes.hasOwnProperty(o)&&(o=i.codes[o]),!n.shiftKey&&o>=65&&90>=o?o+=32:!n.shiftKey&&o>=69&&105>=o?o-=48:n.shiftKey&&i.shifts.hasOwnProperty(o)&&(c=i.shifts[o]),""==c&&(c=String.fromCharCode(o)),8!=o&&45!=o&&127!=o&&c!=s&&!c.match(/[0-9]/)){var g=n.keyCode?n.keyCode:n.which;if(46==g||8==g||127==g||9==g||27==g||13==g||(65==g||82==g||80==g||83==g||70==g||72==g||66==g||74==g||84==g||90==g||61==g||173==g||48==g)&&(n.ctrlKey||n.metaKey)===!0||(86==g||67==g||88==g)&&(n.ctrlKey||n.metaKey)===!0||g>=35&&39>=g||g>=112&&123>=g)return;return n.preventDefault(),!1}if(0==v&&d==this.value.length?8==o?(v=d=1,this.value="",h.init=l>0?-1:0,h.c=l>0?-(l+1):0,t.apply(this,[0,0])):c==s?(v=d=1,this.value="0"+s+new Array(l+1).join("0"),h.init=l>0?1:0,h.c=l>0?-(l+1):0):45==o?(v=d=2,this.value="-0"+s+new Array(l+1).join("0"),h.init=l>0?1:0,h.c=l>0?-(l+1):0,t.apply(this,[2,2])):(h.init=l>0?-1:0,h.c=l>0?-l:0):h.c=d-this.value.length,h.isPartialSelection=v==d?!1:!0,l>0&&c==s&&v==this.value.length-l-1)h.c++,h.init=Math.max(0,h.init),n.preventDefault(),f=this.value.length+h.c;else if(45!=o||0==v&&0!=this.value.indexOf("-"))if(c==s)h.init=Math.max(0,h.init),n.preventDefault();else if(l>0&&127==o&&v==this.value.length-l-1)n.preventDefault();else if(l>0&&8==o&&v==this.value.length-l)n.preventDefault(),h.c--,f=this.value.length+h.c;else if(l>0&&127==o&&v>this.value.length-l-1){if(""===this.value)return;"0"!=this.value.slice(v,v+1)&&(p=this.value.slice(0,v)+"0"+this.value.slice(v+1),u.val(p)),n.preventDefault(),f=this.value.length+h.c}else if(l>0&&8==o&&v>this.value.length-l){if(""===this.value)return;"0"!=this.value.slice(v-1,v)&&(p=this.value.slice(0,v-1)+"0"+this.value.slice(v),u.val(p)),n.preventDefault(),h.c--,f=this.value.length+h.c}else 127==o&&this.value.slice(v,v+1)==r?n.preventDefault():8==o&&this.value.slice(v-1,v)==r?(n.preventDefault(),h.c--,f=this.value.length+h.c):l>0&&v==d&&this.value.length>l+1&&v>this.value.length-l-1&&isFinite(+c)&&!n.metaKey&&!n.ctrlKey&&!n.altKey&&1===c.length&&(p=d===this.value.length?this.value.slice(0,v-1):this.value.slice(0,v)+this.value.slice(v+1),this.value=p,f=v);else n.preventDefault();f!==!1&&t.apply(this,[f,f]),u.data("numFormat",h)},"keyup.format":function(i){var n,s=e(this),r=s.data("numFormat"),u=i.keyCode?i.keyCode:i.which,h=a.apply(this,["start"]),o=a.apply(this,["end"]);0!==h||0!==o||189!==u&&109!==u||(s.val("-"+s.val()),h=1,r.c=1-this.value.length,r.init=1,s.data("numFormat",r),n=this.value.length+r.c,t.apply(this,[n,n])),""===this.value||(48>u||u>57)&&(96>u||u>105)&&8!==u&&46!==u&&110!==u||(s.val(s.val()),l>0&&(r.init<1?(h=this.value.length-l-(r.init<0?1:0),r.c=h-this.value.length,r.init=1,s.data("numFormat",r)):h>this.value.length-l&&8!=u&&(r.c++,s.data("numFormat",r))),46!=u||r.isPartialSelection||(r.c++,s.data("numFormat",r)),n=this.value.length+r.c,t.apply(this,[n,n]))},"paste.format":function(t){var a=e(this),i=t.originalEvent,n=null;return window.clipboardData&&window.clipboardData.getData?n=window.clipboardData.getData("Text"):i.clipboardData&&i.clipboardData.getData&&(n=i.clipboardData.getData("text/plain")),a.val(n),t.preventDefault(),!1}}).each(function(){var t=e(this).data("numFormat",{c:-(l+1),decimals:l,thousands_sep:r,dec_point:s,regex_dec_num:h,regex_dec:o,init:this.value.indexOf(".")?!0:!1});""!==this.value&&t.val(t.val())}):this.each(function(){var t=e(this),a=+t.text().replace(h,"").replace(o,".");t.number(isFinite(a)?+a:0,l,s,r)}):this.text(e.number.apply(window,arguments))};var n=null,l=null;e.isPlainObject(e.valHooks.text)?(e.isFunction(e.valHooks.text.get)&&(n=e.valHooks.text.get),e.isFunction(e.valHooks.text.set)&&(l=e.valHooks.text.set)):e.valHooks.text={},e.valHooks.text.get=function(t){var a,i=e(t),l=i.data("numFormat");return l?""===t.value?"":(a=+t.value.replace(l.regex_dec_num,"").replace(l.regex_dec,"."),(0===t.value.indexOf("-")?"-":"")+(isFinite(a)?a:0)):e.isFunction(n)?n(t):void 0},e.valHooks.text.set=function(t,a){var i=e(t),n=i.data("numFormat");if(n){var s=e.number(a,n.decimals,n.dec_point,n.thousands_sep);return e.isFunction(l)?l(t,s):t.value=s}return e.isFunction(l)?l(t,a):void 0},e.number=function(e,t,a,i){i="undefined"==typeof i?"1000"!==new Number(1e3).toLocaleString()?new Number(1e3).toLocaleString().charAt(1):"":i,a="undefined"==typeof a?new Number(.1).toLocaleString().charAt(1):a,t=isFinite(+t)?Math.abs(t):0;var n="\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4),l="\\u"+("0000"+i.charCodeAt(0).toString(16)).slice(-4);e=(e+"").replace(".",a).replace(new RegExp(l,"g"),"").replace(new RegExp(n,"g"),".").replace(new RegExp("[^0-9+-Ee.]","g"),"");var s=isFinite(+e)?+e:0,r="",u=function(e,t){return""+ +(Math.round((""+e).indexOf("e")>0?e:e+"e+"+t)+"e-"+t)};return r=(t?u(s,t):""+Math.round(s)).split("."),r[0].length>3&&(r[0]=r[0].replace(/\B(?=(?:\d{3})+(?!\d))/g,i)),(r[1]||"").length<t&&(r[1]=r[1]||"",r[1]+=new Array(t-r[1].length+1).join("0")),r.join(a)}}(jQuery);
-//# sourceMappingURL=jquery.number.min.js.map
\ No newline at end of file
+!function(a){"use strict";function b(a,b){if(this.createTextRange){var c=this.createTextRange();c.collapse(!0),c.moveStart("character",a),c.moveEnd("character",b-a),c.select()}else this.setSelectionRange&&(this.focus(),this.setSelectionRange(a,b))}function c(a){var b=this.value.length;if(a="start"==a.toLowerCase()?"Start":"End",document.selection){var d,e,f,c=document.selection.createRange();return d=c.duplicate(),d.expand("textedit"),d.setEndPoint("EndToEnd",c),e=d.text.length-c.text.length,f=e+c.text.length,"Start"==a?e:f}return"undefined"!=typeof this["selection"+a]&&(b=this["selection"+a]),b}var d={codes:{110:44,46:127,188:44,109:45,190:46,191:47,192:96,220:92,222:39,221:93,219:91,173:45,187:61,186:59,189:45},shifts:{96:"~",49:"!",50:"@",51:"#",52:"$",53:"%",54:"^",55:"&",56:"*",57:"(",48:")",45:"_",61:"+",91:"{",93:"}",92:"|",59:":",39:'"',44:"<",46:">",47:"?"}};a.fn.number=function(e,f,g,h){h="undefined"==typeof h?",":h,g="undefined"==typeof g?".":g,f="undefined"==typeof f?0:f;var i="\\u"+("0000"+g.charCodeAt(0).toString(16)).slice(-4),j=new RegExp("[^"+i+"0-9]","g"),k=new RegExp(i,"g"),l="\\u"+("0000"+h.charCodeAt(0).toString(16)).slice(-4),m=new RegExp(l,"g");return e===!0?this.is("input:text")?this.on({"keydown.format":function(e){var i=a(this),j=i.data("numFormat"),k=e.keyCode?e.keyCode:e.which,l="",n=c.apply(this,["start"]),o=c.apply(this,["end"]),p="",q=!1;if(d.codes.hasOwnProperty(k)&&(k=d.codes[k]),!e.shiftKey&&k>=65&&k<=90?k+=32:!e.shiftKey&&k>=69&&k<=105?k-=48:e.shiftKey&&d.shifts.hasOwnProperty(k)&&(l=d.shifts[k]),""==l&&(l=String.fromCharCode(k)),8!=k&&45!=k&&127!=k&&l!=g&&!l.match(/[0-9]/)){var r=e.keyCode?e.keyCode:e.which;if(46==r||8==r||127==r||9==r||27==r||13==r||(65==r||82==r||80==r||83==r||70==r||72==r||66==r||74==r||84==r||90==r||61==r||173==r||48==r)&&(e.ctrlKey||e.metaKey)===!0||(86==r||67==r||88==r)&&(e.ctrlKey||e.metaKey)===!0||r>=35&&r<=39||r>=112&&r<=123)return;return e.preventDefault(),!1}if(0==n&&o==this.value.length?8==k?(n=o=1,this.value="",j.init=f>0?-1:0,j.c=f>0?-(f+1):0,b.apply(this,[0,0])):l==g?(n=o=1,this.value="0"+g+new Array(f+1).join("0"),j.init=f>0?1:0,j.c=f>0?-(f+1):0):45==k?(n=o=2,this.value="-0"+g+new Array(f+1).join("0"),j.init=f>0?1:0,j.c=f>0?-(f+1):0,b.apply(this,[2,2])):(j.init=f>0?-1:0,j.c=f>0?-f:0):j.c=o-this.value.length,j.isPartialSelection=n!=o,f>0&&l==g&&n==this.value.length-f-1)j.c++,j.init=Math.max(0,j.init),e.preventDefault(),q=this.value.length+j.c;else if(45!=k||0==n&&0!=this.value.indexOf("-"))if(l==g)j.init=Math.max(0,j.init),e.preventDefault();else if(f>0&&127==k&&n==this.value.length-f-1)e.preventDefault();else if(f>0&&8==k&&n==this.value.length-f)e.preventDefault(),j.c--,q=this.value.length+j.c;else if(f>0&&127==k&&n>this.value.length-f-1){if(""===this.value)return;"0"!=this.value.slice(n,n+1)&&(p=this.value.slice(0,n)+"0"+this.value.slice(n+1),p=p.replace(m,""),i.val(p)),e.preventDefault(),q=this.value.length+j.c}else if(f>0&&8==k&&n>this.value.length-f){if(""===this.value)return;"0"!=this.value.slice(n-1,n)&&(p=this.value.slice(0,n-1)+"0"+this.value.slice(n),p=p.replace(m,""),i.val(p)),e.preventDefault(),j.c--,q=this.value.length+j.c}else 127==k&&this.value.slice(n,n+1)==h?e.preventDefault():8==k&&this.value.slice(n-1,n)==h?(e.preventDefault(),j.c--,q=this.value.length+j.c):f>0&&n==o&&this.value.length>f+1&&n>this.value.length-f-1&&isFinite(+l)&&!e.metaKey&&!e.ctrlKey&&!e.altKey&&1===l.length&&(p=o===this.value.length?this.value.slice(0,n-1):this.value.slice(0,n)+this.value.slice(n+1),this.value=p,q=n);else e.preventDefault();q!==!1&&b.apply(this,[q,q]),i.data("numFormat",j)},"keyup.format":function(d){var k,e=a(this),g=e.data("numFormat"),h=d.keyCode?d.keyCode:d.which,i=c.apply(this,["start"]),j=c.apply(this,["end"]);0!==i||0!==j||189!==h&&109!==h||(e.val("-"+e.val()),i=1,g.c=1-this.value.length,g.init=1,e.data("numFormat",g),k=this.value.length+g.c,b.apply(this,[k,k])),""===this.value||(h<48||h>57)&&(h<96||h>105)&&8!==h&&46!==h&&110!==h||(e.val(e.val()),f>0&&(g.init<1?(i=this.value.length-f-(g.init<0?1:0),g.c=i-this.value.length,g.init=1,e.data("numFormat",g)):i>this.value.length-f&&8!=h&&(g.c++,e.data("numFormat",g))),46!=h||g.isPartialSelection||(g.c++,e.data("numFormat",g)),k=this.value.length+g.c,b.apply(this,[k,k]))},"paste.format":function(b){var c=a(this),d=b.originalEvent,e=null;return window.clipboardData&&window.clipboardData.getData?e=window.clipboardData.getData("Text"):d.clipboardData&&d.clipboardData.getData&&(e=d.clipboardData.getData("text/plain")),c.val(e),b.preventDefault(),!1}}).each(function(){var b=a(this).data("numFormat",{c:-(f+1),decimals:f,thousands_sep:h,dec_point:g,regex_dec_num:j,regex_dec:k,init:!!this.value.indexOf(".")});""!==this.value&&b.val(b.val())}):this.each(function(){var b=a(this),c=+b.text().replace(j,"").replace(k,".");b.number(isFinite(c)?+c:0,f,g,h)}):this.text(a.number.apply(window,arguments))};var e=null,f=null;a.isPlainObject(a.valHooks.text)?(a.isFunction(a.valHooks.text.get)&&(e=a.valHooks.text.get),a.isFunction(a.valHooks.text.set)&&(f=a.valHooks.text.set)):a.valHooks.text={},a.valHooks.text.get=function(b){var d,c=a(b),g=c.data("numFormat");return g?""===b.value?"":(d=+b.value.replace(g.regex_dec_num,"").replace(g.regex_dec,"."),(0===b.value.indexOf("-")?"-":"")+(isFinite(d)?d:0)):a.isFunction(e)?e(b):void 0},a.valHooks.text.set=function(b,c){var d=a(b),e=d.data("numFormat");if(e){var g=a.number(c,e.decimals,e.dec_point,e.thousands_sep);return a.isFunction(f)?f(b,g):b.value=g}return a.isFunction(f)?f(b,c):void 0},a.number=function(a,b,c,d){d="undefined"==typeof d?"1000"!==new Number(1e3).toLocaleString()?new Number(1e3).toLocaleString().charAt(1):"":d,c="undefined"==typeof c?new Number(.1).toLocaleString().charAt(1):c,b=isFinite(+b)?Math.abs(b):0;var e="\\u"+("0000"+c.charCodeAt(0).toString(16)).slice(-4),f="\\u"+("0000"+d.charCodeAt(0).toString(16)).slice(-4);a=(a+"").replace(".",c).replace(new RegExp(f,"g"),"").replace(new RegExp(e,"g"),".").replace(new RegExp("[^0-9+-Ee.]","g"),"");var g=isFinite(+a)?+a:0,h="",i=function(a,b){return""+ +(Math.round((""+a).indexOf("e")>0?a:a+"e+"+b)+"e-"+b)};return h=(b?i(g,b):""+Math.round(g)).split("."),h[0].length>3&&(h[0]=h[0].replace(/\B(?=(?:\d{3})+(?!\d))/g,d)),(h[1]||"").length<b&&(h[1]=h[1]||"",h[1]+=new Array(b-h[1].length+1).join("0")),h.join(c)}}(jQuery);
\ No newline at end of file