diff --git a/README.md b/README.md
index a205c06..f5c07a1 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@
 
 > A simple credit cards validation library in JavaScript.
 
-<img src="assets/images/credit-card-logo.png" alt="creditcard.js" />
-
 ## Install
 
 You can [download the zip file](https://github.com/contaazul/creditcard.js/archive/master.zip) or use NPM and Bower.
diff --git a/assets/images/credit-card-logo.png b/assets/images/credit-card-logo.png
deleted file mode 100644
index bf15f8b..0000000
Binary files a/assets/images/credit-card-logo.png and /dev/null differ
diff --git a/bower.json b/bower.json
index be4a57d..63a3587 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
   "name": "creditcard.js",
   "description": "A simple library for credit-card validation in JavaScript",
   "main": "dist/creditcard.min.js",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "authors": [
     "@ContaAzul"
   ],
diff --git a/dist/creditcard.js b/dist/creditcard.js
index 60e25fd..5af10e0 100644
--- a/dist/creditcard.js
+++ b/dist/creditcard.js
@@ -1,5 +1,5 @@
 /*!
- * creditcard.js v2.0.3
+ * creditcard.js v2.1.0
  * Created by @ContaAzul.
  *
  * Licensed MIT.
@@ -53,7 +53,7 @@ var CreditCard = function () {
     key: 'isSecurityCodeValid',
     value: function isSecurityCodeValid(number, code) {
       var brand = this.getCreditCardNameByNumber(number);
-      var numberLength = undefined;
+      var numberLength = void 0;
 
       numberLength = brand === 'Amex' ? 4 : 3;
       var regex = new RegExp('^[0-9]{' + numberLength + '}$');
@@ -69,6 +69,8 @@ var CreditCard = function () {
       m = parseInt(m, 10);
       y = parseInt(y, 10);
 
+      if (isNaN(m) || isNaN(y)) return false;
+
       if (m < 1 || m > 12) return false;
 
       return !(y < 1000 || y >= 3000);
@@ -107,7 +109,7 @@ var CREDIT_CARD_LIST = [{
   regexpFull: '^50[0-9]{14,17}$'
 }, {
   name: 'Mastercard',
-  regexpFull: '^5[1-5][0-9]{14}$'
+  regexpFull: '^(5[1-5][0-9]{14}|2221[0-9]{12}|222[2-9][0-9]{12}|22[3-9][0-9]{13}|2[3-6][0-9]{14}|27[01][0-9]{13}|2720[0-9]{12})$'
 }, {
   name: 'Visa',
   regexpFull: '^4[0-9]{12}(?:[0-9]{3})?$'
diff --git a/dist/creditcard.min.js b/dist/creditcard.min.js
index 045ad75..9ecaff3 100644
--- a/dist/creditcard.min.js
+++ b/dist/creditcard.min.js
@@ -1,7 +1,7 @@
 /*!
- * creditcard.js v2.0.3
+ * creditcard.js v2.1.0
  * Created by @ContaAzul.
  *
  * Licensed MIT.
  */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r;r="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,r.CreditCard=e()}}(function(){var e,r,n;return function e(r,n,t){function i(a,o){if(!n[a]){if(!r[a]){var l="function"==typeof require&&require;if(!o&&l)return l(a,!0);if(u)return u(a,!0);var f=new Error("Cannot find module '"+a+"'");throw f.code="MODULE_NOT_FOUND",f}var s=n[a]={exports:{}};r[a][0].call(s.exports,function(e){var n=r[a][1][e];return i(n?n:e)},s,s.exports,e,r,n,t)}return n[a].exports}for(var u="function"==typeof require&&require,a=0;a<t.length;a++)i(t[a]);return i}({1:[function(e,r,n){"use strict";function t(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),u=e("./creditCardList"),a=e("./helpers/luhn"),o=function(){function e(){t(this,e),this.creditcardlist=new u,this.luhn=new a}return i(e,[{key:"retrieveCreditCardList",value:function e(){return this.creditcardlist.retrieveCreditCardList()}},{key:"isValid",value:function e(r){return this.luhn.isValid(r)}},{key:"getCreditCardNameByNumber",value:function e(r){var n="Credit card is invalid!";if(!this.isValid(r))return n;for(var t=this.retrieveCreditCardList(),i=0;i<t.length;i++){var u=t[i],a=new RegExp(u.regexpFull);if(a.test(r))return u.name}return n}},{key:"isSecurityCodeValid",value:function e(r,n){var t=this.getCreditCardNameByNumber(r),i=void 0;i="Amex"===t?4:3;var u=new RegExp("^[0-9]{"+i+"}$");return u.test(n)}},{key:"isExpirationDateValid",value:function e(r,n){var t=r,i=n;return t=parseInt(t,10),i=parseInt(i,10),1>t||t>12?!1:!(1e3>i||i>=3e3)}}]),e}();r.exports=o},{"./creditCardList":2,"./helpers/luhn":3}],2:[function(e,r,n){"use strict";function t(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),u=[{name:"Elo",regexpFull:"^(401178|401179|431274|438935|451416|457393|457631|457632|504175|627780|636297|636368|(506699|5067[0-6]d|50677[0-8])|(50900d|5090[1-9]d|509[1-9]d{2})|65003[1-3]|(65003[5-9]|65004d|65005[0-1])|(65040[5-9]|6504[1-3]d)|(65048[5-9]|65049d|6505[0-2]d|65053[0-8])|(65054[1-9]|6505[5-8]d|65059[0-8])|(65070d|65071[0-8])|65072[0-7]|(65090[1-9]|65091d|650920)|(65165[2-9]|6516[6-7]d)|(65500d|65501d)|(65502[1-9]|6550[3-4]d|65505[0-8]))[0-9]{10,12}"},{name:"Diners",regexpFull:"^3(?:0[0-5]|[68][0-9])[0-9]{11}$"},{name:"Discover",regexpFull:"^6(?:011|5[0-9]{2})[0-9]{12}$"},{name:"Hipercard",regexpFull:"^(38[0-9]{17}|60[0-9]{14})$"},{name:"Amex",regexpFull:"^3[47][0-9]{13}$"},{name:"Aura",regexpFull:"^50[0-9]{14,17}$"},{name:"Mastercard",regexpFull:"^5[1-5][0-9]{14}$"},{name:"Visa",regexpFull:"^4[0-9]{12}(?:[0-9]{3})?$"}],a=function(){function e(){t(this,e),this.list=u}return i(e,[{key:"retrieveCreditCardList",value:function e(){return this.list}}]),e}();r.exports=a},{}],3:[function(e,r,n){"use strict";function t(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),u=function(){function e(){t(this,e),this.computed=[0,2,4,6,8,1,3,5,7,9]}return i(e,[{key:"_sum",value:function e(r){for(var n=0,t=0,i=r.length,u=!0;i--;)t=Number(r[i]),n+=(u=!u)?this.computed[t]:t;return n}},{key:"isValid",value:function e(r){var n=new RegExp("/[^0-9-s]+/"),t=r;if(n.test(t))return!1;t=t.replace(/\D/g,"");var i=this._sum(t);return i>0&&i%10===0}}]),e}();r.exports=u},{}]},{},[1])(1)});
\ No newline at end of file
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r;r="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,r.CreditCard=e()}}(function(){var e,r,n;return function e(r,n,t){function i(a,o){if(!n[a]){if(!r[a]){var l="function"==typeof require&&require;if(!o&&l)return l(a,!0);if(u)return u(a,!0);var f=new Error("Cannot find module '"+a+"'");throw f.code="MODULE_NOT_FOUND",f}var s=n[a]={exports:{}};r[a][0].call(s.exports,function(e){var n=r[a][1][e];return i(n?n:e)},s,s.exports,e,r,n,t)}return n[a].exports}for(var u="function"==typeof require&&require,a=0;a<t.length;a++)i(t[a]);return i}({1:[function(e,r,n){"use strict";function t(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),u=e("./creditCardList"),a=e("./helpers/luhn"),o=function(){function e(){t(this,e),this.creditcardlist=new u,this.luhn=new a}return i(e,[{key:"retrieveCreditCardList",value:function e(){return this.creditcardlist.retrieveCreditCardList()}},{key:"isValid",value:function e(r){return this.luhn.isValid(r)}},{key:"getCreditCardNameByNumber",value:function e(r){var n="Credit card is invalid!";if(!this.isValid(r))return n;for(var t=this.retrieveCreditCardList(),i=0;i<t.length;i++){var u=t[i],a=new RegExp(u.regexpFull);if(a.test(r))return u.name}return n}},{key:"isSecurityCodeValid",value:function e(r,n){var t=this.getCreditCardNameByNumber(r),i=void 0;i="Amex"===t?4:3;var u=new RegExp("^[0-9]{"+i+"}$");return u.test(n)}},{key:"isExpirationDateValid",value:function e(r,n){var t=r,i=n;return t=parseInt(t,10),i=parseInt(i,10),!isNaN(t)&&!isNaN(i)&&(!(t<1||t>12)&&!(i<1e3||i>=3e3))}}]),e}();r.exports=o},{"./creditCardList":2,"./helpers/luhn":3}],2:[function(e,r,n){"use strict";function t(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),u=[{name:"Elo",regexpFull:"^(401178|401179|431274|438935|451416|457393|457631|457632|504175|627780|636297|636368|(506699|5067[0-6]d|50677[0-8])|(50900d|5090[1-9]d|509[1-9]d{2})|65003[1-3]|(65003[5-9]|65004d|65005[0-1])|(65040[5-9]|6504[1-3]d)|(65048[5-9]|65049d|6505[0-2]d|65053[0-8])|(65054[1-9]|6505[5-8]d|65059[0-8])|(65070d|65071[0-8])|65072[0-7]|(65090[1-9]|65091d|650920)|(65165[2-9]|6516[6-7]d)|(65500d|65501d)|(65502[1-9]|6550[3-4]d|65505[0-8]))[0-9]{10,12}"},{name:"Diners",regexpFull:"^3(?:0[0-5]|[68][0-9])[0-9]{11}$"},{name:"Discover",regexpFull:"^6(?:011|5[0-9]{2})[0-9]{12}$"},{name:"Hipercard",regexpFull:"^(38[0-9]{17}|60[0-9]{14})$"},{name:"Amex",regexpFull:"^3[47][0-9]{13}$"},{name:"Aura",regexpFull:"^50[0-9]{14,17}$"},{name:"Mastercard",regexpFull:"^(5[1-5][0-9]{14}|2221[0-9]{12}|222[2-9][0-9]{12}|22[3-9][0-9]{13}|2[3-6][0-9]{14}|27[01][0-9]{13}|2720[0-9]{12})$"},{name:"Visa",regexpFull:"^4[0-9]{12}(?:[0-9]{3})?$"}],a=function(){function e(){t(this,e),this.list=u}return i(e,[{key:"retrieveCreditCardList",value:function e(){return this.list}}]),e}();r.exports=a},{}],3:[function(e,r,n){"use strict";function t(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),u=function(){function e(){t(this,e),this.computed=[0,2,4,6,8,1,3,5,7,9]}return i(e,[{key:"_sum",value:function e(r){for(var n=0,t=0,i=r.length,u=!0;i--;)t=Number(r[i]),n+=(u=!u)?this.computed[t]:t;return n}},{key:"isValid",value:function e(r){var n=new RegExp("/[^0-9-s]+/"),t=r;if(n.test(t))return!1;t=t.replace(/\D/g,"");var i=this._sum(t);return i>0&&i%10===0}}]),e}();r.exports=u},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/package.json b/package.json
index 20ccefc..e67edca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "creditcard.js",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "A simple library for credit-card validation in JavaScript",
   "main": "dist/creditcard.min.js",
   "repository": "ContaAzul/creditcard.js",
diff --git a/src/creditCardList.js b/src/creditCardList.js
index 0c05a89..e51761a 100644
--- a/src/creditCardList.js
+++ b/src/creditCardList.js
@@ -19,8 +19,7 @@ const CREDIT_CARD_LIST = [
     regexpFull: '^50[0-9]{14,17}$'
   }, {
     name: 'Mastercard',
-    regexpFull: '^5[1-5][0-9]{14}$'
-    //regexpFull: '^(5[1-5][0-9]{14}|2221[0-9]{12}|222[2-9][0-9]{12}|22[3-9][0-9]{13}|2[3-6][0-9]{14}|27[01][0-9]{13}|2720[0-9]{12})$'  //After October
+    regexpFull: '^(5[1-5][0-9]{14}|2221[0-9]{12}|222[2-9][0-9]{12}|22[3-9][0-9]{13}|2[3-6][0-9]{14}|27[01][0-9]{13}|2720[0-9]{12})$'
   }, {
     name: 'Visa',
     regexpFull: '^4[0-9]{12}(?:[0-9]{3})?$'