Merge branch 'master' into country-code-alpha-3

159 files changed, 8631 insertions, 1278 deletions

diff --git a/lib/address.js b/lib/address.js
index c0cd2d9b..650044fe 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -384,6 +384,14 @@ function Address (faker) {
         return [randomCoord[0].toFixed(4), randomCoord[1].toFixed(4)];
     }
 
+    /**
+     * Return a random time zone
+     * @method faker.address.timeZone
+     */
+    this.timeZone = function() {
+      return faker.random.arrayElement(faker.definitions.address.time_zone);
+    }
+
   return this;
 }
 
diff --git a/lib/commerce.js b/lib/commerce.js
index 79316256..6de8ffb9 100644
--- a/lib/commerce.js
+++ b/lib/commerce.js
@@ -113,6 +113,15 @@ var Commerce = function (faker) {
       return faker.random.arrayElement(faker.definitions.commerce.product_name.product);
   };
 
+  /**
+   * productDescription
+   *
+   * @method faker.commerce.productDescription
+   */
+  self.productDescription = function() {
+      return faker.random.arrayElement(faker.definitions.commerce.product_description);
+  };
+
   return self;
 };
 
diff --git a/lib/finance.js b/lib/finance.js
index c16b9e49..19bc0c19 100644
--- a/lib/finance.js
+++ b/lib/finance.js
@@ -110,8 +110,9 @@ var Finance = function (faker) {
       dec = dec === undefined ? 2 : dec;
       symbol = symbol || '';
       var randValue = faker.random.number({ max: max, min: min, precision: Math.pow(10, -dec) });
+      var stringNumber = symbol + randValue.toFixed(dec);
 
-      return symbol + randValue.toFixed(dec);
+      return Number(stringNumber);
   };
 
   /**
@@ -171,6 +172,22 @@ var Finance = function (faker) {
     return address;
   }
 
+/**
+ * litecoinAddress
+ *
+ * @method  faker.finance.litecoinAddress
+ */
+self.litecoinAddress = function () {
+  var addressLength = faker.random.number({ min: 26, max: 33 });
+
+  var address = faker.random.arrayElement(['L', 'M', '3']);
+
+  for (var i = 0; i < addressLength - 1; i++)
+    address += faker.random.arrayElement('123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ'.split(''));
+
+  return address;
+}
+
   /**
    * Credit card number
    * @method faker.finance.creditCardNumber
@@ -207,7 +224,7 @@ var Finance = function (faker) {
   };
   /**
    * Credit card CVV
-   * @method faker.finance.creditCardNumber
+   * @method faker.finance.creditCardCVV
   */
   self.creditCardCVV = function() {
     var cvv = "";
@@ -292,6 +309,22 @@ var Finance = function (faker) {
           prob < 40 ?
               Helpers.replaceSymbols("###") : "");
   };
+
+  /**
+   * description
+   *
+   * @method  faker.finance.transactionDescription
+   */
+  self.transactionDescription = function() {
+    var account = Helpers.createTransaction().account
+    var card = faker.finance.mask();
+    var currency = faker.finance.currencyCode();
+    var amount = Helpers.createTransaction().amount
+    var transactionType = Helpers.createTransaction().type
+    var company = Helpers.createTransaction().business
+    return transactionType + " transaction at " + company + " using card ending with ***" + card + " for " + currency + " " + amount + " in account ***" + account
+  }
+
 };
 
 module['exports'] = Finance;
diff --git a/lib/helpers.js b/lib/helpers.js
index a602ede6..4100c766 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -90,13 +90,16 @@ var Helpers = function (faker) {
    */
 
    self.replaceCreditCardSymbols = function(string, symbol) {
+
+     // default values required for calling method without arguments
+     string = string || "6453-####-####-####-###L";
      symbol = symbol || "#";
 
      // Function calculating the Luhn checksum of a number string
      var getCheckBit = function(number) {
        number.reverse();
        number = number.map(function(num, index){
-         if(index%2 === 0) {
+         if (index%2 === 0) {
            num *= 2;
            if(num>9) {
              num -= 9;
@@ -108,7 +111,6 @@ var Helpers = function (faker) {
        return sum % 10;
      };
 
-     string = string || "";
      string = faker.helpers.regexpStyleStringParse(string); // replace [4-9] with a random number in range etc...
      string = faker.helpers.replaceSymbolWithNumber(string, symbol); // replace ### with random numbers
 
@@ -192,17 +194,24 @@ var Helpers = function (faker) {
    };
 
   /**
-   * takes an array and returns it randomized
+   * takes an array and randomizes it in place then returns it
+   * 
+   * uses the modern version of the Fisher–Yates algorithm
    *
    * @method faker.helpers.shuffle
    * @param {array} o
    */
   self.shuffle = function (o) {
       if (typeof o === 'undefined' || o.length === 0) {
-        return [];
+        return o || [];
       }
       o = o || ["a", "b", "c"];
-      for (var j, x, i = o.length-1; i; j = faker.random.number(i), x = o[--i], o[i] = o[j], o[j] = x);
+      for (var x, j, i = o.length - 1; i > 0; --i) {
+        j = faker.random.number(i);
+        x = o[i];
+        o[i] = o[j];
+        o[j] = x;
+      }
       return o;
   };
 
diff --git a/lib/image.js b/lib/image.js
index 426ce78f..3f50d78f 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -3,6 +3,7 @@
  * @namespace faker.image
  * @property {object} lorempixel - faker.image.lorempixel
  * @property {object} unsplash - faker.image.unsplash
+ * @property {object} unsplash - faker.image.lorempicsum
  * @default Default provider is unsplash image provider
  */
 var Image = function (faker) {
@@ -10,6 +11,7 @@ var Image = function (faker) {
   var self = this;
   var Lorempixel = require('./image_providers/lorempixel');
   var Unsplash = require('./image_providers/unsplash');
+  var LoremPicsum = require('./image_providers/lorempicsum');
 
   /**
    * image
@@ -47,7 +49,7 @@ var Image = function (faker) {
       if (typeof https !== 'undefined' && https === true) {
         protocol = 'https://';
       }
-      var url = protocol + 'lorempixel.com/' + width + '/' + height;
+      var url = protocol + 'placeimg.com/' + width + '/' + height;
       if (typeof category !== 'undefined') {
         url += '/' + category;
       }
@@ -218,10 +220,11 @@ var Image = function (faker) {
 
   self.lorempixel = new Lorempixel(faker);
   self.unsplash = new Unsplash(faker);
+  self.lorempicsum = new LoremPicsum(faker);
 
   // Object.assign(self, self.unsplash);
   // How to set default as unsplash? should be image.default?
 }
 
 
-module["exports"] = Image;
\ No newline at end of file
+module["exports"] = Image;
diff --git a/lib/image_providers/lorempicsum.js b/lib/image_providers/lorempicsum.js
new file mode 100644
index 00000000..fbb6b65f
--- /dev/null
+++ b/lib/image_providers/lorempicsum.js
@@ -0,0 +1,108 @@
+/**
+ *
+ * @namespace lorempicsum
+ * @memberof faker.image
+ */
+var LoremPicsum = function (faker) {
+
+    var self = this;
+
+    /**
+     * image
+     *
+     * @param {number} width
+     * @param {number} height
+     * @param {boolean} grayscale
+     * @param {number} blur 1-10
+     * @method faker.image.lorempicsum.image
+     * @description search image from unsplash
+     */
+    self.image = function (width, height, grayscale, blur) {
+      return self.imageUrl(width, height, grayscale, blur);
+    };
+    /**
+     * imageGrayscaled
+     *
+     * @param {number} width
+     * @param {number} height
+     * @param {boolean} grayscale
+     * @method faker.image.lorempicsum.imageGrayscaled
+     * @description search grayscale image from unsplash
+     */
+    self.imageGrayscale = function (width, height, grayscale) {
+      return self.imageUrl(width, height, grayscale);
+    };
+    /**
+     * imageBlurred
+     *
+     * @param {number} width
+     * @param {number} height
+     * @param {number} blur 1-10
+     * @method faker.image.lorempicsum.imageBlurred
+     * @description search blurred image from unsplash
+     */
+    self.imageBlurred = function (width, height, blur) {
+      return self.imageUrl(width, height, undefined, blur);
+    };
+    /**
+     * imageRandomSeeded
+     *
+     * @param {number} width
+     * @param {number} height
+     * @param {boolean} grayscale
+     * @param {number} blur 1-10
+     * @param {string} seed
+     * @method faker.image.lorempicsum.imageRandomSeeded
+     * @description search same random image from unsplash, based on a seed
+     */
+    self.imageRandomSeeded = function (width, height, grayscale, blur, seed) {
+      return self.imageUrl(width, height, grayscale, blur, seed);
+    };
+    /**
+     * avatar
+     *
+     * @method faker.image.lorempicsum.avatar
+     */
+    self.avatar = function () {
+      return faker.internet.avatar();
+    };
+    /**
+     * imageUrl
+     *
+     * @param {number} width
+     * @param {number} height
+     * @param {boolean} grayscale
+     * @param {number} blur 1-10
+     * @param {string} seed
+     * @method faker.image.lorempicsum.imageUrl
+     */
+    self.imageUrl = function (width, height, grayscale, blur, seed) {
+        var width = width || 640;
+        var height = height || 480;
+  
+        var url = 'https://picsum.photos';
+          
+        if (seed) {
+          url += '/seed/' + seed;
+        }
+
+        url += '/' + width + '/' + height;
+        
+        if (grayscale && blur) {
+          return url + '?grayscale' + '&blur=' + blur;
+        }
+
+        if (grayscale) {
+          return url + '?grayscale';
+        }
+
+        if (blur) {
+          return url + '?blur=' + blur;
+        }
+    
+        return url;
+    };
+  }
+  
+  module["exports"] = LoremPicsum;
+  
\ No newline at end of file
diff --git a/lib/image_providers/lorempixel.js b/lib/image_providers/lorempixel.js
index 44c0e007..9ebd5824 100644
--- a/lib/image_providers/lorempixel.js
+++ b/lib/image_providers/lorempixel.js
@@ -40,7 +40,7 @@ var Lorempixel = function (faker) {
       var width = width || 640;
       var height = height || 480;
 
-      var url ='http://lorempixel.com/' + width + '/' + height;
+      var url ='https://lorempixel.com/' + width + '/' + height;
       if (typeof category !== 'undefined') {
         url += '/' + category;
       }
diff --git a/lib/index.js b/lib/index.js
index d9665e40..9c724180 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -83,6 +83,9 @@ function Faker (opts) {
   var _Date = require('./date');
   self.date = new _Date(self);
 
+  var _Time = require('./time');
+  self.time = new _Time(self);
+
   var Commerce = require('./commerce');
   self.commerce = new Commerce(self);
 
@@ -97,14 +100,14 @@ function Faker (opts) {
 
   var _definitions = {
     "name": ["first_name", "last_name", "prefix", "suffix", "gender", "title", "male_prefix", "female_prefix", "male_first_name", "female_first_name", "male_middle_name", "female_middle_name", "male_last_name", "female_last_name"],
-    "address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr"],
+    "address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr", "time_zone"],
     "company": ["adjective", "noun", "descriptor", "bs_adjective", "bs_noun", "bs_verb", "suffix"],
     "lorem": ["words"],
     "hacker": ["abbreviation", "adjective", "noun", "verb", "ingverb", "phrase"],
     "phone_number": ["formats"],
     "finance": ["account_type", "transaction_type", "currency", "iban", "credit_card"],
     "internet": ["avatar_uri", "domain_suffix", "free_email", "example_email", "password"],
-    "commerce": ["color", "department", "product_name", "price", "categories"],
+    "commerce": ["color", "department", "product_name", "price", "categories", "product_description"],
     "database": ["collation", "column", "engine", "type"],
     "system": ["mimeTypes", "directoryPaths"],
     "date": ["month", "weekday"],
diff --git a/lib/internet.js b/lib/internet.js
index ca33672d..658607a1 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -351,7 +351,7 @@ var Internet = function (faker) {
       * Copyright(c) 2011-2013 Bermi Ferrer <[email protected]>
       * MIT Licensed
       */
-     var consonant, letter, password, vowel;
+     var consonant, letter, vowel;
      letter = /[a-zA-Z]$/;
      vowel = /[aeiouAEIOU]$/;
      consonant = /[bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ]$/;
diff --git a/lib/locales.js b/lib/locales.js
index db99a245..fac08c1b 100644
--- a/lib/locales.js
+++ b/lib/locales.js
@@ -6,6 +6,7 @@ exports['de_AT'] = require('./locales/de_AT');
 exports['de_CH'] = require('./locales/de_CH');
 exports['en'] = require('./locales/en');
 exports['en_AU'] = require('./locales/en_AU');
+exports['en_AU_ocker'] = require('./locales/en_AU_ocker');
 exports['en_BORK'] = require('./locales/en_BORK');
 exports['en_CA'] = require('./locales/en_CA');
 exports['en_GB'] = require('./locales/en_GB');
@@ -13,7 +14,6 @@ exports['en_IE'] = require('./locales/en_IE');
 exports['en_IND'] = require('./locales/en_IND');
 exports['en_US'] = require('./locales/en_US');
 exports['en_ZA'] = require('./locales/en_ZA');
-exports['en_au_ocker'] = require('./locales/en_au_ocker');
 exports['es'] = require('./locales/es');
 exports['es_MX'] = require('./locales/es_MX');
 exports['fa'] = require('./locales/fa');
@@ -27,8 +27,8 @@ exports['ja'] = require('./locales/ja');
 exports['ko'] = require('./locales/ko');
 exports['nb_NO'] = require('./locales/nb_NO');
 exports['nep'] = require('./locales/nep');
-exports['nl_BE'] = require('./locales/nl_BE');
 exports['nl'] = require('./locales/nl');
+exports['nl_BE'] = require('./locales/nl_BE');
 exports['pl'] = require('./locales/pl');
 exports['pt_BR'] = require('./locales/pt_BR');
 exports['pt_PT'] = require('./locales/pt_PT');
diff --git a/lib/locales/af_ZA/index.js b/lib/locales/af_ZA/index.js
index 4385c355..83837c34 100644
--- a/lib/locales/af_ZA/index.js
+++ b/lib/locales/af_ZA/index.js
@@ -1,6 +1,6 @@
 var en_ZA = {};
 module['exports'] = en_ZA;
-en_ZA.title = "South Africa (Afrikaans)";
+en_ZA.title = "Afrikaans";
 en_ZA.address = require("./address");
 en_ZA.internet = require("./internet");
 en_ZA.phone_number = require("./phone_number");
diff --git a/lib/locales/ar/address/country.js b/lib/locales/ar/address/country.js
index 18469d7f..6bf360be 100644
--- a/lib/locales/ar/address/country.js
+++ b/lib/locales/ar/address/country.js
@@ -46,7 +46,7 @@ module["exports"] = [
   "جزيرة عيد الميلاد",
   "جزر كوكوس",
   "كولومبيا",
-  "Comoros",
+  "جزر القمر",
   "كونجو",
   "جزر كوك",
   "كوستا ريكا",
diff --git a/lib/locales/ar/address/secondary_address.js b/lib/locales/ar/address/secondary_address.js
index b4757b24..1d021366 100644
--- a/lib/locales/ar/address/secondary_address.js
+++ b/lib/locales/ar/address/secondary_address.js
@@ -1,4 +1,7 @@
 module["exports"] = [
   "### عمارة",
-  "### طابق"
+  "### طابق",
+  "### شقة",
+  "### بناية",
+  "### بيت"
 ];
diff --git a/lib/locales/ar/address/street_name.js b/lib/locales/ar/address/street_name.js
index c104f0e3..7f5b95c6 100644
--- a/lib/locales/ar/address/street_name.js
+++ b/lib/locales/ar/address/street_name.js
@@ -1,4 +1,4 @@
 module["exports"] = [
-  "#{street_preffix} #{Name.first_name}",
-  "#{street_preffix} #{Name.last_name}"
+  "#{street_prefix} #{Name.first_name}",
+  "#{street_prefix} #{Name.last_name}"
 ];
diff --git a/lib/locales/ar/commerce/color.js b/lib/locales/ar/commerce/color.js
index cac0fbf5..6a6d05a2 100644
--- a/lib/locales/ar/commerce/color.js
+++ b/lib/locales/ar/commerce/color.js
@@ -1,33 +1,34 @@
 module["exports"] = [
   "أحمر",
+  "أحمر غامق",
+  "أحمر فاتح",
   "أخضر",
+  "أخضر غامق",
+  "أخضر فاتح",
+  "زيتوني",
+  "فيروزي",
   "أزرق",
+  "أزرق غامق",
+  "أزرق فاتح",
+  "تركواز",
+  "أزرق سماوي",
   "أصفر",
-  "purple",
-  "mint green",
-  "teal",
+  "ليموني",
+  "أرجواني",
+  "بنفسجي",
+  "أرجواني فاتح",
+  "أرجواني خفيف",
   "أبيض",
   "أسود",
   "برتقالي",
-  "pink",
+  "زهري",
   "بني",
-  "maroon",
-  "بنفسجي",
-  "turquoise",
-  "tan",
-  "sky blue",
-  "salmon",
-  "plum",
-  "orchid",
-  "olive",
-  "magenta",
-  "lime",
-  "ivory",
-  "indigo",
+  "كستنائي",
+  "أسمر",
+  "عاجي",
+  "نيلي",
   "ذهبي",
-  "fuchsia",
-  "cyan",
-  "azure",
-  "lavender",
-  "فضي"
+  "فضي",
+  "رمادي",
+  "رصاصي"
 ];
diff --git a/lib/locales/ar/commerce/department.js b/lib/locales/ar/commerce/department.js
index 3b07fca7..5ab78116 100644
--- a/lib/locales/ar/commerce/department.js
+++ b/lib/locales/ar/commerce/department.js
@@ -4,19 +4,19 @@ module["exports"] = [
   "إلكترونيات",
   "حواسيب",
   "بيت",
-  "Garden",
+  "حديقة",
   "أدوات",
-  "Grocery",
+  "بقالة",
   "صحة",
   "جمال",
-  "Toys",
+  "ألعاب",
   "أطفال",
   "رضع",
   "ملابس",
   "أحذية",
-  "Jewelery",
+  "مجوهرات",
   "أغراض رياضية",
-  "Outdoors",
-  "Automotive",
+  "في الهواء الطلق",
+  "السيارات",
   "صناعة"
 ];
diff --git a/lib/locales/ar/commerce/index.js b/lib/locales/ar/commerce/index.js
index e8242422..c5513b11 100644
--- a/lib/locales/ar/commerce/index.js
+++ b/lib/locales/ar/commerce/index.js
@@ -1,4 +1,5 @@
 var commerce = {};
-module['exports'] = commerce;
+module["exports"] = commerce;
 commerce.color = require("./color");
-commerce.department = require("./department");
\ No newline at end of file
+commerce.department = require("./department");
+commerce.product_name = require("./product_name");
diff --git a/lib/locales/ar/commerce/product_name.js b/lib/locales/ar/commerce/product_name.js
new file mode 100644
index 00000000..ac9127f5
--- /dev/null
+++ b/lib/locales/ar/commerce/product_name.js
@@ -0,0 +1,59 @@
+module["exports"] = {
+  "adjective": [
+    "صغير",
+    "مريح",
+    "ريفي",
+    "ذكي",
+    "رائع",
+    "لا يصدق",
+    "عملي",
+    "أملس",
+    "ممتاز",
+    "عام",
+    "يدويا",
+    "صنع يدوي",
+    "مرخص",
+    "مشتق",
+    "بدون علامة",
+    "طيب المذاق"
+  ],
+  "material": [
+    "فولاذ",
+    "خشبي",
+    "خرسانة",
+    "بلاستيك",
+    "قطن",
+    "صوان",
+    "مطاط",
+    "معدن",
+    "ناعم",
+    "طازج",
+    "مجمد"
+  ],
+  "product": [
+    "كرسي",
+    "سيارة",
+    "حاسوب",
+    "لوحة المفاتيح",
+    "فأر",
+    "دراجة هوائية",
+    "كرة",
+    "قفازات",
+    "بنطال",
+    "قميص",
+    "طاولة",
+    "أحذية",
+    "قبعة",
+    "مناشف",
+    "صابون",
+    "تونة",
+    "دجاج",
+    "سمك",
+    "جبن",
+    "لحم خنزير مقدد",
+    "بيتزا",
+    "سلطة",
+    "سجق",
+    "رقائق بطاطس"
+  ]
+};
diff --git a/lib/locales/ar/index.js b/lib/locales/ar/index.js
index 20a3ba96..01dad726 100644
--- a/lib/locales/ar/index.js
+++ b/lib/locales/ar/index.js
@@ -1,8 +1,10 @@
 var ar = {};
-module['exports'] = ar;
+module["exports"] = ar;
 ar.title = "Arabic";
 ar.separator = " & ";
 ar.address = require("./address");
 ar.phone_number = require("./phone_number");
 ar.cell_phone = require("./cell_phone");
-ar.commerce = require("./commerce");
\ No newline at end of file
+ar.commerce = require("./commerce");
+ar.vehicle = require("./vehicle");
+ar.team = require("./team");
diff --git a/lib/locales/ar/name/first_name.js b/lib/locales/ar/name/first_name.js
new file mode 100644
index 00000000..146823e9
--- /dev/null
+++ b/lib/locales/ar/name/first_name.js
@@ -0,0 +1,329 @@
+module["exports"] = [
+  "محمد",
+  "أحمد",
+  "آسر",
+  "أركان",
+  "أسامة",
+  "أسعد",
+  "أشرف",
+  "أكرم",
+  "أليف",
+  "أمان",
+  "أمجد",
+  "أمير",
+  "أمين",
+  "أنس",
+  "أنيس",
+  "أوس",
+  "أيمن",
+  "إسلام",
+  "إيهاب",
+  "إياد",
+  "إياس",
+  "القاسم",
+  "المقداد",
+  "باسل",
+  "باسم",
+  "بدر",
+  "بدران",
+  "بركات",
+  "برهان",
+  "بسام",
+  "بسيم",
+  "بشار",
+  "بلال",
+  "بلبل",
+  "بليغ",
+  "بندر",
+  "بهيج",
+  "تميم",
+  "توفيق",
+  "تيسير",
+  "ثابت",
+  "جابر",
+  "جاد",
+  "جاسر",
+  "جاسم",
+  "جبريل",
+  "جسور",
+  "جعفر",
+  "جلال",
+  "جليل",
+  "جمال",
+  "جمعة",
+  "جميل",
+  "جهاد",
+  "جوهر",
+  "حاتم",
+  "حاجب",
+  "حارث",
+  "حازم",
+  "حافظ",
+  "حامد",
+  "حبيب",
+  "حذيفة",
+  "حسام",
+  "حسان",
+  "حسني",
+  "حسون",
+  "حطاب",
+  "حفيظ",
+  "حكيم",
+  "حلمي",
+  "حليم",
+  "حمدان",
+  "حمدي",
+  "حمزة",
+  "حمودة",
+  "حميد",
+  "حيدرة",
+  "خالد",
+  "خباب",
+  "خلدون",
+  "خليل",
+  "خيري",
+  "داوود",
+  "دريد",
+  "ديسم",
+  "ذاكر",
+  "رؤوف",
+  "رائد",
+  "رائف",
+  "رابح",
+  "راتب",
+  "راسم",
+  "راشد",
+  "راغب",
+  "راكان",
+  "رامز",
+  "رامي",
+  "ربيع",
+  "رتيب",
+  "رجب",
+  "رزق",
+  "رسلان",
+  "رشاد",
+  "رشدي",
+  "رشيد",
+  "رضا",
+  "رضوان",
+  "رعد",
+  "رفيع",
+  "رفيق",
+  "ركان",
+  "رمزي",
+  "رمضان",
+  "رنيم",
+  "رياض",
+  "ريان",
+  "زاهر",
+  "زياد",
+  "زيدون",
+  "زين الدين",
+  "سالم",
+  "سامح",
+  "سامر",
+  "سامي",
+  "سراج",
+  "سرحان",
+  "سرمد",
+  "سريج",
+  "سعد",
+  "سعيد",
+  "سفيان",
+  "سلامة",
+  "سلمان",
+  "سليم",
+  "سماح",
+  "سمير",
+  "سهيل",
+  "سيف",
+  "شادي",
+  "شاكر",
+  "شريف",
+  "شعبان",
+  "شفيع",
+  "شفيق",
+  "شكري",
+  "شكيب",
+  "شمس الدين",
+  "شهاب",
+  "شوقي",
+  "صابر",
+  "صادق",
+  "صبحي",
+  "صبري",
+  "صخر",
+  "صداح",
+  "صدقي",
+  "صفوان",
+  "صقر",
+  "صلاح",
+  "صهيب",
+  "ضياء",
+  "طارق",
+  "طاهر",
+  "طلال",
+  "طيب",
+  "ظافر",
+  "عادل",
+  "عارف",
+  "عاشور",
+  "عاصم",
+  "عاصي",
+  "عاطف",
+  "عامر",
+  "عباس",
+  "عثمان",
+  "عجمي",
+  "عدلان",
+  "عدلي",
+  "عدنان",
+  "عدي",
+  "عرفات",
+  "عرفان",
+  "عز الدين",
+  "عزام",
+  "عزمي",
+  "عزيز",
+  "عطا",
+  "عطية",
+  "عفيف",
+  "علاء",
+  "علوي",
+  "علي",
+  "عماد",
+  "عمار",
+  "عمر",
+  "عمران",
+  "عياض",
+  "غازي",
+  "غانم",
+  "غسان",
+  "غفار",
+  "غيث",
+  "فؤاد",
+  "فائز",
+  "فاخر",
+  "فادي",
+  "فارس",
+  "فاروق",
+  "فاضل",
+  "فاكر",
+  "فتاح",
+  "فتحي",
+  "فخري",
+  "فراس",
+  "فرج",
+  "فرحات",
+  "فريد",
+  "فضل",
+  "فضيل",
+  "فكري",
+  "فهد",
+  "فهمي",
+  "فواز",
+  "فوزي",
+  "فيصل",
+  "قاسم",
+  "قدري",
+  "قيس",
+  "كاظم",
+  "كامل",
+  "كرم",
+  "كمال",
+  "لبيب",
+  "لطفي",
+  "ليث",
+  "مأمون",
+  "مؤمن",
+  "مؤنس",
+  "ماجد",
+  "مازن",
+  "مبارك",
+  "مبروك",
+  "مجاهد",
+  "مجد",
+  "مجدي",
+  "مجيد",
+  "محجوب",
+  "محرز",
+  "محسن",
+  "محفوظ",
+  "محمود",
+  "مختار",
+  "مخلص",
+  "مراد",
+  "مرتضى",
+  "مرزوق",
+  "مرسي",
+  "مرشد",
+  "مرعي",
+  "مروان",
+  "مستعين",
+  "مسعد",
+  "مسعود",
+  "مصطفى",
+  "مصعب",
+  "مصلح",
+  "مطيع",
+  "معاذ",
+  "معتز",
+  "معز",
+  "معين",
+  "مفتاح",
+  "مقداد",
+  "ممتاز",
+  "ممدوح",
+  "منتصر",
+  "منذر",
+  "منصف",
+  "منصور",
+  "منعم",
+  "منيب",
+  "منير",
+  "مهدي",
+  "مهند",
+  "مهيب",
+  "ناجح",
+  "ناجي",
+  "نادر",
+  "ناصح",
+  "ناصر",
+  "ناصف",
+  "ناظم",
+  "نافع",
+  "نبيل",
+  "نجيب",
+  "نديم",
+  "نزار",
+  "نزيه",
+  "نسيم",
+  "نصحي",
+  "نصر",
+  "نضال",
+  "نعمان",
+  "نعيم",
+  "نهاد",
+  "نور الدين",
+  "نوري",
+  "نوفل",
+  "هاشم",
+  "هاني",
+  "هشام",
+  "هيثم",
+  "هيكل",
+  "وائل",
+  "واصف",
+  "وجدي",
+  "وديع",
+  "وسام",
+  "وسيم",
+  "وصفي",
+  "وليد",
+  "ياسر",
+  "ياسين",
+  "يافع",
+  "يامن",
+  "يحيى"
+];
diff --git a/lib/locales/ar/name/index.js b/lib/locales/ar/name/index.js
new file mode 100644
index 00000000..44fd8585
--- /dev/null
+++ b/lib/locales/ar/name/index.js
@@ -0,0 +1,7 @@
+var name = {};
+module['exports'] = name;
+name.first_name = require("./first_name");
+name.last_name = require("./last_name");
+name.prefix = require("./prefix");
+name.title = require("./title");
+name.name = require("./name");
diff --git a/lib/locales/ar/name/last_name.js b/lib/locales/ar/name/last_name.js
new file mode 100644
index 00000000..71f397f0
--- /dev/null
+++ b/lib/locales/ar/name/last_name.js
@@ -0,0 +1,80 @@
+module["exports"] = [
+  "يافع",
+  "هذيل",
+  "همدان",
+  "يافع",
+  "الأشراف",
+  "الكراي",
+  "الرقيق",
+  "بودوارة",
+  "خنفير",
+  "السقا",
+  "الطريقي",
+  "الشريف",
+  "المنيف",
+  "النفير",
+  "الشتيوي",
+  "الشيباني",
+  "الخليفي",
+  "المولدي",
+  "الكافي",
+  "العواني",
+  "بن عبد السلام",
+  "عاشور",
+  "النفطي",
+  "بن عثمان",
+  "بن عاشور",
+  "البشيري",
+  "السقاط",
+  "ادريس",
+  "بن حسين",
+  ,"القلشاني",
+  "الحجيج",
+  "بن عبد الكريم",
+  "فقوسة",
+  "بن حمودة",
+  "العنابي",
+  "القلال",
+  "الدنوني",
+  "النقاش",
+  "الغربي",
+  "نيفر",
+  "العطار",
+  "المحجوب",
+  "زقية",
+  "تومي",
+  "بن عبدالله",
+  "سعيد",
+  "النابلي",
+  "بن عمر",
+  "شنيق",
+  "عنون",
+  "الرصاع",
+  "النخلي",
+  "الصفار",
+  "الزوابي",
+  "العلاني",
+  "الع لويني",
+  "الحمامي",
+  "جاوحدو",
+  "شقرون",
+  "العلايمي",
+  "العواني",
+  "الصغير",
+  "جابالله",
+  "بنسلامة",
+  "جراد",
+  "بوديبة",
+  "الدرقاش",
+  "بوهاها",
+  "عطالله",
+  "سويس",
+  "عظومة",
+  "المدقي",
+  "الوحيشي",
+  "لخشين",
+  "زروق",
+  "النجار",
+  "غويلة",
+  "الطويل"
+];
diff --git a/lib/locales/ar/name/name.js b/lib/locales/ar/name/name.js
new file mode 100644
index 00000000..7e684a3c
--- /dev/null
+++ b/lib/locales/ar/name/name.js
@@ -0,0 +1,5 @@
+module["exports"] = [
+  "#{prefix} #{first_name} #{last_name}",
+  "#{first_name} #{last_name}",
+  "#{last_name} #{first_name}"
+];
diff --git a/lib/locales/ar/name/prefix.js b/lib/locales/ar/name/prefix.js
new file mode 100644
index 00000000..23c4b6ad
--- /dev/null
+++ b/lib/locales/ar/name/prefix.js
@@ -0,0 +1,7 @@
+module["exports"] = [
+  "سيد",
+  "سيدة",
+  "آنسة",
+  "دكتور",
+  "بروفيسور"
+];
diff --git a/lib/locales/ar/name/title.js b/lib/locales/ar/name/title.js
new file mode 100644
index 00000000..15323535
--- /dev/null
+++ b/lib/locales/ar/name/title.js
@@ -0,0 +1,22 @@
+module["exports"] = {
+  "job": [
+    "مشرف",
+    "تنفيذي",
+    "مدير",
+    "مهندس",
+    "متخصص",
+    "رئيس مؤسسة",
+    "منسق",
+    "إداري",
+    "مخطط",
+    "محلل",
+    "مصمم",
+    "تقني",
+    "مبرمج",
+    "منتج",
+    "مستشار",
+    "مساعد",
+    "وكيل",
+    "متدرب"
+  ]
+};
diff --git a/lib/locales/ar/team/creature.js b/lib/locales/ar/team/creature.js
new file mode 100644
index 00000000..5ddd7313
--- /dev/null
+++ b/lib/locales/ar/team/creature.js
@@ -0,0 +1,69 @@
+module["exports"] = [
+  "النمل",
+  "الخفافيش",
+  "تتحمل",
+  "النحل",
+  "الطيور",
+  "الجاموس",
+  "القطط",
+  "دجاجة",
+  "ماشية",
+  "الكلاب",
+  "الدلافين",
+  "البط",
+  "الفيلة",
+  "الأسماك",
+  "الثعالب",
+  "الضفادع",
+  "أوز",
+  "الماعز",
+  "خيل",
+  "الكنغر",
+  "الأسود",
+  "القرود",
+  "البوم",
+  "الثيران",
+  "طيور البطريق",
+  "اشخاص",
+  "الخنازير",
+  "الأرانب",
+  "خروف",
+  "النمور",
+  "الحيتان",
+  "الذئاب",
+  "حمار",
+  "الشؤم",
+  "الغربان",
+  "قطط سوداء",
+  "الوهم",
+  "أشباح",
+  "المتآمرين",
+  "التنين",
+  "الأقزام",
+  "الجان",
+  "السحرة",
+  "التعويذيون",
+  "أبناء",
+  "الأعداء",
+  "العمالقة",
+  "التماثيل",
+  "العفاريت",
+  "لحم الوز",
+  "العنقاء",
+  "استذئاب",
+  "عدو",
+  "الغيلان",
+  "أقوال",
+  "الأنبياء",
+  "السحرة",
+  "العناكب",
+  "معنويات",
+  "مصاصي دماء",
+  "السحرة",
+  "الثعالب",
+  "ذئاب ضارية",
+  "السحرة",
+  "عبدة",
+  "الاموات الاحياء",
+  "درويدس"
+];
diff --git a/lib/locales/ar/team/index.js b/lib/locales/ar/team/index.js
new file mode 100644
index 00000000..f4e624f0
--- /dev/null
+++ b/lib/locales/ar/team/index.js
@@ -0,0 +1,4 @@
+var team = {};
+module['exports'] = team;
+team.creature = require("./creature");
+team.name = require("./name");
diff --git a/lib/locales/ar/team/name.js b/lib/locales/ar/team/name.js
new file mode 100644
index 00000000..bded21a9
--- /dev/null
+++ b/lib/locales/ar/team/name.js
@@ -0,0 +1,3 @@
+module["exports"] = [
+  "#{Address.state} #{creature}"
+];
diff --git a/lib/locales/ar/vehicle/fuel.js b/lib/locales/ar/vehicle/fuel.js
new file mode 100644
index 00000000..666e22cb
--- /dev/null
+++ b/lib/locales/ar/vehicle/fuel.js
@@ -0,0 +1 @@
+module["exports"] = ["ديزل", "كهربائي", "بنزين", "هجين"];
diff --git a/lib/locales/ar/vehicle/index.js b/lib/locales/ar/vehicle/index.js
new file mode 100644
index 00000000..1c62416f
--- /dev/null
+++ b/lib/locales/ar/vehicle/index.js
@@ -0,0 +1,7 @@
+var vehicle = {};
+
+module["exports"] = vehicle;
+vehicle.fuel = require("./fuel");
+vehicle.manufacturer = require("./manufacturer");
+vehicle.module = require("./model");
+vehicle.type = require("./vehicle_type");
diff --git a/lib/locales/ar/vehicle/manufacturer.js b/lib/locales/ar/vehicle/manufacturer.js
new file mode 100644
index 00000000..ba514dc6
--- /dev/null
+++ b/lib/locales/ar/vehicle/manufacturer.js
@@ -0,0 +1,30 @@
+module["exports"] = [
+  "شيفروليه",
+  "كاديلاك",
+  "فورد",
+  "كرايسلر",
+  "دودج",
+  "جيب",
+  "تسلا",
+  "تويوتا",
+  "هوندا",
+  "نيسان",
+  "أودي",
+  "مرسيدس بنز",
+  "بي إم دبليو",
+  "فولكس واجن",
+  "بورش",
+  "جاكوار",
+  "استون مارتن",
+  "لاند روفر",
+  "بنتلي",
+  "ميني",
+  "رولزرويس",
+  "فيات",
+  "لامبورغيني",
+  "مازيراتي",
+  "فيراري",
+  "بوجاتي",
+  "كيا",
+  "هيونداي"
+];
diff --git a/lib/locales/ar/vehicle/model.js b/lib/locales/ar/vehicle/model.js
new file mode 100644
index 00000000..2800de4e
--- /dev/null
+++ b/lib/locales/ar/vehicle/model.js
@@ -0,0 +1,47 @@
+module["exports"] = [
+  "فييستا",
+  "التركيز",
+  "الثور",
+  "موستانج",
+  "اكسبلورر",
+  "البعثة",
+  "نموذج T",
+  "رانتشيرو",
+  "فولت",
+  "كروز",
+  "ماليبو",
+  "إمبالا",
+  "كامارو",
+  "كورفيت",
+  "كولورادو",
+  "سيلفرادو",
+  "ش كامينو",
+  "إسكاليد",
+  "جبال الألب",
+  "شاحن",
+  "لو بارون",
+  "بي تي كروزر",
+  "تشالنجر",
+  "دورانجو",
+  "القافلة الكبرى",
+  "رانجلر",
+  "جراند شيروكي",
+  "رودستر",
+  "عارضات ازياء",
+  "النموذج 3",
+  "كامري",
+  "بريوس",
+  "لاند كروزر",
+  "اتفاق",
+  "المدنية",
+  "جزء",
+  "سنترا",
+  "ألتيما",
+  "خنفساء",
+  "جيتا",
+  "جولف",
+  "سبايدر",
+  "الكونتاش",
+  "مورسيلاغو",
+  "أفينتادور"
+];
diff --git a/lib/locales/ar/vehicle/vehicle_type.js b/lib/locales/ar/vehicle/vehicle_type.js
new file mode 100644
index 00000000..dede35d0
--- /dev/null
+++ b/lib/locales/ar/vehicle/vehicle_type.js
@@ -0,0 +1,13 @@
+module["exports"] = [
+  "كارغو فان",
+  "مكشوفة",
+  "كوبيه",
+  "طاقم الكابينة بيك آب",
+  "تمديد الكابينة بيك آب",
+  "هاتشباك",
+  "ميني فان",
+  "سيارة الركاب",
+  "سيارة رياضية",
+  "سيدان",
+  "عربة"
+];
diff --git a/lib/locales/az/commerce/product_name.js b/lib/locales/az/commerce/product_name.js
index e93af1b9..4eac4e31 100644
--- a/lib/locales/az/commerce/product_name.js
+++ b/lib/locales/az/commerce/product_name.js
@@ -28,6 +28,6 @@ module["exports"] = {
     "Kulon",
     "Stol",
     "Sviter",
-    "Kəmər",
+    "Kəmər"
   ]
 };
diff --git a/lib/locales/cz/name/name.js b/lib/locales/cz/name/name.js
index 09beaf04..b1e852c5 100644
--- a/lib/locales/cz/name/name.js
+++ b/lib/locales/cz/name/name.js
@@ -1,12 +1,12 @@
 module["exports"] = [
-  "#{prefix} #{man_first_name} #{man_last_name}",
-  "#{prefix} #{woman_first_name} #{woman_last_name}",
-  "#{man_first_name} #{man_last_name} #{suffix}",
-  "#{woman_first_name} #{woman_last_name} #{suffix}",
-  "#{man_first_name} #{man_last_name}",
-  "#{man_first_name} #{man_last_name}",
-  "#{man_first_name} #{man_last_name}",
-  "#{woman_first_name} #{woman_last_name}",
-  "#{woman_first_name} #{woman_last_name}",
-  "#{woman_first_name} #{woman_last_name}"
+  "#{prefix} #{male_first_name} #{male_last_name}",
+  "#{prefix} #{female_first_name} #{female_last_name}",
+  "#{male_first_name} #{male_last_name} #{suffix}",
+  "#{female_first_name} #{female_last_name} #{suffix}",
+  "#{male_first_name} #{male_last_name}",
+  "#{male_first_name} #{male_last_name}",
+  "#{male_first_name} #{male_last_name}",
+  "#{female_first_name} #{female_last_name}",
+  "#{female_first_name} #{female_last_name}",
+  "#{female_first_name} #{female_last_name}"
 ];
diff --git a/lib/locales/de/name/female_first_name.js b/lib/locales/de/name/female_first_name.js
new file mode 100644
index 00000000..0c973e2b
--- /dev/null
+++ b/lib/locales/de/name/female_first_name.js
@@ -0,0 +1,585 @@
+module["exports"] = [
+  "Aaliyah",
+  "Abby",
+  "Abigail",
+  "Ada",
+  "Adelina",
+  "Adriana",
+  "Aileen",
+  "Aimee",
+  "Alana",
+  "Alea",
+  "Alena",
+  "Alessa",
+  "Alessia",
+  "Alexa",
+  "Alexandra",
+  "Alexia",
+  "Alexis",
+  "Aleyna",
+  "Alia",
+  "Alica",
+  "Alice",
+  "Alicia",
+  "Alina",
+  "Alisa",
+  "Alisha",
+  "Alissa",
+  "Aliya",
+  "Aliyah",
+  "Allegra",
+  "Alma",
+  "Alyssa",
+  "Amalia",
+  "Amanda",
+  "Amelia",
+  "Amelie",
+  "Amina",
+  "Amira",
+  "Amy",
+  "Ana",
+  "Anabel",
+  "Anastasia",
+  "Andrea",
+  "Angela",
+  "Angelina",
+  "Angelique",
+  "Anja",
+  "Ann",
+  "Anna",
+  "Annabel",
+  "Annabell",
+  "Annabelle",
+  "Annalena",
+  "Anne",
+  "Anneke",
+  "Annelie",
+  "Annemarie",
+  "Anni",
+  "Annie",
+  "Annika",
+  "Anny",
+  "Anouk",
+  "Antonia",
+  "Arda",
+  "Ariana",
+  "Ariane",
+  "Arwen",
+  "Ashley",
+  "Asya",
+  "Aurelia",
+  "Aurora",
+  "Ava",
+  "Ayleen",
+  "Aylin",
+  "Ayse",
+  "Azra",
+  "Betty",
+  "Bianca",
+  "Bianka",
+  "Caitlin",
+  "Cara",
+  "Carina",
+  "Carla",
+  "Carlotta",
+  "Carmen",
+  "Carolin",
+  "Carolina",
+  "Caroline",
+  "Cassandra",
+  "Catharina",
+  "Catrin",
+  "Cecile",
+  "Cecilia",
+  "Celia",
+  "Celina",
+  "Celine",
+  "Ceyda",
+  "Ceylin",
+  "Chantal",
+  "Charleen",
+  "Charlotta",
+  "Charlotte",
+  "Chayenne",
+  "Cheyenne",
+  "Chiara",
+  "Christin",
+  "Christina",
+  "Cindy",
+  "Claire",
+  "Clara",
+  "Clarissa",
+  "Colleen",
+  "Collien",
+  "Cora",
+  "Corinna",
+  "Cosima",
+  "Dana",
+  "Daniela",
+  "Daria",
+  "Darleen",
+  "Defne",
+  "Delia",
+  "Denise",
+  "Diana",
+  "Dilara",
+  "Dina",
+  "Dorothea",
+  "Ecrin",
+  "Eda",
+  "Eileen",
+  "Ela",
+  "Elaine",
+  "Elanur",
+  "Elea",
+  "Elena",
+  "Eleni",
+  "Eleonora",
+  "Eliana",
+  "Elif",
+  "Elina",
+  "Elisa",
+  "Elisabeth",
+  "Ella",
+  "Ellen",
+  "Elli",
+  "Elly",
+  "Elsa",
+  "Emelie",
+  "Emely",
+  "Emilia",
+  "Emilie",
+  "Emily",
+  "Emma",
+  "Emmely",
+  "Emmi",
+  "Emmy",
+  "Enie",
+  "Enna",
+  "Enya",
+  "Esma",
+  "Estelle",
+  "Esther",
+  "Eva",
+  "Evelin",
+  "Evelina",
+  "Eveline",
+  "Evelyn",
+  "Fabienne",
+  "Fatima",
+  "Fatma",
+  "Felicia",
+  "Felicitas",
+  "Felina",
+  "Femke",
+  "Fenja",
+  "Fine",
+  "Finia",
+  "Finja",
+  "Finnja",
+  "Fiona",
+  "Flora",
+  "Florentine",
+  "Francesca",
+  "Franka",
+  "Franziska",
+  "Frederike",
+  "Freya",
+  "Frida",
+  "Frieda",
+  "Friederike",
+  "Giada",
+  "Gina",
+  "Giulia",
+  "Giuliana",
+  "Greta",
+  "Hailey",
+  "Hana",
+  "Hanna",
+  "Hannah",
+  "Heidi",
+  "Helen",
+  "Helena",
+  "Helene",
+  "Helin",
+  "Henriette",
+  "Henrike",
+  "Hermine",
+  "Ida",
+  "Ilayda",
+  "Imke",
+  "Ina",
+  "Ines",
+  "Inga",
+  "Inka",
+  "Irem",
+  "Isa",
+  "Isabel",
+  "Isabell",
+  "Isabella",
+  "Isabelle",
+  "Ivonne",
+  "Jacqueline",
+  "Jamie",
+  "Jamila",
+  "Jana",
+  "Jane",
+  "Janin",
+  "Janina",
+  "Janine",
+  "Janna",
+  "Janne",
+  "Jara",
+  "Jasmin",
+  "Jasmina",
+  "Jasmine",
+  "Jella",
+  "Jenna",
+  "Jennifer",
+  "Jenny",
+  "Jessica",
+  "Jessy",
+  "Jette",
+  "Jil",
+  "Jill",
+  "Joana",
+  "Joanna",
+  "Joelina",
+  "Joeline",
+  "Joelle",
+  "Johanna",
+  "Joleen",
+  "Jolie",
+  "Jolien",
+  "Jolin",
+  "Jolina",
+  "Joline",
+  "Jona",
+  "Jonah",
+  "Jonna",
+  "Josefin",
+  "Josefine",
+  "Josephin",
+  "Josephine",
+  "Josie",
+  "Josy",
+  "Joy",
+  "Joyce",
+  "Judith",
+  "Judy",
+  "Jule",
+  "Julia",
+  "Juliana",
+  "Juliane",
+  "Julie",
+  "Julienne",
+  "Julika",
+  "Julina",
+  "Juna",
+  "Justine",
+  "Kaja",
+  "Karina",
+  "Karla",
+  "Karlotta",
+  "Karolina",
+  "Karoline",
+  "Kassandra",
+  "Katarina",
+  "Katharina",
+  "Kathrin",
+  "Katja",
+  "Katrin",
+  "Kaya",
+  "Kayra",
+  "Kiana",
+  "Kiara",
+  "Kim",
+  "Kimberley",
+  "Kimberly",
+  "Kira",
+  "Klara",
+  "Korinna",
+  "Kristin",
+  "Kyra",
+  "Laila",
+  "Lana",
+  "Lara",
+  "Larissa",
+  "Laura",
+  "Laureen",
+  "Lavinia",
+  "Lea",
+  "Leah",
+  "Leana",
+  "Leandra",
+  "Leann",
+  "Lee",
+  "Leila",
+  "Lena",
+  "Lene",
+  "Leni",
+  "Lenia",
+  "Lenja",
+  "Lenya",
+  "Leona",
+  "Leoni",
+  "Leonie",
+  "Leonora",
+  "Leticia",
+  "Letizia",
+  "Levke",
+  "Leyla",
+  "Lia",
+  "Liah",
+  "Liana",
+  "Lili",
+  "Lilia",
+  "Lilian",
+  "Liliana",
+  "Lilith",
+  "Lilli",
+  "Lillian",
+  "Lilly",
+  "Lily",
+  "Lina",
+  "Linda",
+  "Lindsay",
+  "Line",
+  "Linn",
+  "Linnea",
+  "Lisa",
+  "Lisann",
+  "Lisanne",
+  "Liv",
+  "Livia",
+  "Liz",
+  "Lola",
+  "Loreen",
+  "Lorena",
+  "Lotta",
+  "Lotte",
+  "Louisa",
+  "Louise",
+  "Luana",
+  "Luca",
+  "Lucia",
+  "Lucie",
+  "Lucienne",
+  "Lucy",
+  "Luisa",
+  "Luise",
+  "Luka",
+  "Luna",
+  "Luzie",
+  "Lya",
+  "Lydia",
+  "Lyn",
+  "Lynn",
+  "Madeleine",
+  "Madita",
+  "Madleen",
+  "Madlen",
+  "Magdalena",
+  "Maike",
+  "Mailin",
+  "Maira",
+  "Maja",
+  "Malena",
+  "Malia",
+  "Malin",
+  "Malina",
+  "Mandy",
+  "Mara",
+  "Marah",
+  "Mareike",
+  "Maren",
+  "Maria",
+  "Mariam",
+  "Marie",
+  "Marieke",
+  "Mariella",
+  "Marika",
+  "Marina",
+  "Marisa",
+  "Marissa",
+  "Marit",
+  "Marla",
+  "Marleen",
+  "Marlen",
+  "Marlena",
+  "Marlene",
+  "Marta",
+  "Martha",
+  "Mary",
+  "Maryam",
+  "Mathilda",
+  "Mathilde",
+  "Matilda",
+  "Maxi",
+  "Maxima",
+  "Maxine",
+  "Maya",
+  "Mayra",
+  "Medina",
+  "Medine",
+  "Meike",
+  "Melanie",
+  "Melek",
+  "Melike",
+  "Melina",
+  "Melinda",
+  "Melis",
+  "Melisa",
+  "Melissa",
+  "Merle",
+  "Merve",
+  "Meryem",
+  "Mette",
+  "Mia",
+  "Michaela",
+  "Michelle",
+  "Mieke",
+  "Mila",
+  "Milana",
+  "Milena",
+  "Milla",
+  "Mina",
+  "Mira",
+  "Miray",
+  "Miriam",
+  "Mirja",
+  "Mona",
+  "Monique",
+  "Nadine",
+  "Nadja",
+  "Naemi",
+  "Nancy",
+  "Naomi",
+  "Natalia",
+  "Natalie",
+  "Nathalie",
+  "Neele",
+  "Nela",
+  "Nele",
+  "Nelli",
+  "Nelly",
+  "Nia",
+  "Nicole",
+  "Nika",
+  "Nike",
+  "Nikita",
+  "Nila",
+  "Nina",
+  "Nisa",
+  "Noemi",
+  "Nora",
+  "Olivia",
+  "Patricia",
+  "Patrizia",
+  "Paula",
+  "Paulina",
+  "Pauline",
+  "Penelope",
+  "Philine",
+  "Phoebe",
+  "Pia",
+  "Rahel",
+  "Rania",
+  "Rebecca",
+  "Rebekka",
+  "Riana",
+  "Rieke",
+  "Rike",
+  "Romina",
+  "Romy",
+  "Ronja",
+  "Rosa",
+  "Rosalie",
+  "Ruby",
+  "Sabrina",
+  "Sahra",
+  "Sally",
+  "Salome",
+  "Samantha",
+  "Samia",
+  "Samira",
+  "Sandra",
+  "Sandy",
+  "Sanja",
+  "Saphira",
+  "Sara",
+  "Sarah",
+  "Saskia",
+  "Selin",
+  "Selina",
+  "Selma",
+  "Sena",
+  "Sidney",
+  "Sienna",
+  "Silja",
+  "Sina",
+  "Sinja",
+  "Smilla",
+  "Sofia",
+  "Sofie",
+  "Sonja",
+  "Sophia",
+  "Sophie",
+  "Soraya",
+  "Stefanie",
+  "Stella",
+  "Stephanie",
+  "Stina",
+  "Sude",
+  "Summer",
+  "Susanne",
+  "Svea",
+  "Svenja",
+  "Sydney",
+  "Tabea",
+  "Talea",
+  "Talia",
+  "Tamara",
+  "Tamia",
+  "Tamina",
+  "Tanja",
+  "Tara",
+  "Tarja",
+  "Teresa",
+  "Tessa",
+  "Thalea",
+  "Thalia",
+  "Thea",
+  "Theresa",
+  "Tia",
+  "Tina",
+  "Tomke",
+  "Tuana",
+  "Valentina",
+  "Valeria",
+  "Valerie",
+  "Vanessa",
+  "Vera",
+  "Veronika",
+  "Victoria",
+  "Viktoria",
+  "Viola",
+  "Vivian",
+  "Vivien",
+  "Vivienne",
+  "Wibke",
+  "Wiebke",
+  "Xenia",
+  "Yara",
+  "Yaren",
+  "Yasmin",
+  "Ylvi",
+  "Ylvie",
+  "Yvonne",
+  "Zara",
+  "Zehra",
+  "Zeynep",
+  "Zoe",
+  "Zoey",
+  "Zoé"
+];
diff --git a/lib/locales/de/name/index.js b/lib/locales/de/name/index.js
index 526b2bff..86d4d542 100644
--- a/lib/locales/de/name/index.js
+++ b/lib/locales/de/name/index.js
@@ -1,5 +1,7 @@
 var name = {};
 module['exports'] = name;
+name.male_first_name = require("./male_first_name");
+name.female_first_name = require("./female_first_name");
 name.first_name = require("./first_name");
 name.last_name = require("./last_name");
 name.prefix = require("./prefix");
diff --git a/lib/locales/de/name/male_first_name.js b/lib/locales/de/name/male_first_name.js
new file mode 100644
index 00000000..d31bbe8d
--- /dev/null
+++ b/lib/locales/de/name/male_first_name.js
@@ -0,0 +1,574 @@
+module["exports"] = [
+  "Aaron",
+  "Abdul",
+  "Abdullah",
+  "Adam",
+  "Adrian",
+  "Adriano",
+  "Ahmad",
+  "Ahmed",
+  "Ahmet",
+  "Alan",
+  "Albert",
+  "Alessandro",
+  "Alessio",
+  "Alex",
+  "Alexander",
+  "Alfred",
+  "Ali",
+  "Amar",
+  "Amir",
+  "Amon",
+  "Andre",
+  "Andreas",
+  "Andrew",
+  "Angelo",
+  "Ansgar",
+  "Anthony",
+  "Anton",
+  "Antonio",
+  "Arda",
+  "Arian",
+  "Armin",
+  "Arne",
+  "Arno",
+  "Arthur",
+  "Artur",
+  "Arved",
+  "Arvid",
+  "Ayman",
+  "Baran",
+  "Baris",
+  "Bastian",
+  "Batuhan",
+  "Bela",
+  "Ben",
+  "Benedikt",
+  "Benjamin",
+  "Bennet",
+  "Bennett",
+  "Benno",
+  "Bent",
+  "Berat",
+  "Berkay",
+  "Bernd",
+  "Bilal",
+  "Bjarne",
+  "Björn",
+  "Bo",
+  "Boris",
+  "Brandon",
+  "Brian",
+  "Bruno",
+  "Bryan",
+  "Burak",
+  "Calvin",
+  "Can",
+  "Carl",
+  "Carlo",
+  "Carlos",
+  "Caspar",
+  "Cedric",
+  "Cedrik",
+  "Cem",
+  "Charlie",
+  "Chris",
+  "Christian",
+  "Christiano",
+  "Christoph",
+  "Christopher",
+  "Claas",
+  "Clemens",
+  "Colin",
+  "Collin",
+  "Conner",
+  "Connor",
+  "Constantin",
+  "Corvin",
+  "Curt",
+  "Damian",
+  "Damien",
+  "Daniel",
+  "Danilo",
+  "Danny",
+  "Darian",
+  "Dario",
+  "Darius",
+  "Darren",
+  "David",
+  "Davide",
+  "Davin",
+  "Dean",
+  "Deniz",
+  "Dennis",
+  "Denny",
+  "Devin",
+  "Diego",
+  "Dion",
+  "Domenic",
+  "Domenik",
+  "Dominic",
+  "Dominik",
+  "Dorian",
+  "Dustin",
+  "Dylan",
+  "Ecrin",
+  "Eddi",
+  "Eddy",
+  "Edgar",
+  "Edwin",
+  "Efe",
+  "Ege",
+  "Elia",
+  "Eliah",
+  "Elias",
+  "Elijah",
+  "Emanuel",
+  "Emil",
+  "Emilian",
+  "Emilio",
+  "Emir",
+  "Emirhan",
+  "Emre",
+  "Enes",
+  "Enno",
+  "Enrico",
+  "Eren",
+  "Eric",
+  "Erik",
+  "Etienne",
+  "Fabian",
+  "Fabien",
+  "Fabio",
+  "Fabrice",
+  "Falk",
+  "Felix",
+  "Ferdinand",
+  "Fiete",
+  "Filip",
+  "Finlay",
+  "Finley",
+  "Finn",
+  "Finnley",
+  "Florian",
+  "Francesco",
+  "Franz",
+  "Frederic",
+  "Frederick",
+  "Frederik",
+  "Friedrich",
+  "Fritz",
+  "Furkan",
+  "Fynn",
+  "Gabriel",
+  "Georg",
+  "Gerrit",
+  "Gian",
+  "Gianluca",
+  "Gino",
+  "Giuliano",
+  "Giuseppe",
+  "Gregor",
+  "Gustav",
+  "Hagen",
+  "Hamza",
+  "Hannes",
+  "Hanno",
+  "Hans",
+  "Hasan",
+  "Hassan",
+  "Hauke",
+  "Hendrik",
+  "Hennes",
+  "Henning",
+  "Henri",
+  "Henrick",
+  "Henrik",
+  "Henry",
+  "Hugo",
+  "Hussein",
+  "Ian",
+  "Ibrahim",
+  "Ilias",
+  "Ilja",
+  "Ilyas",
+  "Immanuel",
+  "Ismael",
+  "Ismail",
+  "Ivan",
+  "Iven",
+  "Jack",
+  "Jacob",
+  "Jaden",
+  "Jakob",
+  "Jamal",
+  "James",
+  "Jamie",
+  "Jan",
+  "Janek",
+  "Janis",
+  "Janne",
+  "Jannek",
+  "Jannes",
+  "Jannik",
+  "Jannis",
+  "Jano",
+  "Janosch",
+  "Jared",
+  "Jari",
+  "Jarne",
+  "Jarno",
+  "Jaron",
+  "Jason",
+  "Jasper",
+  "Jay",
+  "Jayden",
+  "Jayson",
+  "Jean",
+  "Jens",
+  "Jeremias",
+  "Jeremie",
+  "Jeremy",
+  "Jermaine",
+  "Jerome",
+  "Jesper",
+  "Jesse",
+  "Jim",
+  "Jimmy",
+  "Joe",
+  "Joel",
+  "Joey",
+  "Johann",
+  "Johannes",
+  "John",
+  "Johnny",
+  "Jon",
+  "Jona",
+  "Jonah",
+  "Jonas",
+  "Jonathan",
+  "Jonte",
+  "Joost",
+  "Jordan",
+  "Joris",
+  "Joscha",
+  "Joschua",
+  "Josef",
+  "Joseph",
+  "Josh",
+  "Joshua",
+  "Josua",
+  "Juan",
+  "Julian",
+  "Julien",
+  "Julius",
+  "Juri",
+  "Justin",
+  "Justus",
+  "Kaan",
+  "Kai",
+  "Kalle",
+  "Karim",
+  "Karl",
+  "Karlo",
+  "Kay",
+  "Keanu",
+  "Kenan",
+  "Kenny",
+  "Keno",
+  "Kerem",
+  "Kerim",
+  "Kevin",
+  "Kian",
+  "Kilian",
+  "Kim",
+  "Kimi",
+  "Kjell",
+  "Klaas",
+  "Klemens",
+  "Konrad",
+  "Konstantin",
+  "Koray",
+  "Korbinian",
+  "Kurt",
+  "Lars",
+  "Lasse",
+  "Laurence",
+  "Laurens",
+  "Laurenz",
+  "Laurin",
+  "Lean",
+  "Leander",
+  "Leandro",
+  "Leif",
+  "Len",
+  "Lenn",
+  "Lennard",
+  "Lennart",
+  "Lennert",
+  "Lennie",
+  "Lennox",
+  "Lenny",
+  "Leo",
+  "Leon",
+  "Leonard",
+  "Leonardo",
+  "Leonhard",
+  "Leonidas",
+  "Leopold",
+  "Leroy",
+  "Levent",
+  "Levi",
+  "Levin",
+  "Lewin",
+  "Lewis",
+  "Liam",
+  "Lian",
+  "Lias",
+  "Lino",
+  "Linus",
+  "Lio",
+  "Lion",
+  "Lionel",
+  "Logan",
+  "Lorenz",
+  "Lorenzo",
+  "Loris",
+  "Louis",
+  "Luan",
+  "Luc",
+  "Luca",
+  "Lucas",
+  "Lucian",
+  "Lucien",
+  "Ludwig",
+  "Luis",
+  "Luiz",
+  "Luk",
+  "Luka",
+  "Lukas",
+  "Luke",
+  "Lutz",
+  "Maddox",
+  "Mads",
+  "Magnus",
+  "Maik",
+  "Maksim",
+  "Malik",
+  "Malte",
+  "Manuel",
+  "Marc",
+  "Marcel",
+  "Marco",
+  "Marcus",
+  "Marek",
+  "Marian",
+  "Mario",
+  "Marius",
+  "Mark",
+  "Marko",
+  "Markus",
+  "Marlo",
+  "Marlon",
+  "Marten",
+  "Martin",
+  "Marvin",
+  "Marwin",
+  "Mateo",
+  "Mathis",
+  "Matis",
+  "Mats",
+  "Matteo",
+  "Mattes",
+  "Matthias",
+  "Matthis",
+  "Matti",
+  "Mattis",
+  "Maurice",
+  "Max",
+  "Maxim",
+  "Maximilian",
+  "Mehmet",
+  "Meik",
+  "Melvin",
+  "Merlin",
+  "Mert",
+  "Michael",
+  "Michel",
+  "Mick",
+  "Miguel",
+  "Mika",
+  "Mikail",
+  "Mike",
+  "Milan",
+  "Milo",
+  "Mio",
+  "Mirac",
+  "Mirco",
+  "Mirko",
+  "Mohamed",
+  "Mohammad",
+  "Mohammed",
+  "Moritz",
+  "Morten",
+  "Muhammed",
+  "Murat",
+  "Mustafa",
+  "Nathan",
+  "Nathanael",
+  "Nelson",
+  "Neo",
+  "Nevio",
+  "Nick",
+  "Niclas",
+  "Nico",
+  "Nicolai",
+  "Nicolas",
+  "Niels",
+  "Nikita",
+  "Niklas",
+  "Niko",
+  "Nikolai",
+  "Nikolas",
+  "Nils",
+  "Nino",
+  "Noah",
+  "Noel",
+  "Norman",
+  "Odin",
+  "Oke",
+  "Ole",
+  "Oliver",
+  "Omar",
+  "Onur",
+  "Oscar",
+  "Oskar",
+  "Pascal",
+  "Patrice",
+  "Patrick",
+  "Paul",
+  "Peer",
+  "Pepe",
+  "Peter",
+  "Phil",
+  "Philip",
+  "Philipp",
+  "Pierre",
+  "Piet",
+  "Pit",
+  "Pius",
+  "Quentin",
+  "Quirin",
+  "Rafael",
+  "Raik",
+  "Ramon",
+  "Raphael",
+  "Rasmus",
+  "Raul",
+  "Rayan",
+  "René",
+  "Ricardo",
+  "Riccardo",
+  "Richard",
+  "Rick",
+  "Rico",
+  "Robert",
+  "Robin",
+  "Rocco",
+  "Roman",
+  "Romeo",
+  "Ron",
+  "Ruben",
+  "Ryan",
+  "Said",
+  "Salih",
+  "Sam",
+  "Sami",
+  "Sammy",
+  "Samuel",
+  "Sandro",
+  "Santino",
+  "Sascha",
+  "Sean",
+  "Sebastian",
+  "Selim",
+  "Semih",
+  "Shawn",
+  "Silas",
+  "Simeon",
+  "Simon",
+  "Sinan",
+  "Sky",
+  "Stefan",
+  "Steffen",
+  "Stephan",
+  "Steve",
+  "Steven",
+  "Sven",
+  "Sönke",
+  "Sören",
+  "Taha",
+  "Tamino",
+  "Tammo",
+  "Tarik",
+  "Tayler",
+  "Taylor",
+  "Teo",
+  "Theo",
+  "Theodor",
+  "Thies",
+  "Thilo",
+  "Thomas",
+  "Thorben",
+  "Thore",
+  "Thorge",
+  "Tiago",
+  "Til",
+  "Till",
+  "Tillmann",
+  "Tim",
+  "Timm",
+  "Timo",
+  "Timon",
+  "Timothy",
+  "Tino",
+  "Titus",
+  "Tizian",
+  "Tjark",
+  "Tobias",
+  "Tom",
+  "Tommy",
+  "Toni",
+  "Tony",
+  "Torben",
+  "Tore",
+  "Tristan",
+  "Tyler",
+  "Tyron",
+  "Umut",
+  "Valentin",
+  "Valentino",
+  "Veit",
+  "Victor",
+  "Viktor",
+  "Vin",
+  "Vincent",
+  "Vito",
+  "Vitus",
+  "Wilhelm",
+  "Willi",
+  "William",
+  "Willy",
+  "Xaver",
+  "Yannic",
+  "Yannick",
+  "Yannik",
+  "Yannis",
+  "Yasin",
+  "Youssef",
+  "Yunus",
+  "Yusuf",
+  "Yven",
+  "Yves",
+  "Ömer"
+];
diff --git a/lib/locales/de/name/name.js b/lib/locales/de/name/name.js
index a75be6d4..edc8330c 100644
--- a/lib/locales/de/name/name.js
+++ b/lib/locales/de/name/name.js
@@ -3,6 +3,6 @@ module["exports"] = [
   "#{first_name} #{nobility_title_prefix} #{last_name}",
   "#{first_name} #{last_name}",
   "#{first_name} #{last_name}",
-  "#{first_name} #{last_name}",
-  "#{first_name} #{last_name}"
+  "#{male_first_name} #{last_name}",
+  "#{female_first_name} #{last_name}"
 ];
diff --git a/lib/locales/el/index.js b/lib/locales/el/index.js
index b3323d45..a071e197 100644
--- a/lib/locales/el/index.js
+++ b/lib/locales/el/index.js
@@ -1,6 +1,6 @@
 var el = {};
 module['exports'] = el;
-el.title = "Ελληνικά";
+el.title = "Greek";
 el.separator = " & ";
 el.address = require("./address");
 el.credit_card = require("./credit_card");
diff --git a/lib/locales/el/internet/avatar_uri.js b/lib/locales/el/internet/avatar_uri.js
index 7fc8d583..34208a96 100644
--- a/lib/locales/el/internet/avatar_uri.js
+++ b/lib/locales/el/internet/avatar_uri.js
@@ -23,7 +23,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/peejfancher/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/andyisonline/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ultragex/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/fuck_you_two/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/adellecharles/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ateneupopular/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ahmetalpbalkan/128.jpg",
@@ -400,7 +399,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/id835559/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/kudretkeskin/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/anjhero/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/duck4fuck/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/scott_riley/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/noufalibrahim/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/h1brd/128.jpg",
@@ -1065,7 +1063,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/deeenright/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/cybind/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/eyronn/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/vickyshits/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/sweetdelisa/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/cboller1/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/andresdjasso/128.jpg",
diff --git a/lib/locales/en/address/country_code.js b/lib/locales/en/address/country_code.js
index 84b5bfe6..9639d7c2 100644
--- a/lib/locales/en/address/country_code.js
+++ b/lib/locales/en/address/country_code.js
@@ -29,7 +29,6 @@ module["exports"] = [
   "BN",
   "BO",
   "BQ",
-  "BQ",
   "BR",
   "BS",
   "BT",
diff --git a/lib/locales/en/commerce/index.js b/lib/locales/en/commerce/index.js
index c05b5272..89187f7c 100644
--- a/lib/locales/en/commerce/index.js
+++ b/lib/locales/en/commerce/index.js
@@ -3,3 +3,4 @@ module['exports'] = commerce;
 commerce.color = require("./color");
 commerce.department = require("./department");
 commerce.product_name = require("./product_name");
+commerce.product_description = require("./product_description");
diff --git a/lib/locales/en/commerce/product_description.js b/lib/locales/en/commerce/product_description.js
new file mode 100644
index 00000000..05ab517c
--- /dev/null
+++ b/lib/locales/en/commerce/product_description.js
@@ -0,0 +1,14 @@
+module["exports"] = [
+  "Ergonomic executive chair upholstered in bonded black leather and PVC padded seat and back for all-day comfort and support",
+  "The automobile layout consists of a front-engine design, with transaxle-type transmissions mounted at the rear of the engine and four wheel drive",
+  "New ABC 13 9370, 13.3, 5th Gen CoreA5-8250U, 8GB RAM, 256GB SSD, power UHD Graphics, OS 10 Home, OS Office A & J 2016",
+  "The slim & simple Maple Gaming Keyboard from Dev Byte comes with a sleek body and 7- Color RGB LED Back-lighting for smart functionality",
+  "The Apollotech B340 is an affordable wireless mouse with reliable connectivity, 12 months battery life and modern design",
+  "The Nagasaki Lander is the trademarked name of several series of Nagasaki sport bikes, that started with the 1984 ABC800J",
+  "The Football Is Good For Training And Recreational Purposes",
+  "Carbonite web goalkeeper gloves are ergonomically designed to give easy fit",
+  "Boston's most advanced compression wear technology increases muscle oxygenation, stabilizes active muscles",
+  "New range of formal shirts are designed keeping you in mind. With fits and styling that will make you stand apart",
+  "The beautiful range of Apple Naturalé that has an exciting mix of natural ingredients. With the Goodness of 100% Natural Ingredients",
+  "Andy shoes are designed to keeping in mind durability as well as trends, the most stylish range of shoes & sandals"
+];
\ No newline at end of file
diff --git a/lib/locales/en/finance/currency.js b/lib/locales/en/finance/currency.js
index 442d937c..3725618f 100644
--- a/lib/locales/en/finance/currency.js
+++ b/lib/locales/en/finance/currency.js
@@ -71,9 +71,9 @@ module["exports"] = {
     "code": "BND",
     "symbol": "$"
   },
-  "Boliviano Mvdol": {
-    "code": "BOB BOV",
-    "symbol": "$b"
+  "Boliviano boliviano": {
+    "code": "BOB",
+    "symbol": "Bs"
   },
   "Brazilian Real": {
     "code": "BRL",
@@ -107,26 +107,30 @@ module["exports"] = {
     "code": "CHF",
     "symbol": "CHF"
   },
-  "Chilean Peso Unidades de fomento": {
-    "code": "CLP CLF",
+  "Chilean Peso": {
+    "code": "CLP",
     "symbol": "$"
   },
   "Yuan Renminbi": {
     "code": "CNY",
     "symbol": "¥"
   },
-  "Colombian Peso Unidad de Valor Real": {
-    "code": "COP COU",
+  "Colombian Peso": {
+    "code": "COP",
     "symbol": "$"
   },
   "Costa Rican Colon": {
     "code": "CRC",
     "symbol": "₡"
   },
-  "Cuban Peso Peso Convertible": {
-    "code": "CUP CUC",
+  "Cuban Peso": {
+    "code": "CUP",
     "symbol": "₱"
   },
+  "Cuban Peso Convertible": {
+    "code": "CUC",
+    "symbol": "$"
+  },
   "Cape Verde Escudo": {
     "code": "CVE",
     "symbol": ""
@@ -223,8 +227,8 @@ module["exports"] = {
     "code": "HRK",
     "symbol": "kn"
   },
-  "Gourde US Dollar": {
-    "code": "HTG USD",
+  "Gourde": {
+    "code": "HTG",
     "symbol": ""
   },
   "Forint": {
@@ -243,9 +247,13 @@ module["exports"] = {
     "code": "INR",
     "symbol": ""
   },
-  "Indian Rupee Ngultrum": {
-    "code": "INR BTN",
-    "symbol": ""
+  "Bhutanese Ngultrum": {
+    "code": "BTN",
+    "symbol": "Nu"
+  },
+  "Indian Rupee": {
+    "code": "INR",
+    "symbol": "₹"
   },
   "Iraqi Dinar": {
     "code": "IQD",
@@ -379,8 +387,8 @@ module["exports"] = {
     "code": "MWK",
     "symbol": ""
   },
-  "Mexican Peso Mexican Unidad de Inversion (UDI)": {
-    "code": "MXN MXV",
+  "Mexican Peso": {
+    "code": "MXN",
     "symbol": "$"
   },
   "Malaysian Ringgit": {
@@ -415,8 +423,8 @@ module["exports"] = {
     "code": "OMR",
     "symbol": "﷼"
   },
-  "Balboa US Dollar": {
-    "code": "PAB USD",
+  "Balboa": {
+    "code": "PAB",
     "symbol": "B/."
   },
   "Nuevo Sol": {
@@ -504,12 +512,12 @@ module["exports"] = {
     "symbol": "$"
   },
   "Dobra": {
-    "code": "STD",
-    "symbol": ""
+    "code": "STN",
+    "symbol": "Db"
   },
-  "El Salvador Colon US Dollar": {
-    "code": "SVC USD",
-    "symbol": "$"
+  "El Salvador Colon": {
+    "code": "SVC",
+    "symbol": "₡"
   },
   "Syrian Pound": {
     "code": "SYP",
@@ -567,8 +575,8 @@ module["exports"] = {
     "code": "USD",
     "symbol": "$"
   },
-  "Peso Uruguayo Uruguay Peso en Unidades Indexadas": {
-    "code": "UYU UYI",
+  "Peso Uruguayo": {
+    "code": "UYU",
     "symbol": "$U"
   },
   "Uzbekistan Sum": {
@@ -659,13 +667,13 @@ module["exports"] = {
     "code": "ZAR",
     "symbol": "R"
   },
-  "Rand Loti": {
-    "code": "ZAR LSL",
+  "Lesotho Loti": {
+    "code": "LSL",
     "symbol": ""
   },
-  "Rand Namibia Dollar": {
-    "code": "ZAR NAD",
-    "symbol": ""
+  "Namibia Dollar": {
+    "code": "NAD",
+    "symbol": "N$"
   },
   "Zambian Kwacha": {
     "code": "ZMK",
diff --git a/lib/locales/en/internet/avatar_uri.js b/lib/locales/en/internet/avatar_uri.js
index 7fc8d583..34208a96 100644
--- a/lib/locales/en/internet/avatar_uri.js
+++ b/lib/locales/en/internet/avatar_uri.js
@@ -23,7 +23,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/peejfancher/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/andyisonline/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ultragex/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/fuck_you_two/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/adellecharles/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ateneupopular/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ahmetalpbalkan/128.jpg",
@@ -400,7 +399,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/id835559/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/kudretkeskin/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/anjhero/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/duck4fuck/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/scott_riley/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/noufalibrahim/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/h1brd/128.jpg",
@@ -1065,7 +1063,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/deeenright/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/cybind/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/eyronn/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/vickyshits/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/sweetdelisa/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/cboller1/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/andresdjasso/128.jpg",
diff --git a/lib/locales/en/vehicle/manufacturer.js b/lib/locales/en/vehicle/manufacturer.js
index 12f24181..be51b7fc 100644
--- a/lib/locales/en/vehicle/manufacturer.js
+++ b/lib/locales/en/vehicle/manufacturer.js
@@ -26,5 +26,5 @@ module["exports"] = [
   "Ferrari",
   "Bugatti",
   "Kia",
-  "Hyandai"
+  "Hyundai"
 ];
diff --git a/lib/locales/en_AU/index.js b/lib/locales/en_AU/index.js
index fe85231f..1ed678b4 100644
--- a/lib/locales/en_AU/index.js
+++ b/lib/locales/en_AU/index.js
@@ -1,6 +1,6 @@
 var en_AU = {};
 module['exports'] = en_AU;
-en_AU.title = "Australia (English)";
+en_AU.title = "English (Australia)";
 en_AU.name = require("./name");
 en_AU.company = require("./company");
 en_AU.internet = require("./internet");
diff --git a/lib/locales/en_au_ocker/address/building_number.js b/lib/locales/en_AU_ocker/address/building_number.js
index 64b7c4e5..64b7c4e5 100644
--- a/lib/locales/en_au_ocker/address/building_number.js
+++ b/lib/locales/en_AU_ocker/address/building_number.js
diff --git a/lib/locales/en_au_ocker/address/city.js b/lib/locales/en_AU_ocker/address/city.js
index f014e156..f014e156 100644
--- a/lib/locales/en_au_ocker/address/city.js
+++ b/lib/locales/en_AU_ocker/address/city.js
diff --git a/lib/locales/en_au_ocker/address/city_prefix.js b/lib/locales/en_AU_ocker/address/city_prefix.js
index c39eca19..c39eca19 100644
--- a/lib/locales/en_au_ocker/address/city_prefix.js
+++ b/lib/locales/en_AU_ocker/address/city_prefix.js
diff --git a/lib/locales/en_au_ocker/address/default_country.js b/lib/locales/en_AU_ocker/address/default_country.js
index 807e44ac..807e44ac 100644
--- a/lib/locales/en_au_ocker/address/default_country.js
+++ b/lib/locales/en_AU_ocker/address/default_country.js
diff --git a/lib/locales/en_au_ocker/address/index.js b/lib/locales/en_AU_ocker/address/index.js
index c8459541..c8459541 100644
--- a/lib/locales/en_au_ocker/address/index.js
+++ b/lib/locales/en_AU_ocker/address/index.js
diff --git a/lib/locales/en_au_ocker/address/postcode.js b/lib/locales/en_AU_ocker/address/postcode.js
index 548bbd8a..548bbd8a 100644
--- a/lib/locales/en_au_ocker/address/postcode.js
+++ b/lib/locales/en_AU_ocker/address/postcode.js
diff --git a/lib/locales/en_au_ocker/address/region.js b/lib/locales/en_AU_ocker/address/region.js
index 22803f7b..22803f7b 100644
--- a/lib/locales/en_au_ocker/address/region.js
+++ b/lib/locales/en_AU_ocker/address/region.js
diff --git a/lib/locales/en_au_ocker/address/state.js b/lib/locales/en_AU_ocker/address/state.js
index e779165a..e779165a 100644
--- a/lib/locales/en_au_ocker/address/state.js
+++ b/lib/locales/en_AU_ocker/address/state.js
diff --git a/lib/locales/en_au_ocker/address/state_abbr.js b/lib/locales/en_AU_ocker/address/state_abbr.js
index 3de0a30f..3de0a30f 100644
--- a/lib/locales/en_au_ocker/address/state_abbr.js
+++ b/lib/locales/en_AU_ocker/address/state_abbr.js
diff --git a/lib/locales/en_au_ocker/address/street_name.js b/lib/locales/en_AU_ocker/address/street_name.js
index 7debe2ae..7debe2ae 100644
--- a/lib/locales/en_au_ocker/address/street_name.js
+++ b/lib/locales/en_AU_ocker/address/street_name.js
diff --git a/lib/locales/en_au_ocker/address/street_root.js b/lib/locales/en_AU_ocker/address/street_root.js
index 250b7358..250b7358 100644
--- a/lib/locales/en_au_ocker/address/street_root.js
+++ b/lib/locales/en_AU_ocker/address/street_root.js
diff --git a/lib/locales/en_au_ocker/address/street_suffix.js b/lib/locales/en_AU_ocker/address/street_suffix.js
index 1f9fa2e2..1f9fa2e2 100644
--- a/lib/locales/en_au_ocker/address/street_suffix.js
+++ b/lib/locales/en_AU_ocker/address/street_suffix.js
diff --git a/lib/locales/en_au_ocker/company/index.js b/lib/locales/en_AU_ocker/company/index.js
index ddd41f55..ddd41f55 100644
--- a/lib/locales/en_au_ocker/company/index.js
+++ b/lib/locales/en_AU_ocker/company/index.js
diff --git a/lib/locales/en_au_ocker/company/suffix.js b/lib/locales/en_AU_ocker/company/suffix.js
index 5a10566b..5a10566b 100644
--- a/lib/locales/en_au_ocker/company/suffix.js
+++ b/lib/locales/en_AU_ocker/company/suffix.js
diff --git a/lib/locales/en_AU_ocker/index.js b/lib/locales/en_AU_ocker/index.js
new file mode 100644
index 00000000..2efbf804
--- /dev/null
+++ b/lib/locales/en_AU_ocker/index.js
@@ -0,0 +1,8 @@
+var en_AU_ocker = {};
+module['exports'] = en_AU_ocker;
+en_AU_ocker.title = "English (Australia Ocker)";
+en_AU_ocker.name = require("./name");
+en_AU_ocker.company = require("./company");
+en_AU_ocker.internet = require("./internet");
+en_AU_ocker.address = require("./address");
+en_AU_ocker.phone_number = require("./phone_number");
diff --git a/lib/locales/en_au_ocker/internet/domain_suffix.js b/lib/locales/en_AU_ocker/internet/domain_suffix.js
index 9cd2e22a..9cd2e22a 100644
--- a/lib/locales/en_au_ocker/internet/domain_suffix.js
+++ b/lib/locales/en_AU_ocker/internet/domain_suffix.js
diff --git a/lib/locales/en_au_ocker/internet/index.js b/lib/locales/en_AU_ocker/internet/index.js
index abfa2480..abfa2480 100644
--- a/lib/locales/en_au_ocker/internet/index.js
+++ b/lib/locales/en_AU_ocker/internet/index.js
diff --git a/lib/locales/en_au_ocker/name/first_name.js b/lib/locales/en_AU_ocker/name/first_name.js
index a7e0a7ad..a7e0a7ad 100644
--- a/lib/locales/en_au_ocker/name/first_name.js
+++ b/lib/locales/en_AU_ocker/name/first_name.js
diff --git a/lib/locales/en_au_ocker/name/index.js b/lib/locales/en_AU_ocker/name/index.js
index a5463b09..a5463b09 100644
--- a/lib/locales/en_au_ocker/name/index.js
+++ b/lib/locales/en_AU_ocker/name/index.js
diff --git a/lib/locales/en_au_ocker/name/last_name.js b/lib/locales/en_AU_ocker/name/last_name.js
index ded4d852..ded4d852 100644
--- a/lib/locales/en_au_ocker/name/last_name.js
+++ b/lib/locales/en_AU_ocker/name/last_name.js
diff --git a/lib/locales/en_au_ocker/name/ocker_first_name.js b/lib/locales/en_AU_ocker/name/ocker_first_name.js
index 7c964c8a..7c964c8a 100644
--- a/lib/locales/en_au_ocker/name/ocker_first_name.js
+++ b/lib/locales/en_AU_ocker/name/ocker_first_name.js
diff --git a/lib/locales/en_au_ocker/phone_number/formats.js b/lib/locales/en_AU_ocker/phone_number/formats.js
index 7b353239..7b353239 100644
--- a/lib/locales/en_au_ocker/phone_number/formats.js
+++ b/lib/locales/en_AU_ocker/phone_number/formats.js
diff --git a/lib/locales/en_au_ocker/phone_number/index.js b/lib/locales/en_AU_ocker/phone_number/index.js
index 8d35e011..8d35e011 100644
--- a/lib/locales/en_au_ocker/phone_number/index.js
+++ b/lib/locales/en_AU_ocker/phone_number/index.js
diff --git a/lib/locales/en_BORK/index.js b/lib/locales/en_BORK/index.js
index 238c2b2c..1a05c8b2 100644
--- a/lib/locales/en_BORK/index.js
+++ b/lib/locales/en_BORK/index.js
@@ -1,4 +1,4 @@
 var en_BORK = {};
 module['exports'] = en_BORK;
-en_BORK.title = "Bork (English)";
+en_BORK.title = "English (Bork)";
 en_BORK.lorem = require("./lorem");
diff --git a/lib/locales/en_CA/index.js b/lib/locales/en_CA/index.js
index e278a1e3..ac6ed0f6 100644
--- a/lib/locales/en_CA/index.js
+++ b/lib/locales/en_CA/index.js
@@ -1,6 +1,6 @@
 var en_CA = {};
 module['exports'] = en_CA;
-en_CA.title = "Canada (English)";
+en_CA.title = "English (Canada)";
 en_CA.address = require("./address");
 en_CA.internet = require("./internet");
 en_CA.phone_number = require("./phone_number");
diff --git a/lib/locales/en_GB/index.js b/lib/locales/en_GB/index.js
index 5a7c221b..bc271835 100644
--- a/lib/locales/en_GB/index.js
+++ b/lib/locales/en_GB/index.js
@@ -1,6 +1,6 @@
 var en_GB = {};
 module['exports'] = en_GB;
-en_GB.title = "Great Britain (English)";
+en_GB.title = "English (Great Britain)";
 en_GB.address = require("./address");
 en_GB.internet = require("./internet");
 en_GB.phone_number = require("./phone_number");
diff --git a/lib/locales/en_IE/index.js b/lib/locales/en_IE/index.js
index 6b0d2693..22a8adee 100644
--- a/lib/locales/en_IE/index.js
+++ b/lib/locales/en_IE/index.js
@@ -1,6 +1,6 @@
 var en_IE = {};
 module['exports'] = en_IE;
-en_IE.title = "Ireland (English)";
+en_IE.title = "English (Ireland)";
 en_IE.address = require("./address");
 en_IE.internet = require("./internet");
 en_IE.phone_number = require("./phone_number");
diff --git a/lib/locales/en_IND/index.js b/lib/locales/en_IND/index.js
index beca2692..95777091 100644
--- a/lib/locales/en_IND/index.js
+++ b/lib/locales/en_IND/index.js
@@ -1,6 +1,6 @@
 var en_IND = {};
 module['exports'] = en_IND;
-en_IND.title = "India (English)";
+en_IND.title = "English (India)";
 en_IND.name = require("./name");
 en_IND.address = require("./address");
 en_IND.internet = require("./internet");
diff --git a/lib/locales/en_IND/phone_number/formats.js b/lib/locales/en_IND/phone_number/formats.js
index a0e65703..b00f9e03 100644
--- a/lib/locales/en_IND/phone_number/formats.js
+++ b/lib/locales/en_IND/phone_number/formats.js
@@ -1,5 +1,14 @@
 module["exports"] = [
-  "+91###-###-####",
-  "+91##########",
-  "+91-###-#######"
+  "+919##-###-####",
+  "+919#########",
+  "+91-9##-#######",
+  "+918##-###-####",
+  "+918#########",
+  "+91-8##-#######",
+  "+917##-###-####",
+  "+917#########",
+  "+91-7##-#######",
+  "+916##-###-####",
+  "+916#########",
+  "+91-6##-#######",
 ];
diff --git a/lib/locales/en_NG/address/city.js b/lib/locales/en_NG/address/city.js
new file mode 100644
index 00000000..f014e156
--- /dev/null
+++ b/lib/locales/en_NG/address/city.js
@@ -0,0 +1,3 @@
+module["exports"] = [
+  "#{city_prefix}"
+];
diff --git a/lib/locales/en_NG/address/city_prefix.js b/lib/locales/en_NG/address/city_prefix.js
new file mode 100644
index 00000000..c9aa7a95
--- /dev/null
+++ b/lib/locales/en_NG/address/city_prefix.js
@@ -0,0 +1,527 @@
+module["exports"] = [
+    "Abala" ,
+    "Abalakiri" ,
+    "Bekirikiri" ,
+    "Bela" ,
+    "Belatiwa" ,
+    "Bokodo",
+    "Ibinta" ,
+    "Ibiono Ewura" ,
+    "Farin Yashe" ,
+    "Fedare" ,
+    "Fobir" ,
+    "Fobro" ,
+    "Gabgell" ,
+    "Gamajigo" ,
+    "Gana" ,
+    "Gana Daji" ,
+    "Gidan Hardo",
+    "Abagbo" ,
+    "Abalabi" ,
+    "Abaranjeh" ,
+    "Abatiwa" ,
+    "Abegede" ,
+    "Abekkun" ,
+    "Abule Ijesha" ,
+    "Abule-Nla" ,
+    "Adata" ,
+    "Addo" ,
+    "Adekanbi" ,
+    "Adeleye" ,
+    "Ado" ,
+    "Ado Odo" ,
+    "Afami" ,
+    "Afanji" ,
+    "Afowo Doforo" ,
+    "Afowowa" ,
+    "Agada" ,
+    "Agaja" ,
+    "Agala" ,
+    "Agani" ,
+    "Aganni" ,
+    "Agaw Awusa" ,
+    "Agaw Shasha" ,
+    "Agbaku" ,
+    "Agbara" ,
+    "Agbede" ,
+    "Agbedi" ,
+    "Agbejedo" ,
+    "Agbele" ,
+    "Agbelekale" ,
+    "Agboju" ,
+    "Agboku" ,
+    "Agbon" ,
+    "Agbonyedo" ,
+    "Agbowa" ,
+    "Agboyi" ,
+    "Age Mowo" ,
+    "Agege" ,
+    "Agelete" ,
+    "Agerige" ,
+    "Agidi" ,
+    "Agidingbi" ,
+    "Ago Egun" ,
+    "Ago Hausa" ,
+    "Ago Sasa" ,
+    "Agomu" ,
+    "Agonrin" ,
+    "Agonu" ,
+    "Aguda" ,
+    "Agun" ,
+    "Agunfoye" ,
+    "Agura" ,
+    "Ahanfe" ,
+    "Ahovo" ,
+    "Ahun" ,
+    "Aiyede" ,
+    "Aiyeteju" ,
+    "Aiyetoro" ,
+    "Aiyetoto-Asogun" ,
+    "Aja" ,
+    "Ajagambari" ,
+    "Ajara" ,
+    "Ajara Agamaden" ,
+    "Ajebandele" ,
+    "Ajebaw" ,
+    "Ajebo" ,
+    "Ajegbenwa" ,
+    "Ajegunle" ,
+    "Ajelanwa" ,
+    "Ajerogun" ,
+    "Ajibade" ,
+    "Ajibawo" ,
+    "Ajibo" ,
+    "Ajido" ,
+    "Ajise" ,
+    "Ajumo" ,
+    "Akando" ,
+    "Akangba" ,
+    "Akarakumo" ,
+    "Akawdo" ,
+    "Akawkaw" ,
+    "Akere" ,
+    "Akessan" ,
+    "Akete" ,
+    "Akinbo" ,
+    "Akinlade" ,
+    "Akinogun" ,
+    "Akinyele" ,
+    "Akio" ,
+    "Akobale" ,
+    "Akodo" ,
+    "Akoko" ,
+    "Akore" ,
+    "Akowonjo" ,
+    "Alagba" ,
+    "Alagbede" ,
+    "Alagbon" ,
+    "Alago" ,
+    "name" ,
+    " " ,
+    "Alagogo" ,
+    "Alaguntan" ,
+    "Alaiyabiagba" ,
+    "Alapako" ,
+    "Alaparu" ,
+    "Alaparun" ,
+    "Alapoti" ,
+    "Alaru" ,
+    "Alasia" ,
+    "Ale" ,
+    "Aliayabiagba" ,
+    "Alimosho" ,
+    "Alimoso" ,
+    "Amuwo" ,
+    "Anagoji" ,
+    "Anagunji" ,
+    "Angorin" ,
+    "Animashawun" ,
+    "Animshaun" ,
+    "Apa" ,
+    "Apamu" ,
+    "Apapa" ,
+    "Apapa Eleko" ,
+    "Apese" ,
+    "Appa" ,
+    "Aqani" ,
+    "Aradagun" ,
+    "Arapagi Oloko" ,
+    "Arapagi-Awlawkaw" ,
+    "Arapagi-Ejetu" ,
+    "Araromi" ,
+    "Araromi Orita" ,
+    "Araromi Tawpe" ,
+    "Araromi Tope" ,
+    "Arida" ,
+    "Arigo" ,
+    "Ashon" ,
+    "Asipa" ,
+    "Ason" ,
+    "Asore" ,
+    "Asunora" ,
+    "Atan" ,
+    "Atapa" ,
+    "Awado" ,
+    "Awaiye" ,
+    "Awaye" ,
+    "Awdan Ilaro" ,
+    "Awdan Iyasi" ,
+    "Awfin" ,
+    "Awgawgawraw" ,
+    "Awgawmbaw" ,
+    "Awja-Ikoradu" ,
+    "Awjaw" ,
+    "Awoyaya" ,
+    "Awreta" ,
+    "Awteyi" ,
+    "Awwaw" ,
+    "Ayekoshe" ,
+    "Ayinla" ,
+    "Ayobo" ,
+    "Babalawo" ,
+    "Badagri" ,
+    "Badagry" ,
+    "Badawre" ,
+    "Badore" ,
+    "Baiyeku" ,
+    "Balagbe" ,
+    "Balogun" ,
+    "Bamgbose" ,
+    "Bamgboshe" ,
+    "Bandu" ,
+    "Banimgbe" ,
+    "Banimgbo" ,
+    "Bariga" ,
+    "Baruwa" ,
+    "Bassa" ,
+    "Beshi" ,
+    "Bodashe" ,
+    "Bode Ase" ,
+    "Bolorunpelu" ,
+    "Cardoso" ,
+    "Coker" ,
+    "Coker Market" ,
+    "Cokers Market" ,
+    "Dankaka" ,
+    "Doforo" ,
+    "Dosa" ,
+    "Dosemo" ,
+    "Ebute Ikorodu" ,
+    "Ebute Leki" ,
+    "Ebute Lekki" ,
+    "Ebute-Egga" ,
+    "Ebute-Metta" ,
+    "Efiran" ,
+    "Egan" ,
+    "Egba" ,
+    "Egbe" ,
+    "Eggan" ,
+    "Egudu Bale" ,
+    "Egun" ,
+    "name" ,
+    " " ,
+    "Eiyekose" ,
+    "Ejigbo" ,
+    "Ejinrin" ,
+    "Ejirin" ,
+    "Eko" ,
+    "Ekoro" ,
+    "Ekundayo" ,
+    "Elachi" ,
+    "Elemoki" ,
+    "Eleputu" ,
+    "Elere" ,
+    "Elesin" ,
+    "Eluju" ,
+    "Emu" ,
+    "Epe" ,
+    "Epeh" ,
+    "Era" ,
+    "Ere" ,
+    "Eregun" ,
+    "Erekiti" ,
+    "Erukan" ,
+    "Eruku" ,
+    "Erunkan" ,
+    "Etegbin" ,
+    "Euni" ,
+    "Ewekora" ,
+    "Ewekoro" ,
+    "Ewu" ,
+    "Ewu Ebi" ,
+    "Falomo" ,
+    "Fatade" ,
+    "Fatedo" ,
+    "Fonji" ,
+    "Ganme" ,
+    "Ganyingbo" ,
+    "Gbagidan" ,
+    "Gbaj" ,
+    "Gbaji" ,
+    "Gbanko" ,
+    "Gberegbe" ,
+    "Gberigbe" ,
+    "Gbesse" ,
+    "Gbeta" ,
+    "Gbodo" ,
+    "Gbogbo" ,
+    "Gbogije" ,
+    "Gbokuta" ,
+    "George" ,
+    "Ginti" ,
+    "Hausa" ,
+    "Henume" ,
+    "Hundo" ,
+    "Iba" ,
+    "Ibadan" ,
+    "Ibasa" ,
+    "Ibasha" ,
+    "Ibatefin" ,
+    "Ibawe Kekere" ,
+    "Ibawe Tukuru" ,
+    "Ibbojo" ,
+    "Ibefon" ,
+    "Ibefum" ,
+    "Ibefun" ,
+    "Ibeju" ,
+    "Ibereko" ,
+    "Iberekodo" ,
+    "Ibese" ,
+    "Ibeshe" ,
+    "Ibeshi" ,
+    "Ibiku" ,
+    "Ibode" ,
+    "Ibogun Adina" ,
+    "Ibogun Akiode" ,
+    "Ibogun Sowunmi" ,
+    "Iboju" ,
+    "Ibon" ,
+    "Ibopa" ,
+    "Ida" ,
+    "Idain Isaga" ,
+    "Idain-Ishaga" ,
+    "Idamo" ,
+    "Idanfuru" ,
+    "Idashaw" ,
+    "Idaso" ,
+    "Idata" ,
+    "Iddo" ,
+    "Ide" ,
+    "Idele" ,
+    "Ideno" ,
+    "Idi Agbon Agana" ,
+    "Idi Iroko" ,
+    "Idi Ofe" ,
+    "Idi Oro" ,
+    "Idi-Off" ,
+    "Idimarun" ,
+    "Idimi" ,
+    "Idimu" ,
+    "Idiori" ,
+    "Idiroko" ,
+    "Idobarun" ,
+    "name" ,
+    " " ,
+    "Idoforo" ,
+    "Idolanja" ,
+    "Idole" ,
+    "Idolehin" ,
+    "Idolorisha" ,
+    "Idolosa" ,
+    "Idomu" ,
+    "Idopetu" ,
+    "Idosa" ,
+    "Idosemo" ,
+    "Idowu" ,
+    "Ifako" ,
+    "Igami" ,
+    "Igando" ,
+    "Igando Awlawja" ,
+    "Iganmi" ,
+    "Iganmu" ,
+    "Iganmu Siding" ,
+    "Igbalu" ,
+    "Igbe" ,
+    "Igbe Ewoliwo" ,
+    "Igbede" ,
+    "Igbegodo" ,
+    "Igbekun" ,
+    "Igbele" ,
+    "Igbessa" ,
+    "Igbin" ,
+    "Igbin Oloya" ,
+    "Igbo" ,
+    "Igbo Ejo" ,
+    "Igbo Fipe" ,
+    "Igbobi" ,
+    "Igbodu" ,
+    "Igboefon" ,
+    "Igbogbele" ,
+    "Igbogila" ,
+    "Igbogun" ,
+    "Igbogun-Sowunmi" ,
+    "Igboje" ,
+    "Igbokushun" ,
+    "Igbolobi" ,
+    "Igbologun" ,
+    "Igboloye" ,
+    "Igbopa" ,
+    "Igborosun" ,
+    "Igbosa" ,
+    "Igbosere" ,
+    "Igboshere" ,
+    "Igodonu" ,
+    "Igoro" ,
+    "Igu" ,
+    "Igude" ,
+    "Igunnu Akabo" ,
+    "Ijagemo" ,
+    "Ijaiye" ,
+    "Ijako" ,
+    "Ijako Orile" ,
+    "Ijanikin" ,
+    "Ijawmi" ,
+    "Ijawmu" ,
+    "Ijawtun" ,
+    "Ijayie" ,
+    "Ijede" ,
+    "Ijegun" ,
+    "Ijero" ,
+    "Ijesa-Tedo" ,
+    "Ijofin" ,
+    "Ijomi" ,
+    "Ijomu" ,
+    "Ijora" ,
+    "Ijora Village" ,
+    "Ijotan" ,
+    "Iju" ,
+    "Iju Junction" ,
+    "Iju Water Works" ,
+    "Ikare" ,
+    "Ikate" ,
+    "Ikawga" ,
+    "Ikawga-Zebe" ,
+    "Ikawlaji" ,
+    "Ikawta" ,
+    "Ikeja" ,
+    "Ikoga" ,
+    "Ikoga Ile" ,
+    "Ikogbo" ,
+    "Ikolaja" ,
+    "Ikorodu" ,
+    "Ikosi" ,
+    "Ikotan" ,
+    "Ikotun" ,
+    "Ikoyi" ,
+    "Ikuata" ,
+    "Ilade" ,
+    "Ilado" ,
+    "Ilado Ogunu" ,
+    "Ilagbo" ,
+    "Ilasa" ,
+    "Ilashe" ,
+    "Ilemere" ,
+    "Ilepa" ,
+    "name" ,
+    " " ,
+    "Ileppaw" ,
+    "Ilera" ,
+    "Ilikiti" ,
+    "Ilo" ,
+    "Ilogbo" ,
+    "Ilogbo Elegba" ,
+    "Iloro" ,
+    "Ilugboro" ,
+    "Ilumawfin" ,
+    "Ilumofin" ,
+    "Imare" ,
+    "Imawte" ,
+    "Imeke" ,
+    "Imeri" ,
+    "Imeseju" ,
+    "Imore" ,
+    "Imoru" ,
+    "Imota" ,
+    "Inogbe" ,
+    "Inupa" ,
+    "Inupa Kekere" ,
+    "Ipaja" ,
+    "Ipakan" ,
+    "Ipanmi" ,
+    "Ipatira" ,
+    "Ipeshu" ,
+    "Ipesu" ,
+    "Ipewu" ,
+    "Ipokia" ,
+    "Iponri" ,
+    "Ipota" ,
+    "Iragbo" ,
+    "Iragon" ,
+    "Iranla" ,
+    "Irede" ,
+    "Irewe" ,
+    "Iru" ,
+    "Isagatedo" ,
+    "Isagbo" ,
+    "Isagbo Ere" ,
+    "Isagira" ,
+    "Isaku" ,
+    "Isalu" ,
+    "Isashi" ,
+    "Isasi" ,
+    "Isawo" ,
+    "Ise" ,
+    "Iseku" ,
+    "Isekun" ,
+    "Iseri-Osun" ,
+    "Ishaga" ,
+    "Ishagbo" ,
+    "Ishagira" ,
+    "Ishasi" ,
+    "Ishawo" ,
+    "Isheri-Olofin" ,
+    "Ishersi" ,
+    "Ishola" ,
+    "Isiu" ,
+    "Isiwu" ,
+    "Isola" ,
+    "Isolo" ,
+    "Isunba" ,
+    "Ita Egbe" ,
+    "Ita Onimosa" ,
+    "Itagbo" ,
+    "Itamaga" ,
+    "Itawga" ,
+    "Itawikin" ,
+    "Itawmu" ,
+    "Iteku" ,
+    "Itele" ,
+    "Itere" ,
+    "Itire" ,
+    "Itirin" ,
+    "Ito Omu" ,
+    "Itoga" ,
+    "Itohun" ,
+    "Itoikin" ,
+    "Itokin" ,
+    "Itomu" ,
+    "Itori" ,
+    "Iwaya" ,
+    "Iwerekun" ,
+    "Iworo" ,
+    "Iwuku" ,
+    "Iyafin" ,
+    "Iyagbe" ,
+    "Iyasi" ,
+    "Iyesi" ,
+    "Jaguna" ,
+    "Janikin" ,
+    "Jibowu" ,
+    "Jinadu" ,
+    "Kadara" ,
+    "Kafara" ,
+    "Kajola" ,
+    "Kajola Iboro" ,
+    "Kandoro" ,
+    "Kese"
+];
diff --git a/lib/locales/en_NG/address/default_country.js b/lib/locales/en_NG/address/default_country.js
new file mode 100644
index 00000000..711c6c65
--- /dev/null
+++ b/lib/locales/en_NG/address/default_country.js
@@ -0,0 +1,6 @@
+module["exports"] = [
+  "Nigeria",
+  "Federal Republic of Nigeria",
+  "NG",
+  "NGN"
+];
diff --git a/lib/locales/en_NG/address/index.js b/lib/locales/en_NG/address/index.js
new file mode 100644
index 00000000..04d128ec
--- /dev/null
+++ b/lib/locales/en_NG/address/index.js
@@ -0,0 +1,7 @@
+var address = {};
+module['exports'] = address;
+address.city = require("./city");
+address.city_prefix = require("./city_prefix");
+address.default_country = require("./default_country");
+address.postcode = require("./postcode");
+address.state = require("./state");
\ No newline at end of file
diff --git a/lib/locales/en_NG/address/postcode.js b/lib/locales/en_NG/address/postcode.js
new file mode 100644
index 00000000..a437640e
--- /dev/null
+++ b/lib/locales/en_NG/address/postcode.js
@@ -0,0 +1,4 @@
+module["exports"] = [
+  "#####",
+  "####"
+];
diff --git a/lib/locales/en_NG/address/state.js b/lib/locales/en_NG/address/state.js
new file mode 100644
index 00000000..1ad25fdb
--- /dev/null
+++ b/lib/locales/en_NG/address/state.js
@@ -0,0 +1,39 @@
+module["exports"] = [
+    'FCT',
+    'ABIA',
+    'ADAMAWA',
+    'Akwa Ibom',
+    'Anambra',
+    'Bauchi',
+    'Bayelsa',
+    'Benue',
+    'Bornu',
+    'Cross River',
+    'Delta',
+    'Ebonyi',
+    'Edo',
+    'Ekiti',
+    'Enugu',
+    'Gombe',
+    'Imo',
+    'Jigawa',
+    'Kaduna',
+    'Kano',
+    'Katsina',
+    'Kebbi',
+    'Kogi',
+    'Kwara',
+    'Lagos',
+    'Nasarawa',
+    'Niger',
+    'Ogun',
+    'Ondo',
+    'Osun',
+    'Oyo',
+    'Plateau',
+    'Rivers',
+    'Sokoto',
+    'Taraba',
+    'Yobe',
+    'Zamfara',
+];
diff --git a/lib/locales/en_NG/company/index.js b/lib/locales/en_NG/company/index.js
new file mode 100644
index 00000000..ddd41f55
--- /dev/null
+++ b/lib/locales/en_NG/company/index.js
@@ -0,0 +1,3 @@
+var company = {};
+module['exports'] = company;
+company.suffix = require("./suffix");
diff --git a/lib/locales/en_NG/company/suffix.js b/lib/locales/en_NG/company/suffix.js
new file mode 100644
index 00000000..d0f5c80a
--- /dev/null
+++ b/lib/locales/en_NG/company/suffix.js
@@ -0,0 +1,5 @@
+module["exports"] = [
+  "Venture",
+  "Ltd",
+  "Plc"
+];
diff --git a/lib/locales/en_NG/index.js b/lib/locales/en_NG/index.js
new file mode 100644
index 00000000..b2228b93
--- /dev/null
+++ b/lib/locales/en_NG/index.js
@@ -0,0 +1,8 @@
+var en_NG = {};
+module['exports'] = en_NG;
+en_NG.title = "Nigeria (English)";
+en_NG.address = require("./address");
+en_NG.internet = require("./internet");
+en_NG.name = require("./name");
+en_NG.phone_number = require("./phone_number");
+en_NG.company = require("./company");
\ No newline at end of file
diff --git a/lib/locales/en_NG/internet/domain_suffix.js b/lib/locales/en_NG/internet/domain_suffix.js
new file mode 100644
index 00000000..35652385
--- /dev/null
+++ b/lib/locales/en_NG/internet/domain_suffix.js
@@ -0,0 +1,7 @@
+module["exports"] = [
+  "com.ng",
+  "com",
+  "org.ng",
+  "com",
+  "ng"
+];
\ No newline at end of file
diff --git a/lib/locales/en_NG/internet/index.js b/lib/locales/en_NG/internet/index.js
new file mode 100644
index 00000000..abfa2480
--- /dev/null
+++ b/lib/locales/en_NG/internet/index.js
@@ -0,0 +1,3 @@
+var internet = {};
+module['exports'] = internet;
+internet.domain_suffix = require("./domain_suffix");
diff --git a/lib/locales/en_NG/name/female_first_name.js b/lib/locales/en_NG/name/female_first_name.js
new file mode 100644
index 00000000..66496055
--- /dev/null
+++ b/lib/locales/en_NG/name/female_first_name.js
@@ -0,0 +1,14 @@
+module["exports"] = [
+	'Adaugo', 'Akunna', 'Aminat', 'Aminu', 'Augustina', 'Ayebatari',
+	'Cherechi', 'Chiamaka', 'Chimamanda', 'Chinyere', 'Chizoba',
+	'Ebiere', 'Efe',
+	'Fatima', 'Ifeoma',
+	'Ifunanya', 'Isioma',
+	'Jolayemi',
+	'Lola',
+	'Obioma', 'Omawunmi', 'Omolara', 'Onome',
+	'Rasheedah',
+	'Sekinat', 'Simisola', 'Sumayyah',
+	'Titi', 'Titilayo', 'Toluwani',
+	'Zainab'
+	];
\ No newline at end of file
diff --git a/lib/locales/en_NG/name/first_name.js b/lib/locales/en_NG/name/first_name.js
new file mode 100644
index 00000000..438210bb
--- /dev/null
+++ b/lib/locales/en_NG/name/first_name.js
@@ -0,0 +1,35 @@
+module["exports"] = [
+	'Adaugo', 'Akunna', 'Aminat', 'Aminu', 'Augustina', 'Ayebatari',
+	'Cherechi', 'Chiamaka', 'Chimamanda', 'Chinyere', 'Chizoba',
+	'Ebiere', 'Efe',
+	'Fatima', 'Ifeoma',
+	'Ifunanya', 'Isioma',
+	'Jolayemi',
+	'Lola',
+	'Obioma', 'Omawunmi', 'Omolara', 'Onome',
+	'Rasheedah',
+	'Sekinat', 'Simisola', 'Sumayyah',
+	'Titi', 'Titilayo', 'Toluwani',
+	'Zainab',
+	'Abimbola','Abisola','Abisoye','Adeboye','Adedayo','Adegoke', 'Akande', 'Akanni', 'Alade', 'Ayinde', 'Azubuike',
+	'Banji', 'Bankole', 'Buchi', 'Bukola',
+	'Chinedu', 'Chisom', 'Chukwu',
+	'Damilare', 'Damilola', 'Danjuma',
+	'Ebiowei', 'Emeka', 'Emmanuel', 'Esse',
+	'Funmilade', 'Funmilayo',
+	'Gbeminiyi', 'Gbemisola',
+	'Habiba', 'Ifeanyichukwu',
+	'Ikenna', 'Ikhidie', 'Ireti',
+	'Jadesola', 'Johnson',
+	'Kayode', 'Kemi', 'Kubra', 'Kubura',
+	'Lolade',
+	'Makinwa', 'Mohammed', 'Musa', 'Muyiwa',
+	'Nnamdi',
+	'Olaide', 'Olufunmi', 'Olumide', 'Oluwunmi', 'Onoriode',
+	'Remilekun', 'Rotimi',
+	'Shade', 'Shalewa', 'Sname',
+	'Tari', 'Temitope', 'Titilope', 'Tobiloba', 'Toke', 'Tomiloba', 'Tope',
+	'Uzodimma',
+	'Wale',
+	'Yakubu', 'Yusuf', 'Yusuf',
+];
\ No newline at end of file
diff --git a/lib/locales/en_NG/name/index.js b/lib/locales/en_NG/name/index.js
new file mode 100644
index 00000000..f71eef88
--- /dev/null
+++ b/lib/locales/en_NG/name/index.js
@@ -0,0 +1,7 @@
+var name = {};
+module['exports'] = name;
+name.name = require("./name");
+name.male_first_name = require("./male_first_name");
+name.female_first_name = require("./female_first_name");
+name.first_name = require("./first_name");
+name.last_name = require("./last_name");
\ No newline at end of file
diff --git a/lib/locales/en_NG/name/last_name.js b/lib/locales/en_NG/name/last_name.js
new file mode 100644
index 00000000..8e7eac80
--- /dev/null
+++ b/lib/locales/en_NG/name/last_name.js
@@ -0,0 +1,23 @@
+module["exports"] = [
+  'Abiodun', 'Abiola', 'Abodunrin', 'Abosede', 'Adaobi', 'Adebayo', 'Adegboye', 'Adegoke', 'Ademayowa', 'Ademola', 'Adeniyan', 'Adeoluwa', 'Aderinsola', 'Aderonke', 'Adesina', 'Adewale', 'Adewale', 'Adewale', 'Adewunmi', 'Adewura', 'Adeyemo', 'Afolabi', 'Afunku', 'Agboola', 'Agboola', 'Agnes', 'Aigbiniode', 'Ajakaiye', 'Ajose-adeogun', 'Akeem-omosanya', 'Akerele', 'Akintade', 'Aligbe', 'Amaechi', 'Aminat', 'Aremu', 'Atanda', 'Ayisat', 'Ayobami', 'Ayomide', 'Ayomide',
+  'Babalola', 'Babatunde', 'Balogun', 'Bamisebi', 'Bello', 'Busari',
+  'Chibike', 'Chibuike', 'Chidinma', 'Chidozie', 'Christian', 'Clare',
+  'David', 'David',
+  'Ebubechukwu', 'Egbochukwu', 'Ehigiator', 'Ekwueme', 'Elebiyo', 'Elizabeth', 'Elizabeth', 'Elizabeth', 'Emmanuel', 'Emmanuel', 'Esther',
+  'Funmilayo',
+  'Gbadamosi', 'Gbogboade', 'Grace',
+  'Habeeb', 'Hanifat', 'Isaac',
+  'Ismail', 'Isokun', 'Israel', 'Iyalla',
+  'Jamiu', 'Jimoh', 'Joshua', 'Justina',
+  'Katherine', 'Kayode', 'Kayode', 'Kimberly',
+  'Ladega', 'Latifat', 'Lawal', 'Leonard',
+  'Makuachukwu', 'Maryam', 'Maryjane', 'Mayowa', 'Miracle', 'Mobolaji', 'Mogbadunade', 'Motalo', 'Muinat', 'Mukaram', 'Mustapha', 'Mutiat',
+  'Ndukwu', 'Ngozi', 'Nojeem', 'Nwachukwu', 'Nwogu', 'Nwuzor',
+  'Obiageli', 'Obianuju', 'Odunayo', 'Odunayo', 'Ogunbanwo', 'Ogunwande', 'Okonkwo', 'Okunola', 'Oladeji', 'Oladimeji', 'Olaoluwa', 'Olasunkanmi', 'Olasunkanmi-fasayo', 'Olawale', 'Olubukola', 'Olubunmi', 'Olufeyikemi', 'Olumide', 'Olutola', 'Oluwakemi', 'Oluwanisola', 'Oluwaseun', 'Oluwaseyi', 'Oluwashina', 'Oluwatosin', 'Omobolaji', 'Omobolanle', 'Omolara', 'Omowale', 'Onohinosen', 'Onose', 'Onyinyechukwu', 'Opeyemi', 'Osuagwu', 'Oyebola', 'Oyelude', 'Oyinkansola',
+  'Peter',
+  'Sabdat', 'Saheed', 'Salami', 'Samuel', 'Sanusi', 'Sarah', 'Segunmaru', 'Sekinat', 'Sulaimon', 'Sylvester',
+  'Taiwo', 'Tamunoemi', 'Tella', 'Temitope', 'Tolulope',
+  'Uchechi',
+  'Wasiu', 'Wilcox', 'Wuraola',
+  'Yaqub', 'Yussuf'
+];
\ No newline at end of file
diff --git a/lib/locales/en_NG/name/male_first_name.js b/lib/locales/en_NG/name/male_first_name.js
new file mode 100644
index 00000000..f77eab02
--- /dev/null
+++ b/lib/locales/en_NG/name/male_first_name.js
@@ -0,0 +1,23 @@
+module["exports"] = [
+	'Abimbola','Abisola','Abisoye','Adeboye','Adedayo','Adegoke', 'Akande', 'Akanni', 'Alade', 'Ayinde', 'Azubuike',
+	'Banji', 'Bankole', 'Buchi', 'Bukola',
+	'Chinedu', 'Chisom', 'Chukwu',
+	'Damilare', 'Damilola', 'Danjuma',
+	'Ebiowei', 'Emeka', 'Emmanuel', 'Esse',
+	'Funmilade', 'Funmilayo',
+	'Gbeminiyi', 'Gbemisola',
+	'Habiba', 'Ifeanyichukwu',
+	'Ikenna', 'Ikhidie', 'Ireti',
+	'Jadesola', 'Johnson',
+	'Kayode', 'Kemi', 'Kubra', 'Kubura',
+	'Lolade',
+	'Makinwa', 'Mohammed', 'Musa', 'Muyiwa',
+	'Nnamdi',
+	'Olaide', 'Olufunmi', 'Olumide', 'Oluwunmi', 'Onoriode',
+	'Remilekun', 'Rotimi',
+	'Shade', 'Shalewa', 'Sname',
+	'Tari', 'Temitope', 'Titilope', 'Tobiloba', 'Toke', 'Tomiloba', 'Tope',
+	'Uzodimma',
+	'Wale',
+	'Yakubu', 'Yusuf', 'Yusuf',
+	];
\ No newline at end of file
diff --git a/lib/locales/en_NG/name/name.js b/lib/locales/en_NG/name/name.js
new file mode 100644
index 00000000..5734174b
--- /dev/null
+++ b/lib/locales/en_NG/name/name.js
@@ -0,0 +1,4 @@
+module["exports"] = [
+  "#{first_name} #{last_name}",
+  "#{last_name} #{first_name}"
+];
diff --git a/lib/locales/en_NG/phone_number/formats.js b/lib/locales/en_NG/phone_number/formats.js
new file mode 100644
index 00000000..3520ac50
--- /dev/null
+++ b/lib/locales/en_NG/phone_number/formats.js
@@ -0,0 +1,7 @@
+module["exports"] = [
+    '0803 ### ####',
+    '0703 ### ####',
+    '234809 ### ####',
+    '+234 802 ### ####',
+    '0805### ####'
+];
\ No newline at end of file
diff --git a/lib/locales/en_NG/phone_number/index.js b/lib/locales/en_NG/phone_number/index.js
new file mode 100644
index 00000000..8de997ba
--- /dev/null
+++ b/lib/locales/en_NG/phone_number/index.js
@@ -0,0 +1,3 @@
+var cell_phone = {};
+module['exports'] = cell_phone;
+cell_phone.formats = require("./formats");
diff --git a/lib/locales/en_US/index.js b/lib/locales/en_US/index.js
index 260a1878..25683087 100644
--- a/lib/locales/en_US/index.js
+++ b/lib/locales/en_US/index.js
@@ -1,6 +1,6 @@
 var en_US = {};
 module['exports'] = en_US;
-en_US.title = "United States (English)";
+en_US.title = "English (United States)";
 en_US.internet = require("./internet");
 en_US.address = require("./address");
 en_US.phone_number = require("./phone_number");
diff --git a/lib/locales/en_ZA/index.js b/lib/locales/en_ZA/index.js
index af562ffa..e93304e0 100644
--- a/lib/locales/en_ZA/index.js
+++ b/lib/locales/en_ZA/index.js
@@ -1,9 +1,9 @@
 var en_ZA = {};
 module['exports'] = en_ZA;
-en_ZA.title = "South Africa (English)";
+en_ZA.title = "English (South Africa)";
 en_ZA.address = require("./address");
 en_ZA.internet = require("./internet");
 en_ZA.name = require("./name");
 en_ZA.phone_number = require("./phone_number");
 en_ZA.cell_phone = require("./cell_phone");
-en_ZA.company = require("./company");
\ No newline at end of file
+en_ZA.company = require("./company");
diff --git a/lib/locales/en_au_ocker/index.js b/lib/locales/en_au_ocker/index.js
deleted file mode 100644
index d8433ae0..00000000
--- a/lib/locales/en_au_ocker/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var en_au_ocker = {};
-module['exports'] = en_au_ocker;
-en_au_ocker.title = "Australia Ocker (English)";
-en_au_ocker.name = require("./name");
-en_au_ocker.company = require("./company");
-en_au_ocker.internet = require("./internet");
-en_au_ocker.address = require("./address");
-en_au_ocker.phone_number = require("./phone_number");
diff --git a/lib/locales/es_MX/index.js b/lib/locales/es_MX/index.js
index 1f2c95c0..d49087b6 100644
--- a/lib/locales/es_MX/index.js
+++ b/lib/locales/es_MX/index.js
@@ -1,6 +1,6 @@
 var es_MX = {};
 module['exports'] = es_MX;
-es_MX.title = "Spanish Mexico";
+es_MX.title = "Spanish (Mexico)";
 es_MX.separator = " & ";
 es_MX.name = require("./name");
 es_MX.address = require("./address");
@@ -10,4 +10,4 @@ es_MX.phone_number = require("./phone_number");
 es_MX.cell_phone = require("./cell_phone");
 es_MX.lorem = require("./lorem");
 es_MX.commerce = require("./commerce");
-es_MX.team = require("./team");
\ No newline at end of file
+es_MX.team = require("./team");
diff --git a/lib/locales/es_MX/name/title.js b/lib/locales/es_MX/name/title.js
index 5e2fd9cd..edb8314c 100644
--- a/lib/locales/es_MX/name/title.js
+++ b/lib/locales/es_MX/name/title.js
@@ -59,7 +59,7 @@
     "Interacciones",
     "Factores",
     "Usabilidad",
-    "Métricas",
+    "Métricas"
   ],
   "job": [
     "Supervisor",
diff --git a/lib/locales/fi/index.js b/lib/locales/fi/index.js
new file mode 100644
index 00000000..749c86ad
--- /dev/null
+++ b/lib/locales/fi/index.js
@@ -0,0 +1,4 @@
+var fi = {};
+module['exports'] = fi;
+fi.title = "Finnish";
+fi.name = require("./name");
\ No newline at end of file
diff --git a/lib/locales/fi/name/female_first_name.js b/lib/locales/fi/name/female_first_name.js
new file mode 100644
index 00000000..33a0aee9
--- /dev/null
+++ b/lib/locales/fi/name/female_first_name.js
@@ -0,0 +1,52 @@
+module["exports"] = [
+    "Aino",
+    "Anja",
+    "Anna",
+    "Anne",
+    "Anneli",
+    "Annikki",
+    "Eeva",
+    "Elina",
+    "Elisabet",
+    "Emilia",
+    "Eveliina",
+    "Hanna",
+    "Hannele",
+    "Helena",
+    "Inkeri",
+    "Irmeli",
+    "Johanna",
+    "Kaarina",
+    "Karoliina",
+    "Katariina",
+    "Kristiina",
+    "Kyllikki",
+    "Laura",
+    "Leena",
+    "Liisa",
+    "Maarit",
+    "Maija",
+    "Mari",
+    "Maria",
+    "Marika",
+    "Marja",
+    "Marjatta",
+    "Minna",
+    "Orvokki",
+    "Pauliina",
+    "Pirjo",
+    "Pirkko",
+    "Päivi",
+    "Riitta",
+    "Ritva",
+    "Sari",
+    "Satu",
+    "Sinikka",
+    "Sofia",
+    "Susanna",
+    "Tarja",
+    "Tellervo",
+    "Tiina",
+    "Tuula",
+    "Tuulikki"
+];
\ No newline at end of file
diff --git a/lib/locales/fi/name/first_name.js b/lib/locales/fi/name/first_name.js
new file mode 100644
index 00000000..6baa71df
--- /dev/null
+++ b/lib/locales/fi/name/first_name.js
@@ -0,0 +1,102 @@
+module["exports"] = [
+    "Aleksi",
+    "Antero",
+    "Antti",
+    "Ari",
+    "Eero",
+    "Ensio",
+    "Erik",
+    "Erkki",
+    "Hannu",
+    "Heikki",
+    "Henrik",
+    "Ilmari",
+    "Jaakko",
+    "Janne",
+    "Jari",
+    "Johannes",
+    "Juha",
+    "Juhani",
+    "Juho",
+    "Jukka",
+    "Kalervo",
+    "Kalevi",
+    "Kari",
+    "Kristian",
+    "Lauri",
+    "Markku",
+    "Marko",
+    "Markus",
+    "Martti",
+    "Matias",
+    "Matti",
+    "Mika",
+    "Mikael",
+    "Mikko",
+    "Olavi",
+    "Oskari",
+    "Pekka",
+    "Pentti",
+    "Petri",
+    "Petteri",
+    "Sakari",
+    "Sami",
+    "Seppo",
+    "Tapani",
+    "Tapio",
+    "Timo",
+    "Tuomas",
+    "Valtteri",
+    "Veikko",
+    "Ville",
+    "Aino",
+    "Anja",
+    "Anna",
+    "Anne",
+    "Anneli",
+    "Annikki",
+    "Eeva",
+    "Elina",
+    "Elisabet",
+    "Emilia",
+    "Eveliina",
+    "Hanna",
+    "Hannele",
+    "Helena",
+    "Inkeri",
+    "Irmeli",
+    "Johanna",
+    "Kaarina",
+    "Karoliina",
+    "Katariina",
+    "Kristiina",
+    "Kyllikki",
+    "Laura",
+    "Leena",
+    "Liisa",
+    "Maarit",
+    "Maija",
+    "Mari",
+    "Maria",
+    "Marika",
+    "Marja",
+    "Marjatta",
+    "Minna",
+    "Orvokki",
+    "Pauliina",
+    "Pirjo",
+    "Pirkko",
+    "Päivi",
+    "Riitta",
+    "Ritva",
+    "Sari",
+    "Satu",
+    "Sinikka",
+    "Sofia",
+    "Susanna",
+    "Tarja",
+    "Tellervo",
+    "Tiina",
+    "Tuula",
+    "Tuulikki"
+];
\ No newline at end of file
diff --git a/lib/locales/fi/name/index.js b/lib/locales/fi/name/index.js
new file mode 100644
index 00000000..686c045b
--- /dev/null
+++ b/lib/locales/fi/name/index.js
@@ -0,0 +1,7 @@
+var name = {};
+module['exports'] = name;
+name.male_first_name = require("./male_first_name");
+name.female_first_name = require("./female_first_name");
+name.first_name = require("./first_name");
+name.last_name = require("./last_name");
+name.name = require("./name");
\ No newline at end of file
diff --git a/lib/locales/fi/name/last_name.js b/lib/locales/fi/name/last_name.js
new file mode 100644
index 00000000..6d9af550
--- /dev/null
+++ b/lib/locales/fi/name/last_name.js
@@ -0,0 +1,52 @@
+module["exports"] = [
+    "Aaltonen",
+    "Ahonen",
+    "Anttila",
+    "Hakala",
+    "Heikkilä",
+    "Heikkinen",
+    "Heinonen",
+    "Hiltunen",
+    "Hirvonen",
+    "Hämäläinen",
+    "Jokinen",
+    "Järvinen",
+    "Kallio",
+    "Karjalainen",
+    "Kinnunen",
+    "Koivisto",
+    "Korhonen",
+    "Koskinen",
+    "Laakso",
+    "Laaksonen",
+    "Lahtinen",
+    "Laine",
+    "Laitinen",
+    "Lehtinen",
+    "Lehto",
+    "Lehtonen",
+    "Leinonen",
+    "Leppänen",
+    "Manninen",
+    "Mattila",
+    "Miettinen",
+    "Mustonen",
+    "Mäkelä",
+    "Mäkinen",
+    "Niemi",
+    "Nieminen",
+    "Ojala",
+    "Pitkänen",
+    "Rantanen",
+    "Räsänen",
+    "Saarinen",
+    "Salminen",
+    "Salo",
+    "Salonen",
+    "Savolainen",
+    "Toivonen",
+    "Tuominen",
+    "Turunen",
+    "Virtanen",
+    "Väisänen"
+]
\ No newline at end of file
diff --git a/lib/locales/fi/name/male_first_name.js b/lib/locales/fi/name/male_first_name.js
new file mode 100644
index 00000000..4212a16e
--- /dev/null
+++ b/lib/locales/fi/name/male_first_name.js
@@ -0,0 +1,52 @@
+module["exports"] = [
+    "Aleksi",
+    "Antero",
+    "Antti",
+    "Ari",
+    "Eero",
+    "Ensio",
+    "Erik",
+    "Erkki",
+    "Hannu",
+    "Heikki",
+    "Henrik",
+    "Ilmari",
+    "Jaakko",
+    "Janne",
+    "Jari",
+    "Johannes",
+    "Juha",
+    "Juhani",
+    "Juho",
+    "Jukka",
+    "Kalervo",
+    "Kalevi",
+    "Kari",
+    "Kristian",
+    "Lauri",
+    "Markku",
+    "Marko",
+    "Markus",
+    "Martti",
+    "Matias",
+    "Matti",
+    "Mika",
+    "Mikael",
+    "Mikko",
+    "Olavi",
+    "Oskari",
+    "Pekka",
+    "Pentti",
+    "Petri",
+    "Petteri",
+    "Sakari",
+    "Sami",
+    "Seppo",
+    "Tapani",
+    "Tapio",
+    "Timo",
+    "Tuomas",
+    "Valtteri",
+    "Veikko",
+    "Ville"
+]
\ No newline at end of file
diff --git a/lib/locales/fi/name/name.js b/lib/locales/fi/name/name.js
new file mode 100644
index 00000000..3f42bf04
--- /dev/null
+++ b/lib/locales/fi/name/name.js
@@ -0,0 +1,6 @@
+module["exports"] = [
+  "#{first_name} #{last_name}",
+  "#{first_name} #{last_name}",
+  "#{male_first_name} #{last_name}",
+  "#{female_first_name} #{last_name}"
+];
\ No newline at end of file
diff --git a/lib/locales/fr/address/city_name.js b/lib/locales/fr/address/city_name.js
index 3437cc30..740dd2d9 100644
--- a/lib/locales/fr/address/city_name.js
+++ b/lib/locales/fr/address/city_name.js
@@ -8,7 +8,7 @@ module["exports"] = [
   "Strasbourg",
   "Montpellier",
   "Bordeaux",
-  "Lille13",
+  "Lille",
   "Rennes",
   "Reims",
   "Le Havre",
diff --git a/lib/locales/fr_CA/index.js b/lib/locales/fr_CA/index.js
index c3e42cb8..29cfce83 100644
--- a/lib/locales/fr_CA/index.js
+++ b/lib/locales/fr_CA/index.js
@@ -1,6 +1,6 @@
 var fr_CA = {};
 module['exports'] = fr_CA;
-fr_CA.title = "Canada (French)";
+fr_CA.title = "French (Canada)";
 fr_CA.address = require("./address");
 fr_CA.internet = require("./internet");
 fr_CA.phone_number = require("./phone_number");
diff --git a/lib/locales/it/name/female_first_name.js b/lib/locales/it/name/female_first_name.js
new file mode 100644
index 00000000..1edb7df8
--- /dev/null
+++ b/lib/locales/it/name/female_first_name.js
@@ -0,0 +1,619 @@
+module['exports'] = [

+  'Abbondanza',

+  'Acilia',

+  'Ada',

+  'Adalberta',

+  'Adalgisa',

+  'Addolorata',

+  'Adelaide',

+  'Adelasia',

+  'Adele',

+  'Adelina',

+  'Adina',

+  'Adria',

+  'Adriana',

+  'Agape',

+  'Agata',

+  'Agnese',

+  'Agostina',

+  'Aida',

+  'Alba',

+  'Alberta',

+  'Albina',

+  'Alcina',

+  'Alda',

+  'Alessandra',

+  'Alessia',

+  'Alfonsa',

+  'Alfreda',

+  'Alice',

+  'Alida',

+  'Alina',

+  'Allegra',

+  'Alma',

+  'Altea',

+  'Amalia',

+  'Amanda',

+  'Amata',

+  'Ambra',

+  'Amelia',

+  'Amina',

+  'Anastasia',

+  'Anatolia',

+  'Ancilla',

+  'Andromeda',

+  'Angela',

+  'Angelica',

+  'Anita',

+  'Anna',

+  'Annabella',

+  'Annagrazia',

+  'Annamaria',

+  'Annunziata',

+  'Antea',

+  'Antigone',

+  'Antonella',

+  'Antonia',

+  'Apollina',

+  'Apollonia',

+  'Appia',

+  'Arabella',

+  'Argelia',

+  'Arianna',

+  'Armida',

+  'Artemisa',

+  'Asella',

+  'Asia',

+  'Assunta',

+  'Astrid',

+  'Atanasia',

+  'Aurelia',

+  'Aurora',

+  'Ausilia',

+  'Ausiliatrice',

+  'Ave',

+  'Aza',

+  'Azelia',

+  'Azzurra',

+  'Babila',

+  'Bambina',

+  'Barbara',

+  'Bartolomea',

+  'Basilia',

+  'Bassilla',

+  'Batilda',

+  'Beata',

+  'Beatrice',

+  'Belina',

+  'Benedetta',

+  'Beniamina',

+  'Benigna',

+  'Benvenuta',

+  'Berenice',

+  'Bernadetta',

+  'Betta',

+  'Bianca',

+  'Bibiana',

+  'Bice',

+  'Brigida',

+  'Brigitta',

+  'Bruna',

+  'Brunilde',

+  'Calogera',

+  'Calpurnia',

+  'Camelia',

+  'Camilla',

+  'Candida',

+  'Capitolina',

+  'Carina',

+  'Carla',

+  'Carlotta',

+  'Carmela',

+  'Carmen',

+  'Carola',

+  'Carolina',

+  'Casilda',

+  'Casimira',

+  'Cassandra',

+  'Cassiopea',

+  'Catena',

+  'Caterina',

+  'Cecilia',

+  'Celeste',

+  'Celinia',

+  'Chiara',

+  'Cinzia',

+  'Cirilla',

+  'Clara',

+  'Claudia',

+  'Clelia',

+  'Clemenzia',

+  'Cleo',

+  'Cleofe',

+  'Cleopatra',

+  'Cloe',

+  'Clorinda',

+  'Cointa',

+  'Colomba',

+  'Concetta',

+  'Consolata',

+  'Cora',

+  'Cordelia',

+  'Corinna',

+  'Cornelia',

+  'Cosima',

+  'Costanza',

+  'Crescenzia',

+  'Cristiana',

+  'Cristina',

+  'Crocefissa',

+  'Cronida',

+  'Cunegonda',

+  'Cuzia',

+  'Dafne',

+  'Dalida',

+  'Dalila',

+  'Damiana',

+  'Daniela',

+  'Daria',

+  'Deanna',

+  'Debora',

+  'Degna',

+  'Delfina',

+  'Delia',

+  'Delinda',

+  'Delizia',

+  'Demetria',

+  'Deodata',

+  'Desdemona',

+  'Desiderata',

+  'Devota',

+  'Diamante',

+  'Diana',

+  'Dianora',

+  'Diletta',

+  'Dina',

+  'Diodata',

+  'Dionisia',

+  'Doda',

+  'Dolores',

+  'Domenica',

+  'Donata',

+  'Donatella',

+  'Donna',

+  'Dora',

+  'Dorotea',

+  'Druina',

+  'Dulina',

+  'Ebe',

+  'Edda',

+  'Edelberga',

+  'Editta',

+  'Edvige',

+  'Egizia',

+  'Egle',

+  'Elaide',

+  'Elda',

+  'Elena',

+  'Eleonora',

+  'Elettra',

+  'Eliana',

+  'Elide',

+  'Elimena',

+  'Elisa',

+  'Elisabetta',

+  'Elisea',

+  'Ella',

+  'Eloisa',

+  'Elsa',

+  'Elvia',

+  'Elvira',

+  'Emanuela',

+  'Emilia',

+  'Emiliana',

+  'Emma',

+  'Enimia',

+  'Enrica',

+  'Eracla',

+  'Ermelinda',

+  'Ermenegarda',

+  'Ermenegilda',

+  'Erminia',

+  'Ernesta',

+  'Ersilia',

+  'Esmeralda',

+  'Estella',

+  'Ester',

+  'Esterina',

+  'Eufemia',

+  'Eufrasia',

+  'Eugenia',

+  'Eulalia',

+  'Euridice',

+  'Eusebia',

+  'Eutalia',

+  'Eva',

+  'Evangelina',

+  'Evelina',

+  'Fabiana',

+  'Fabiola',

+  'Fatima',

+  'Fausta',

+  'Federica',

+  'Fedora',

+  'Felicia',

+  'Felicita',

+  'Fernanda',

+  'Fiammetta',

+  'Filippa',

+  'Filomena',

+  'Fiordaliso',

+  'Fiore',

+  'Fiorella',

+  'Fiorenza',

+  'Flaminia',

+  'Flavia',

+  'Flaviana',

+  'Flora',

+  'Floriana',

+  'Floridia',

+  'Florina',

+  'Foca',

+  'Fortunata',

+  'Fosca',

+  'Franca',

+  'Francesca',

+  'Fulvia',

+  'Gabriella',

+  'Gaia',

+  'Galatea',

+  'Gaudenzia',

+  'Gelsomina',

+  'Geltrude',

+  'Gemma',

+  'Generosa',

+  'Genesia',

+  'Genoveffa',

+  'Germana',

+  'Gertrude',

+  'Ghita',

+  'Giacinta',

+  'Giada',

+  'Gigliola',

+  'Gilda',

+  'Giliola',

+  'Ginevra',

+  'Gioacchina',

+  'Gioconda',

+  'Gioia',

+  'Giorgia',

+  'Giovanna',

+  'Gisella',

+  'Giuditta',

+  'Giulia',

+  'Giuliana',

+  'Giulitta',

+  'Giuseppa',

+  'Giuseppina',

+  'Giusta',

+  'Glenda',

+  'Gloria',

+  'Godeberta',

+  'Godiva',

+  'Grazia',

+  'Graziana',

+  'Graziella',

+  'Greta',

+  'Griselda',

+  'Guenda',

+  'Guendalina',

+  'Gundelinda',

+  'Ianira',

+  'Ida',

+  'Idea',

+  'Iginia',

+  'Ilaria',

+  'Ilda',

+  'Ildegarda',

+  'Ildegonda',

+  'Ileana',

+  'Ilenia',

+  'Ilia',

+  'Ilva',

+  'Imelda',

+  'Immacolata',

+  'Incoronata',

+  'Ines',

+  'Innocenza',

+  'Iolanda',

+  'Iole',

+  'Iona',

+  'Ione',

+  'Ionne',

+  'Irene',

+  'Iride',

+  'Iris',

+  'Irma',

+  'Irmina',

+  'Isa',

+  'Isabella',

+  'Iside',

+  'Isidora',

+  'Isotta',

+  'Italia',

+  'Ivetta',

+  'Lara',

+  'Laura',

+  'Lavinia',

+  'Lea',

+  'Leda',

+  'Lelia',

+  'Lena',

+  'Leonia',

+  'Leonilda',

+  'Leontina',

+  'Letizia',

+  'Lia',

+  'Liana',

+  'Liberata',

+  'Liboria',

+  'Licia',

+  'Lidania',

+  'Lidia',

+  'Liliana',

+  'Linda',

+  'Lisa',

+  'Livia',

+  'Liviana',

+  'Lodovica',

+  'Loredana',

+  'Lorella',

+  'Lorena',

+  'Lorenza',

+  'Loretta',

+  'Loriana',

+  'Luana',

+  'Luce',

+  'Lucia',

+  'Luciana',

+  'Lucilla',

+  'Lucrezia',

+  'Ludovica',

+  'Luigia',

+  'Luisa',

+  'Luminosa',

+  'Luna',

+  'Macaria',

+  'Maddalena',

+  'Mafalda',

+  'Magda',

+  'Maida',

+  'Manuela',

+  'Mara',

+  'Marana',

+  'Marcella',

+  'Mareta',

+  'Margherita',

+  'Maria',

+  'Marianna',

+  'Marica',

+  'Mariella',

+  'Marilena',

+  'Marina',

+  'Marinella',

+  'Marinetta',

+  'Marisa',

+  'Marita',

+  'Marta',

+  'Martina',

+  'Maruta',

+  'Marzia',

+  'Massima',

+  'Matilde',

+  'Maura',

+  'Melania',

+  'Melissa',

+  'Melitina',

+  'Menodora',

+  'Mercede',

+  'Messalina',

+  'Mia',

+  'Michela',

+  'Milena',

+  'Mimma',

+  'Mina',

+  'Minerva',

+  'Minervina',

+  'Miranda',

+  'Mirella',

+  'Miriam',

+  'Mirta',

+  'Moira',

+  'Monica',

+  'Morena',

+  'Morgana',

+  'Nadia',

+  'Natalia',

+  'Natalina',

+  'Neiva',

+  'Nerea',

+  'Nicla',

+  'Nicoletta',

+  'Nilde',

+  'Nina',

+  'Ninfa',

+  'Nives',

+  'Noemi',

+  'Norina',

+  'Norma',

+  'Novella',

+  'Nuccia',

+  'Nunziata',

+  'Odetta',

+  'Odilia',

+  'Ofelia',

+  'Olga',

+  'Olimpia',

+  'Olinda',

+  'Olivia',

+  'Oliviera',

+  'Ombretta',

+  'Ondina',

+  'Onesta',

+  'Onorata',

+  'Onorina',

+  'Orchidea',

+  'Oriana',

+  'Orietta',

+  'Ornella',

+  'Orsola',

+  'Orsolina',

+  'Ortensia',

+  'Osanna',

+  'Otilia',

+  'Ottilia',

+  'Palladia',

+  'Palmazio',

+  'Palmira',

+  'Pamela',

+  'Paola',

+  'Patrizia',

+  'Pelagia',

+  'Penelope',

+  'Perla',

+  'Petronilla',

+  'Pia',

+  'Piera',

+  'Placida',

+  'Polissena',

+  'Porzia',

+  'Prisca',

+  'Priscilla',

+  'Proserpina',

+  'Prospera',

+  'Prudenzia',

+  'Quartilla',

+  'Quieta',

+  'Quiteria',

+  'Rachele',

+  'Raffaella',

+  'Rainelda',

+  'Rebecca',

+  'Regina',

+  'Renata',

+  'Riccarda',

+  'Rina',

+  'Rita',

+  'Roberta',

+  'Romana',

+  'Romilda',

+  'Romina',

+  'Romola',

+  'Rosa',

+  'Rosalia',

+  'Rosalinda',

+  'Rosamunda',

+  'Rosanna',

+  'Rosita',

+  'Rosmunda',

+  'Rossana',

+  'Rossella',

+  'Rufina',

+  'Saba',

+  'Sabina',

+  'Sabrina',

+  'Samanta',

+  'Samona',

+  'Sandra',

+  'Santina',

+  'Sara',

+  'Savina',

+  'Scolastica',

+  'Sebastiana',

+  'Seconda',

+  'Secondina',

+  'Sefora',

+  'Selene',

+  'Selvaggia',

+  'Semiramide',

+  'Serafina',

+  'Serena',

+  'Severa',

+  'Sibilla',

+  'Sidonia',

+  'Silvana',

+  'Silvia',

+  'Simona',

+  'Simonetta',

+  'Siria',

+  'Smeralda',

+  'Soave',

+  'Sofia',

+  'Sofronia',

+  'Solange',

+  'Sonia',

+  'Speranza',

+  'Stefania',

+  'Stella',

+  'Susanna',

+  'Sveva',

+  'Tabita',

+  'Tamara',

+  'Tarquinia',

+  'Tarsilla',

+  'Taziana',

+  'Tea',

+  'Tecla',

+  'Telica',

+  'Teodata',

+  'Teodolinda',

+  'Teodora',

+  'Teresa',

+  'Teudosia',

+  'Tina',

+  'Tiziana',

+  'Tosca',

+  'Trasea',

+  'Tullia',

+  'Ugolina',

+  'Ulfa',

+  'Uliva',

+  'Unna',

+  'Vala',

+  'Valentina',

+  'Valeria',

+  'Valeriana',

+  'Vanda',

+  'Vanessa',

+  'Vanna',

+  'Venera',

+  'Veneranda',

+  'Venere',

+  'Venusta',

+  'Vera',

+  'Verdiana',

+  'Verena',

+  'Veriana',

+  'Veridiana',

+  'Veronica',

+  'Viliana',

+  'Vilma',

+  'Vincenza',

+  'Viola',

+  'Violante',

+  'Virginia',

+  'Vissia',

+  'Vittoria',

+  'Viviana',

+  'Wanda',

+  'Zabina',

+  'Zaira',

+  'Zama',

+  'Zanita',

+  'Zarina',

+  'Zelinda',

+  'Zenobia',

+  'Zita',

+  'Zoe',

+  'Zosima'

+];

diff --git a/lib/locales/it/name/first_name.js b/lib/locales/it/name/first_name.js
index 5583062e..8a5469e2 100644
--- a/lib/locales/it/name/first_name.js
+++ b/lib/locales/it/name/first_name.js
@@ -1,364 +1,1702 @@
 module["exports"] = [
-  "Aaron",
-  "Akira",
-  "Alberto",
-  "Alessandro",
-  "Alighieri",
-  "Amedeo",
-  "Amos",
-  "Anselmo",
-  "Antonino",
-  "Arcibaldo",
-  "Armando",
-  "Artes",
-  "Audenico",
-  "Ausonio",
-  "Bacchisio",
-  "Battista",
-  "Bernardo",
-  "Boris",
-  "Caio",
-  "Carlo",
-  "Cecco",
-  "Cirino",
-  "Cleros",
-  "Costantino",
-  "Damiano",
-  "Danny",
-  "Davide",
-  "Demian",
-  "Dimitri",
-  "Domingo",
-  "Dylan",
-  "Edilio",
-  "Egidio",
-  "Elio",
-  "Emanuel",
-  "Enrico",
-  "Ercole",
-  "Ermes",
-  "Ethan",
-  "Eusebio",
-  "Evangelista",
-  "Fabiano",
-  "Ferdinando",
-  "Fiorentino",
-  "Flavio",
-  "Fulvio",
-  "Gabriele",
-  "Gastone",
-  "Germano",
-  "Giacinto",
-  "Gianantonio",
-  "Gianleonardo",
-  "Gianmarco",
-  "Gianriccardo",
-  "Gioacchino",
-  "Giordano",
-  "Giuliano",
-  "Graziano",
-  "Guido",
-  "Harry",
-  "Iacopo",
-  "Ilario",
-  "Ione",
-  "Italo",
-  "Jack",
-  "Jari",
-  "Joey",
-  "Joseph",
-  "Kai",
-  "Kociss",
-  "Laerte",
-  "Lauro",
-  "Leonardo",
-  "Liborio",
-  "Lorenzo",
-  "Ludovico",
-  "Maggiore",
-  "Manuele",
-  "Mariano",
-  "Marvin",
-  "Matteo",
-  "Mauro",
-  "Michael",
-  "Mirco",
-  "Modesto",
-  "Muzio",
-  "Nabil",
-  "Nathan",
-  "Nick",
-  "Noah",
-  "Odino",
-  "Olo",
-  "Oreste",
-  "Osea",
-  "Pablo",
-  "Patrizio",
-  "Piererminio",
-  "Pierfrancesco",
-  "Piersilvio",
-  "Priamo",
-  "Quarto",
-  "Quirino",
-  "Radames",
-  "Raniero",
-  "Renato",
-  "Rocco",
-  "Romeo",
-  "Rosalino",
-  "Rudy",
-  "Sabatino",
-  "Samuel",
-  "Santo",
-  "Sebastian",
-  "Serse",
-  "Silvano",
-  "Sirio",
-  "Tancredi",
-  "Terzo",
-  "Timoteo",
-  "Tolomeo",
-  "Trevis",
-  "Ubaldo",
-  "Ulrico",
-  "Valdo",
-  "Neri",
-  "Vinicio",
-  "Walter",
-  "Xavier",
-  "Yago",
-  "Zaccaria",
-  "Abramo",
-  "Adriano",
-  "Alan",
-  "Albino",
-  "Alessio",
-  "Alighiero",
-  "Amerigo",
-  "Anastasio",
-  "Antimo",
-  "Antonio",
-  "Arduino",
-  "Aroldo",
-  "Arturo",
-  "Augusto",
-  "Avide",
-  "Baldassarre",
-  "Bettino",
-  "Bortolo",
-  "Caligola",
-  "Carmelo",
-  "Celeste",
-  "Ciro",
-  "Costanzo",
-  "Dante",
-  "Danthon",
-  "Davis",
-  "Demis",
-  "Dindo",
-  "Domiziano",
-  "Edipo",
-  "Egisto",
-  "Eliziario",
-  "Emidio",
-  "Enzo",
-  "Eriberto",
-  "Erminio",
-  "Ettore",
-  "Eustachio",
-  "Fabio",
-  "Fernando",
-  "Fiorenzo",
-  "Folco",
-  "Furio",
-  "Gaetano",
-  "Gavino",
-  "Gerlando",
-  "Giacobbe",
-  "Giancarlo",
-  "Gianmaria",
-  "Giobbe",
-  "Giorgio",
-  "Giulio",
-  "Gregorio",
-  "Hector",
-  "Ian",
-  "Ippolito",
-  "Ivano",
-  "Jacopo",
-  "Jarno",
-  "Joannes",
-  "Joshua",
-  "Karim",
-  "Kris",
-  "Lamberto",
-  "Lazzaro",
-  "Leone",
-  "Lino",
-  "Loris",
-  "Luigi",
-  "Manfredi",
-  "Marco",
-  "Marino",
-  "Marzio",
-  "Mattia",
-  "Max",
-  "Michele",
-  "Mirko",
-  "Moreno",
-  "Nadir",
-  "Nazzareno",
-  "Nestore",
-  "Nico",
-  "Noel",
-  "Odone",
-  "Omar",
-  "Orfeo",
-  "Osvaldo",
-  "Pacifico",
-  "Pericle",
-  "Pietro",
-  "Primo",
-  "Quasimodo",
-  "Radio",
-  "Raoul",
-  "Renzo",
-  "Rodolfo",
-  "Romolo",
-  "Rosolino",
-  "Rufo",
-  "Sabino",
-  "Sandro",
-  "Sasha",
-  "Secondo",
-  "Sesto",
-  "Silverio",
-  "Siro",
-  "Tazio",
-  "Teseo",
-  "Timothy",
-  "Tommaso",
-  "Tristano",
-  "Umberto",
-  "Ariel",
-  "Artemide",
-  "Assia",
-  "Azue",
-  "Benedetta",
-  "Bibiana",
-  "Brigitta",
-  "Carmela",
-  "Cassiopea",
-  "Cesidia",
-  "Cira",
-  "Clea",
-  "Cleopatra",
-  "Clodovea",
-  "Concetta",
-  "Cosetta",
-  "Cristyn",
-  "Damiana",
-  "Danuta",
-  "Deborah",
-  "Demi",
-  "Diamante",
-  "Diana",
-  "Donatella",
-  "Doriana",
-  "Edvige",
-  "Elda",
-  "Elga",
-  "Elsa",
-  "Emilia",
-  "Enrica",
-  "Erminia",
-  "Eufemia",
-  "Evita",
-  "Fatima",
-  "Felicia",
-  "Filomena",
-  "Flaviana",
-  "Fortunata",
-  "Gelsomina",
-  "Genziana",
-  "Giacinta",
-  "Gilda",
-  "Giovanna",
-  "Giulietta",
-  "Grazia",
-  "Guendalina",
-  "Helga",
-  "Ileana",
-  "Ingrid",
-  "Irene",
-  "Isabel",
-  "Isira",
-  "Ivonne",
-  "Jelena",
-  "Jole",
-  "Claudia",
-  "Kayla",
-  "Kristel",
-  "Laura",
-  "Lucia",
-  "Lia",
-  "Lidia",
-  "Lisa",
-  "Loredana",
-  "Loretta",
-  "Luce",
-  "Lucrezia",
-  "Luna",
-  "Maika",
-  "Marcella",
-  "Maria",
-  "Mariagiulia",
-  "Marianita",
-  "Mariapia",
-  "Marieva",
-  "Marina",
-  "Maristella",
-  "Maruska",
-  "Matilde",
-  "Mecren",
-  "Mercedes",
-  "Mietta",
-  "Miriana",
-  "Miriam",
-  "Monia",
-  "Morgana",
-  "Naomi",
-  "Nayade",
-  "Nicoletta",
-  "Ninfa",
-  "Noemi",
-  "Nunzia",
-  "Olimpia",
-  "Oretta",
-  "Ortensia",
-  "Penelope",
-  "Piccarda",
-  "Prisca",
-  "Rebecca",
-  "Rita",
-  "Rosalba",
-  "Rosaria",
-  "Rosita",
-  "Ruth",
-  "Samira",
-  "Sarita",
-  "Selvaggia",
-  "Shaira",
-  "Sibilla",
-  "Soriana",
-  "Thea",
-  "Tosca",
-  "Ursula",
-  "Vania",
-  "Vera",
-  "Vienna",
-  "Violante",
-  "Vitalba",
-  "Zelida"
+  'Abaco',
+  'Abbondanzio',
+  'Abbondio',
+  'Abdone',
+  'Abelardo',
+  'Abele',
+  'Abenzio',
+  'Abibo',
+  'Abramio',
+  'Abramo',
+  'Acacio',
+  'Acario',
+  'Accursio',
+  'Achille',
+  'Acilio',
+  'Aciscolo',
+  'Acrisio',
+  'Adalardo',
+  'Adalberto',
+  'Adalfredo',
+  'Adalgiso',
+  'Adalrico',
+  'Adamo',
+  'Addo',
+  'Adelardo',
+  'Adelberto',
+  'Adelchi',
+  'Adelfo',
+  'Adelgardo',
+  'Adelmo',
+  'Adeodato',
+  'Adolfo',
+  'Adone',
+  'Adriano',
+  'Adrione',
+  'Afro',
+  'Agabio',
+  'Agamennone',
+  'Agapito',
+  'Agazio',
+  'Agenore',
+  'Agesilao',
+  'Agostino',
+  'Agrippa',
+  'Aiace',
+  'Aidano',
+  'Aimone',
+  'Aladino',
+  'Alamanno',
+  'Alano',
+  'Alarico',
+  'Albano',
+  'Alberico',
+  'Alberto',
+  'Albino',
+  'Alboino',
+  'Albrico',
+  'Alceo',
+  'Alceste',
+  'Alcibiade',
+  'Alcide',
+  'Alcino',
+  'Aldo',
+  'Aldobrando',
+  'Aleandro',
+  'Aleardo',
+  'Aleramo',
+  'Alessandro',
+  'Alessio',
+  'Alfio',
+  'Alfonso',
+  'Alfredo',
+  'Algiso',
+  'Alighiero',
+  'Almerigo',
+  'Almiro',
+  'Aloisio',
+  'Alvaro',
+  'Alviero',
+  'Alvise',
+  'Amabile',
+  'Amadeo',
+  'Amando',
+  'Amanzio',
+  'Amaranto',
+  'Amato',
+  'Amatore',
+  'Amauri',
+  'Ambrogio',
+  'Ambrosiano',
+  'Amedeo',
+  'Amelio',
+  'Amerigo',
+  'Amico',
+  'Amilcare',
+  'Amintore',
+  'Amleto',
+  'Amone',
+  'Amore',
+  'Amos',
+  'Ampelio',
+  'Anacleto',
+  'Andrea',
+  'Angelo',
+  'Aniceto',
+  'Aniello',
+  'Annibale',
+  'Ansaldo',
+  'Anselmo',
+  'Ansovino',
+  'Antelmo',
+  'Antero',
+  'Antimo',
+  'Antino',
+  'Antioco',
+  'Antonello',
+  'Antonio',
+  'Apollinare',
+  'Apollo',
+  'Apuleio',
+  'Aquilino',
+  'Araldo',
+  'Aratone',
+  'Arcadio',
+  'Archimede',
+  'Archippo',
+  'Arcibaldo',
+  'Ardito',
+  'Arduino',
+  'Aresio',
+  'Argimiro',
+  'Argo',
+  'Arialdo',
+  'Ariberto',
+  'Ariele',
+  'Ariosto',
+  'Aris',
+  'Aristarco',
+  'Aristeo',
+  'Aristide',
+  'Aristione',
+  'Aristo',
+  'Aristofane',
+  'Aristotele',
+  'Armando',
+  'Arminio',
+  'Arnaldo',
+  'Aronne',
+  'Arrigo',
+  'Arturo',
+  'Ascanio',
+  'Asdrubale',
+  'Asimodeo',
+  'Assunto',
+  'Asterio',
+  'Astianatte',
+  'Ataleo',
+  'Atanasio',
+  'Athos',
+  'Attila',
+  'Attilano',
+  'Attilio',
+  'Auberto',
+  'Audace',
+  'Augusto',
+  'Aureliano',
+  'Aurelio',
+  'Auro',
+  'Ausilio',
+  'Averardo',
+  'Azeglio',
+  'Azelio',
+  'Bacco',
+  'Baldassarre',
+  'Balderico',
+  'Baldo',
+  'Baldomero',
+  'Baldovino',
+  'Barbarigo',
+  'Bardo',
+  'Bardomiano',
+  'Barnaba',
+  'Barsaba',
+  'Barsimeo',
+  'Bartolo',
+  'Bartolomeo',
+  'Basileo',
+  'Basilio',
+  'Bassiano',
+  'Bastiano',
+  'Battista',
+  'Beato',
+  'Bellino',
+  'Beltramo',
+  'Benedetto',
+  'Beniamino',
+  'Benigno',
+  'Benito',
+  'Benvenuto',
+  'Berardo',
+  'Berengario',
+  'Bernardo',
+  'Beronico',
+  'Bertoldo',
+  'Bertolfo',
+  'Biagio',
+  'Bibiano',
+  'Bindo',
+  'Bino',
+  'Birino',
+  'Bonagiunta',
+  'Bonaldo',
+  'Bonaventura',
+  'Bonavita',
+  'Bonifacio',
+  'Bonito',
+  'Boris',
+  'Bortolo',
+  'Brancaleone',
+  'Brando',
+  'Bruno',
+  'Bruto',
+  'Caino',
+  'Caio',
+  'Calanico',
+  'Calcedonio',
+  'Callisto',
+  'Calogero',
+  'Camillo',
+  'Candido',
+  'Cantidio',
+  'Canziano',
+  'Carlo',
+  'Carmelo',
+  'Carmine',
+  'Caronte',
+  'Carponio',
+  'Casimiro',
+  'Cassiano',
+  'Cassio',
+  'Casto',
+  'Cataldo',
+  'Catullo',
+  'Cecco',
+  'Cecilio',
+  'Celso',
+  'Cesare',
+  'Cesario',
+  'Cherubino',
+  'Chiaffredo',
+  'Cino',
+  'Cipriano',
+  'Cirano',
+  'Ciriaco',
+  'Cirillo',
+  'Cirino',
+  'Ciro',
+  'Clarenzio',
+  'Claudio',
+  'Cleandro',
+  'Clemente',
+  'Cleonico',
+  'Climaco',
+  'Clinio',
+  'Clodomiro',
+  'Clodoveo',
+  'Colmanno',
+  'Colmazio',
+  'Colombano',
+  'Colombo',
+  'Concetto',
+  'Concordio',
+  'Corbiniano',
+  'Coreno',
+  'Coriolano',
+  'Cornelio',
+  'Coronato',
+  'Corrado',
+  'Cosimo',
+  'Cosma',
+  'Costante',
+  'Costantino',
+  'Costanzo',
+  'Cremenzio',
+  'Crescente',
+  'Crescenzio',
+  'Crespignano',
+  'Crispino',
+  'Cristaldo',
+  'Cristiano',
+  'Cristoforo',
+  'Crocefisso',
+  'Cuniberto',
+  'Cupido',
+  'Daciano',
+  'Dacio',
+  'Dagoberto',
+  'Dalmazio',
+  'Damaso',
+  'Damiano',
+  'Damocle',
+  'Daniele',
+  'Danilo',
+  'Danio',
+  'Dante',
+  'Dario',
+  'Davide',
+  'Davino',
+  'Decimo',
+  'Delfino',
+  'Demetrio',
+  'Democrito',
+  'Demostene',
+  'Deodato',
+  'Desiderato',
+  'Desiderio',
+  'Didimo',
+  'Diego',
+  'Dino',
+  'Diocleziano',
+  'Diodoro',
+  'Diogene',
+  'Diomede',
+  'Dione',
+  'Dionigi',
+  'Dionisio',
+  'Divo',
+  'Dodato',
+  'Domenico',
+  'Domezio',
+  'Domiziano',
+  'Donatello',
+  'Donato',
+  'Doriano',
+  'Doroteo',
+  'Duccio',
+  'Duilio',
+  'Durante',
+  'Eberardo',
+  'Ecclesio',
+  'Edgardo',
+  'Edilberto',
+  'Edmondo',
+  'Edoardo',
+  'Efisio',
+  'Efrem',
+  'Egeo',
+  'Egidio',
+  'Eginardo',
+  'Egisto',
+  'Eleuterio',
+  'Elia',
+  'Eliano',
+  'Elifio',
+  'Eligio',
+  'Elio',
+  'Eliodoro',
+  'Eliseo',
+  'Elita',
+  'Elmo',
+  'Elogio',
+  'Elpidio',
+  'Elvezio',
+  'Elvino',
+  'Emanuele',
+  'Emidio',
+  'Emiliano',
+  'Emilio',
+  'Emmerico',
+  'Empirio',
+  'Endrigo',
+  'Enea',
+  'Enecone',
+  'Ennio',
+  'Enrico',
+  'Enzo',
+  'Eraclide',
+  'Eraldo',
+  'Erardo',
+  'Erasmo',
+  'Erberto',
+  'Ercolano',
+  'Ercole',
+  'Erenia',
+  'Eriberto',
+  'Erico',
+  'Ermanno',
+  'Ermenegildo',
+  'Ermes',
+  'Ermete',
+  'Ermilo',
+  'Erminio',
+  'Ernesto',
+  'Eros',
+  'Esa�',
+  'Esuperio',
+  'Eterie',
+  'Ettore',
+  'Euclide',
+  'Eufebio',
+  'Eufemio',
+  'Eufronio',
+  'Eugenio',
+  'Eusebio',
+  'Euseo',
+  'Eustorgio',
+  'Eustosio',
+  'Eutalio',
+  'Evaldo',
+  'Evandro',
+  'Evaristo',
+  'Evasio',
+  'Everardo',
+  'Evidio',
+  'Evodio',
+  'Evremondo',
+  'Ezechiele',
+  'Ezio',
+  'Fabiano',
+  'Fabio',
+  'Fabrizio',
+  'Famiano',
+  'Fausto',
+  'Fazio',
+  'Fedele',
+  'Federico',
+  'Fedro',
+  'Felice',
+  'Feliciano',
+  'Ferdinando',
+  'Fermiano',
+  'Fermo',
+  'Fernando',
+  'Ferruccio',
+  'Festo',
+  'Fidenziano',
+  'Fidenzio',
+  'Filiberto',
+  'Filippo',
+  'Filomeno',
+  'Fiorenziano',
+  'Fiorenzo',
+  'Flaviano',
+  'Flavio',
+  'Fleano',
+  'Floriano',
+  'Folco',
+  'Fortunato',
+  'Fosco',
+  'Francesco',
+  'Franco',
+  'Frido',
+  'Frontiniano',
+  'Fulberto',
+  'Fulgenzio',
+  'Fulvio',
+  'Furio',
+  'Furseo',
+  'Fuscolo',
+  'Gabino',
+  'Gabriele',
+  'Gaetano',
+  'Gaglioffo',
+  'Gaio',
+  'Galdino',
+  'Galeazzo',
+  'Galileo',
+  'Gallicano',
+  'Gandolfo',
+  'Garimberto',
+  'Gaspare',
+  'Gastone',
+  'Gaudenzio',
+  'Gaudino',
+  'Gautiero',
+  'Gavino',
+  'Gedeone',
+  'Geminiano',
+  'Generoso',
+  'Genesio',
+  'Gennaro',
+  'Gentile',
+  'Genziano',
+  'Gerardo',
+  'Gerasimo',
+  'Geremia',
+  'Gerino',
+  'Germano',
+  'Gerolamo',
+  'Geronimo',
+  'Geronzio',
+  'Gervasio',
+  'Gesualdo',
+  'Gherardo',
+  'Giacinto',
+  'Giacobbe',
+  'Giacomo',
+  'Giadero',
+  'Giambattista',
+  'Gianbattista',
+  'Giancarlo',
+  'Giandomenico',
+  'Gianfranco',
+  'Gianluca',
+  'Gianluigi',
+  'Gianmarco',
+  'Gianmaria',
+  'Gianmario',
+  'Gianni',
+  'Gianpaolo',
+  'Gianpiero',
+  'Gianpietro',
+  'Gianuario',
+  'Giasone',
+  'Gilberto',
+  'Gildo',
+  'Gillo',
+  'Gineto',
+  'Gino',
+  'Gioacchino',
+  'Giobbe',
+  'Gioberto',
+  'Giocondo',
+  'Gioele',
+  'Giona',
+  'Gionata',
+  'Giordano',
+  'Giorgio',
+  'Giosu�',
+  'Giosuele',
+  'Giotto',
+  'Giovanni',
+  'Giove',
+  'Gioventino',
+  'Giovenzio',
+  'Girardo',
+  'Girolamo',
+  'Giuda',
+  'Giuliano',
+  'Giulio',
+  'Giuseppe',
+  'Giustiniano',
+  'Giusto',
+  'Glauco',
+  'Goffredo',
+  'Golia',
+  'Gomberto',
+  'Gondulfo',
+  'Gonerio',
+  'Gonzaga',
+  'Gordiano',
+  'Gosto',
+  'Gottardo',
+  'Graciliano',
+  'Grato',
+  'Graziano',
+  'Gregorio',
+  'Grimaldo',
+  'Gualberto',
+  'Gualtiero',
+  'Guelfo',
+  'Guerrino',
+  'Guglielmo',
+  'Guiberto',
+  'Guido',
+  'Guiscardo',
+  'Gumesindo',
+  'Gustavo',
+  'Iacopo',
+  'Iacopone',
+  'Iago',
+  'Icaro',
+  'Icilio',
+  'Ido',
+  'Iginio',
+  'Igino',
+  'Ignazio',
+  'Igor',
+  'Ilario',
+  'Ildebrando',
+  'Ildefonso',
+  'Illidio',
+  'Illuminato',
+  'Immacolato',
+  'Indro',
+  'Innocente',
+  'Innocenzo',
+  'Iorio',
+  'Ippocrate',
+  'Ippolito',
+  'Ireneo',
+  'Isacco',
+  'Isaia',
+  'Ischirione',
+  'Isidoro',
+  'Ismaele',
+  'Italo',
+  'Ivan',
+  'Ivano',
+  'Ivanoe',
+  'Ivo',
+  'Ivone',
+  'Ladislao',
+  'Lamberto',
+  'Lancilotto',
+  'Landolfo',
+  'Lanfranco',
+  'Lapo',
+  'Laurentino',
+  'Lauriano',
+  'Lautone',
+  'Lavinio',
+  'Lazzaro',
+  'Leandro',
+  'Leo',
+  'Leonardo',
+  'Leone',
+  'Leonida',
+  'Leonio',
+  'Leonzio',
+  'Leopardo',
+  'Leopoldo',
+  'Letterio',
+  'Liberato',
+  'Liberatore',
+  'Liberio',
+  'Libero',
+  'Liberto',
+  'Liborio',
+  'Lidio',
+  'Lieto',
+  'Lino',
+  'Lisandro',
+  'Livino',
+  'Livio',
+  'Lodovico',
+  'Loreno',
+  'Lorenzo',
+  'Loris',
+  'Luca',
+  'Luciano',
+  'Lucio',
+  'Ludano',
+  'Ludovico',
+  'Luigi',
+  'Macario',
+  'Maccabeo',
+  'Maffeo',
+  'Maggiorino',
+  'Magno',
+  'Maiorico',
+  'Malco',
+  'Mamante',
+  'Mancio',
+  'Manetto',
+  'Manfredo',
+  'Manilio',
+  'Manlio',
+  'Mansueto',
+  'Manuele',
+  'Marcello',
+  'Marciano',
+  'Marco',
+  'Mariano',
+  'Marino',
+  'Mario',
+  'Marolo',
+  'Martino',
+  'Marzio',
+  'Massimiliano',
+  'Massimo',
+  'Matroniano',
+  'Matteo',
+  'Mattia',
+  'Maurilio',
+  'Maurizio',
+  'Mauro',
+  'Medardo',
+  'Medoro',
+  'Melanio',
+  'Melchiade',
+  'Melchiorre',
+  'Melezio',
+  'Menardo',
+  'Menelao',
+  'Meneo',
+  'Mennone',
+  'Mercurio',
+  'Metello',
+  'Metrofane',
+  'Michelangelo',
+  'Michele',
+  'Milo',
+  'Minervino',
+  'Mirco',
+  'Mirko',
+  'Mirocleto',
+  'Misaele',
+  'Modesto',
+  'Monaldo',
+  'Monitore',
+  'Moreno',
+  'Mos�',
+  'Muziano',
+  'Namazio',
+  'Napoleone',
+  'Narciso',
+  'Narseo',
+  'Narsete',
+  'Natale',
+  'Nazario',
+  'Nazzareno',
+  'Nazzaro',
+  'Neopolo',
+  'Neoterio',
+  'Nereo',
+  'Neri',
+  'Nestore',
+  'Nicarete',
+  'Nicea',
+  'Niceforo',
+  'Niceto',
+  'Nicezio',
+  'Nico',
+  'Nicodemo',
+  'Nicola',
+  'Nicol�',
+  'Niniano',
+  'Nino',
+  'No�',
+  'Norberto',
+  'Nostriano',
+  'Nunzio',
+  'Oddone',
+  'Oderico',
+  'Odidone',
+  'Odorico',
+  'Olimpio',
+  'Olindo',
+  'Oliviero',
+  'Omar',
+  'Omero',
+  'Onesto',
+  'Onofrio',
+  'Onorino',
+  'Onorio',
+  'Orazio',
+  'Orenzio',
+  'Oreste',
+  'Orfeo',
+  'Orio',
+  'Orlando',
+  'Oronzo',
+  'Orsino',
+  'Orso',
+  'Ortensio',
+  'Oscar',
+  'Osmondo',
+  'Osvaldo',
+  'Otello',
+  'Ottaviano',
+  'Ottavio',
+  'Ottone',
+  'Ovidio',
+  'Paciano',
+  'Pacifico',
+  'Pacomio',
+  'Palatino',
+  'Palladio',
+  'Pammachio',
+  'Pancario',
+  'Pancrazio',
+  'Panfilo',
+  'Pantaleo',
+  'Pantaleone',
+  'Paolo',
+  'Pardo',
+  'Paride',
+  'Parmenio',
+  'Pasquale',
+  'Paterniano',
+  'Patrizio',
+  'Patroclo',
+  'Pauside',
+  'Peleo',
+  'Pellegrino',
+  'Pericle',
+  'Perseo',
+  'Petronio',
+  'Pierangelo',
+  'Piergiorgio',
+  'Pierluigi',
+  'Piermarco',
+  'Piero',
+  'Piersilvio',
+  'Pietro',
+  'Pio',
+  'Pippo',
+  'Placido',
+  'Platone',
+  'Plinio',
+  'Plutarco',
+  'Polidoro',
+  'Polifemo',
+  'Pollione',
+  'Pompeo',
+  'Pomponio',
+  'Ponziano',
+  'Ponzio',
+  'Porfirio',
+  'Porziano',
+  'Postumio',
+  'Prassede',
+  'Priamo',
+  'Primo',
+  'Prisco',
+  'Privato',
+  'Procopio',
+  'Prospero',
+  'Protasio',
+  'Proteo',
+  'Prudenzio',
+  'Publio',
+  'Pupolo',
+  'Pusicio',
+  'Quarto',
+  'Quasimodo',
+  'Querano',
+  'Quintiliano',
+  'Quintilio',
+  'Quintino',
+  'Quinziano',
+  'Quinzio',
+  'Quirino',
+  'Radolfo',
+  'Raffaele',
+  'Raide',
+  'Raimondo',
+  'Rainaldo',
+  'Ramiro',
+  'Raniero',
+  'Ranolfo',
+  'Reginaldo',
+  'Regolo',
+  'Remigio',
+  'Remo',
+  'Remondo',
+  'Renato',
+  'Renzo',
+  'Respicio',
+  'Ricario',
+  'Riccardo',
+  'Richelmo',
+  'Rinaldo',
+  'Rino',
+  'Robaldo',
+  'Roberto',
+  'Rocco',
+  'Rodiano',
+  'Rodolfo',
+  'Rodrigo',
+  'Rolando',
+  'Rolfo',
+  'Romano',
+  'Romeo',
+  'Romero',
+  'Romoaldo',
+  'Romolo',
+  'Romualdo',
+  'Rosario',
+  'Rubiano',
+  'Rufino',
+  'Rufo',
+  'Ruggero',
+  'Ruperto',
+  'Rutilo',
+  'Sabato',
+  'Sabazio',
+  'Sabele',
+  'Sabino',
+  'Saffiro',
+  'Saffo',
+  'Saladino',
+  'Salom�',
+  'Salomone',
+  'Salustio',
+  'Salvatore',
+  'Salvo',
+  'Samuele',
+  'Sandro',
+  'Sansone',
+  'Sante',
+  'Santo',
+  'Sapiente',
+  'Sarbello',
+  'Saturniano',
+  'Saturnino',
+  'Saul',
+  'Saverio',
+  'Savino',
+  'Sebastiano',
+  'Secondiano',
+  'Secondo',
+  'Semplicio',
+  'Sempronio',
+  'Senesio',
+  'Senofonte',
+  'Serafino',
+  'Serapione',
+  'Sergio',
+  'Servidio',
+  'Serviliano',
+  'Sesto',
+  'Settimio',
+  'Settimo',
+  'Severiano',
+  'Severino',
+  'Severo',
+  'Sico',
+  'Sicuro',
+  'Sidonio',
+  'Sigfrido',
+  'Sigismondo',
+  'Silvano',
+  'Silverio',
+  'Silvestro',
+  'Silvio',
+  'Simeone',
+  'Simone',
+  'Sinesio',
+  'Sinfronio',
+  'Sireno',
+  'Siriano',
+  'Siricio',
+  'Sirio',
+  'Siro',
+  'Sisto',
+  'Soccorso',
+  'Socrate',
+  'Solocone',
+  'Sostene',
+  'Sosteneo',
+  'Sostrato',
+  'Spano',
+  'Spartaco',
+  'Speranzio',
+  'Stanislao',
+  'Stefano',
+  'Stiliano',
+  'Stiriaco',
+  'Surano',
+  'Sviturno',
+  'Taddeo',
+  'Taide',
+  'Tammaro',
+  'Tancredi',
+  'Tarcisio',
+  'Tarso',
+  'Taziano',
+  'Tazio',
+  'Telchide',
+  'Telemaco',
+  'Temistocle',
+  'Teobaldo',
+  'Teodoro',
+  'Teodosio',
+  'Teodoto',
+  'Teogene',
+  'Terenzio',
+  'Terzo',
+  'Tesauro',
+  'Tesifonte',
+  'Tibaldo',
+  'Tiberio',
+  'Tiburzio',
+  'Ticone',
+  'Timoteo',
+  'Tirone',
+  'Tito',
+  'Tiziano',
+  'Tizio',
+  'Tobia',
+  'Tolomeo',
+  'Tommaso',
+  'Torquato',
+  'Tosco',
+  'Tranquillo',
+  'Tristano',
+  'Tulliano',
+  'Tullio',
+  'Turi',
+  'Turibio',
+  'Tussio',
+  'Ubaldo',
+  'Ubertino',
+  'Uberto',
+  'Ugo',
+  'Ugolino',
+  'Uguccione',
+  'Ulberto',
+  'Ulderico',
+  'Ulfo',
+  'Ulisse',
+  'Ulpiano',
+  'Ulrico',
+  'Ulstano',
+  'Ultimo',
+  'Umberto',
+  'Umile',
+  'Uranio',
+  'Urbano',
+  'Urdino',
+  'Uriele',
+  'Ursicio',
+  'Ursino',
+  'Ursmaro',
+  'Valente',
+  'Valentino',
+  'Valeriano',
+  'Valerico',
+  'Valerio',
+  'Valfredo',
+  'Valfrido',
+  'Valtena',
+  'Valter',
+  'Varo',
+  'Vasco',
+  'Vedasto',
+  'Velio',
+  'Venanzio',
+  'Venceslao',
+  'Venerando',
+  'Venerio',
+  'Ventura',
+  'Venustiano',
+  'Venusto',
+  'Verano',
+  'Verecondo',
+  'Verenzio',
+  'Verulo',
+  'Vespasiano',
+  'Vezio',
+  'Vidiano',
+  'Vidone',
+  'Vilfredo',
+  'Viliberto',
+  'Vincenzo',
+  'Vindonio',
+  'Vinebaldo',
+  'Vinfrido',
+  'Vinicio',
+  'Virgilio',
+  'Virginio',
+  'Virone',
+  'Viscardo',
+  'Vitale',
+  'Vitalico',
+  'Vito',
+  'Vittore',
+  'Vittoriano',
+  'Vittorio',
+  'Vivaldo',
+  'Viviano',
+  'Vladimiro',
+  'Vodingo',
+  'Volfango',
+  'Vulmaro',
+  'Vulpiano',
+  'Walter',
+  'Zabedeo',
+  'Zaccaria',
+  'Zaccheo',
+  'Zanobi',
+  'Zefiro',
+  'Zena',
+  'Zenaide',
+  'Zenebio',
+  'Zeno',
+  'Zenobio',
+  'Zenone',
+  'Zetico',
+  'Zoilo',
+  'Zosimo',
+  'Abbondanza',
+  'Acilia',
+  'Ada',
+  'Adalberta',
+  'Adalgisa',
+  'Addolorata',
+  'Adelaide',
+  'Adelasia',
+  'Adele',
+  'Adelina',
+  'Adina',
+  'Adria',
+  'Adriana',
+  'Agape',
+  'Agata',
+  'Agnese',
+  'Agostina',
+  'Aida',
+  'Alba',
+  'Alberta',
+  'Albina',
+  'Alcina',
+  'Alda',
+  'Alessandra',
+  'Alessia',
+  'Alfonsa',
+  'Alfreda',
+  'Alice',
+  'Alida',
+  'Alina',
+  'Allegra',
+  'Alma',
+  'Altea',
+  'Amalia',
+  'Amanda',
+  'Amata',
+  'Ambra',
+  'Amelia',
+  'Amina',
+  'Anastasia',
+  'Anatolia',
+  'Ancilla',
+  'Andromeda',
+  'Angela',
+  'Angelica',
+  'Anita',
+  'Anna',
+  'Annabella',
+  'Annagrazia',
+  'Annamaria',
+  'Annunziata',
+  'Antea',
+  'Antigone',
+  'Antonella',
+  'Antonia',
+  'Apollina',
+  'Apollonia',
+  'Appia',
+  'Arabella',
+  'Argelia',
+  'Arianna',
+  'Armida',
+  'Artemisa',
+  'Asella',
+  'Asia',
+  'Assunta',
+  'Astrid',
+  'Atanasia',
+  'Aurelia',
+  'Aurora',
+  'Ausilia',
+  'Ausiliatrice',
+  'Ave',
+  'Aza',
+  'Azelia',
+  'Azzurra',
+  'Babila',
+  'Bambina',
+  'Barbara',
+  'Bartolomea',
+  'Basilia',
+  'Bassilla',
+  'Batilda',
+  'Beata',
+  'Beatrice',
+  'Belina',
+  'Benedetta',
+  'Beniamina',
+  'Benigna',
+  'Benvenuta',
+  'Berenice',
+  'Bernadetta',
+  'Betta',
+  'Bianca',
+  'Bibiana',
+  'Bice',
+  'Brigida',
+  'Brigitta',
+  'Bruna',
+  'Brunilde',
+  'Calogera',
+  'Calpurnia',
+  'Camelia',
+  'Camilla',
+  'Candida',
+  'Capitolina',
+  'Carina',
+  'Carla',
+  'Carlotta',
+  'Carmela',
+  'Carmen',
+  'Carola',
+  'Carolina',
+  'Casilda',
+  'Casimira',
+  'Cassandra',
+  'Cassiopea',
+  'Catena',
+  'Caterina',
+  'Cecilia',
+  'Celeste',
+  'Celinia',
+  'Chiara',
+  'Cinzia',
+  'Cirilla',
+  'Clara',
+  'Claudia',
+  'Clelia',
+  'Clemenzia',
+  'Cleo',
+  'Cleofe',
+  'Cleopatra',
+  'Cloe',
+  'Clorinda',
+  'Cointa',
+  'Colomba',
+  'Concetta',
+  'Consolata',
+  'Cora',
+  'Cordelia',
+  'Corinna',
+  'Cornelia',
+  'Cosima',
+  'Costanza',
+  'Crescenzia',
+  'Cristiana',
+  'Cristina',
+  'Crocefissa',
+  'Cronida',
+  'Cunegonda',
+  'Cuzia',
+  'Dafne',
+  'Dalida',
+  'Dalila',
+  'Damiana',
+  'Daniela',
+  'Daria',
+  'Deanna',
+  'Debora',
+  'Degna',
+  'Delfina',
+  'Delia',
+  'Delinda',
+  'Delizia',
+  'Demetria',
+  'Deodata',
+  'Desdemona',
+  'Desiderata',
+  'Devota',
+  'Diamante',
+  'Diana',
+  'Dianora',
+  'Diletta',
+  'Dina',
+  'Diodata',
+  'Dionisia',
+  'Doda',
+  'Dolores',
+  'Domenica',
+  'Donata',
+  'Donatella',
+  'Donna',
+  'Dora',
+  'Dorotea',
+  'Druina',
+  'Dulina',
+  'Ebe',
+  'Edda',
+  'Edelberga',
+  'Editta',
+  'Edvige',
+  'Egizia',
+  'Egle',
+  'Elaide',
+  'Elda',
+  'Elena',
+  'Eleonora',
+  'Elettra',
+  'Eliana',
+  'Elide',
+  'Elimena',
+  'Elisa',
+  'Elisabetta',
+  'Elisea',
+  'Ella',
+  'Eloisa',
+  'Elsa',
+  'Elvia',
+  'Elvira',
+  'Emanuela',
+  'Emilia',
+  'Emiliana',
+  'Emma',
+  'Enimia',
+  'Enrica',
+  'Eracla',
+  'Ermelinda',
+  'Ermenegarda',
+  'Ermenegilda',
+  'Erminia',
+  'Ernesta',
+  'Ersilia',
+  'Esmeralda',
+  'Estella',
+  'Ester',
+  'Esterina',
+  'Eufemia',
+  'Eufrasia',
+  'Eugenia',
+  'Eulalia',
+  'Euridice',
+  'Eusebia',
+  'Eutalia',
+  'Eva',
+  'Evangelina',
+  'Evelina',
+  'Fabiana',
+  'Fabiola',
+  'Fatima',
+  'Fausta',
+  'Federica',
+  'Fedora',
+  'Felicia',
+  'Felicita',
+  'Fernanda',
+  'Fiammetta',
+  'Filippa',
+  'Filomena',
+  'Fiordaliso',
+  'Fiore',
+  'Fiorella',
+  'Fiorenza',
+  'Flaminia',
+  'Flavia',
+  'Flaviana',
+  'Flora',
+  'Floriana',
+  'Floridia',
+  'Florina',
+  'Foca',
+  'Fortunata',
+  'Fosca',
+  'Franca',
+  'Francesca',
+  'Fulvia',
+  'Gabriella',
+  'Gaia',
+  'Galatea',
+  'Gaudenzia',
+  'Gelsomina',
+  'Geltrude',
+  'Gemma',
+  'Generosa',
+  'Genesia',
+  'Genoveffa',
+  'Germana',
+  'Gertrude',
+  'Ghita',
+  'Giacinta',
+  'Giada',
+  'Gigliola',
+  'Gilda',
+  'Giliola',
+  'Ginevra',
+  'Gioacchina',
+  'Gioconda',
+  'Gioia',
+  'Giorgia',
+  'Giovanna',
+  'Gisella',
+  'Giuditta',
+  'Giulia',
+  'Giuliana',
+  'Giulitta',
+  'Giuseppa',
+  'Giuseppina',
+  'Giusta',
+  'Glenda',
+  'Gloria',
+  'Godeberta',
+  'Godiva',
+  'Grazia',
+  'Graziana',
+  'Graziella',
+  'Greta',
+  'Griselda',
+  'Guenda',
+  'Guendalina',
+  'Gundelinda',
+  'Ianira',
+  'Ida',
+  'Idea',
+  'Iginia',
+  'Ilaria',
+  'Ilda',
+  'Ildegarda',
+  'Ildegonda',
+  'Ileana',
+  'Ilenia',
+  'Ilia',
+  'Ilva',
+  'Imelda',
+  'Immacolata',
+  'Incoronata',
+  'Ines',
+  'Innocenza',
+  'Iolanda',
+  'Iole',
+  'Iona',
+  'Ione',
+  'Ionne',
+  'Irene',
+  'Iride',
+  'Iris',
+  'Irma',
+  'Irmina',
+  'Isa',
+  'Isabella',
+  'Iside',
+  'Isidora',
+  'Isotta',
+  'Italia',
+  'Ivetta',
+  'Lara',
+  'Laura',
+  'Lavinia',
+  'Lea',
+  'Leda',
+  'Lelia',
+  'Lena',
+  'Leonia',
+  'Leonilda',
+  'Leontina',
+  'Letizia',
+  'Lia',
+  'Liana',
+  'Liberata',
+  'Liboria',
+  'Licia',
+  'Lidania',
+  'Lidia',
+  'Liliana',
+  'Linda',
+  'Lisa',
+  'Livia',
+  'Liviana',
+  'Lodovica',
+  'Loredana',
+  'Lorella',
+  'Lorena',
+  'Lorenza',
+  'Loretta',
+  'Loriana',
+  'Luana',
+  'Luce',
+  'Lucia',
+  'Luciana',
+  'Lucilla',
+  'Lucrezia',
+  'Ludovica',
+  'Luigia',
+  'Luisa',
+  'Luminosa',
+  'Luna',
+  'Macaria',
+  'Maddalena',
+  'Mafalda',
+  'Magda',
+  'Maida',
+  'Manuela',
+  'Mara',
+  'Marana',
+  'Marcella',
+  'Mareta',
+  'Margherita',
+  'Maria',
+  'Marianna',
+  'Marica',
+  'Mariella',
+  'Marilena',
+  'Marina',
+  'Marinella',
+  'Marinetta',
+  'Marisa',
+  'Marita',
+  'Marta',
+  'Martina',
+  'Maruta',
+  'Marzia',
+  'Massima',
+  'Matilde',
+  'Maura',
+  'Melania',
+  'Melissa',
+  'Melitina',
+  'Menodora',
+  'Mercede',
+  'Messalina',
+  'Mia',
+  'Michela',
+  'Milena',
+  'Mimma',
+  'Mina',
+  'Minerva',
+  'Minervina',
+  'Miranda',
+  'Mirella',
+  'Miriam',
+  'Mirta',
+  'Moira',
+  'Monica',
+  'Morena',
+  'Morgana',
+  'Nadia',
+  'Natalia',
+  'Natalina',
+  'Neiva',
+  'Nerea',
+  'Nicla',
+  'Nicoletta',
+  'Nilde',
+  'Nina',
+  'Ninfa',
+  'Nives',
+  'Noemi',
+  'Norina',
+  'Norma',
+  'Novella',
+  'Nuccia',
+  'Nunziata',
+  'Odetta',
+  'Odilia',
+  'Ofelia',
+  'Olga',
+  'Olimpia',
+  'Olinda',
+  'Olivia',
+  'Oliviera',
+  'Ombretta',
+  'Ondina',
+  'Onesta',
+  'Onorata',
+  'Onorina',
+  'Orchidea',
+  'Oriana',
+  'Orietta',
+  'Ornella',
+  'Orsola',
+  'Orsolina',
+  'Ortensia',
+  'Osanna',
+  'Otilia',
+  'Ottilia',
+  'Palladia',
+  'Palmazio',
+  'Palmira',
+  'Pamela',
+  'Paola',
+  'Patrizia',
+  'Pelagia',
+  'Penelope',
+  'Perla',
+  'Petronilla',
+  'Pia',
+  'Piera',
+  'Placida',
+  'Polissena',
+  'Porzia',
+  'Prisca',
+  'Priscilla',
+  'Proserpina',
+  'Prospera',
+  'Prudenzia',
+  'Quartilla',
+  'Quieta',
+  'Quiteria',
+  'Rachele',
+  'Raffaella',
+  'Rainelda',
+  'Rebecca',
+  'Regina',
+  'Renata',
+  'Riccarda',
+  'Rina',
+  'Rita',
+  'Roberta',
+  'Romana',
+  'Romilda',
+  'Romina',
+  'Romola',
+  'Rosa',
+  'Rosalia',
+  'Rosalinda',
+  'Rosamunda',
+  'Rosanna',
+  'Rosita',
+  'Rosmunda',
+  'Rossana',
+  'Rossella',
+  'Rufina',
+  'Saba',
+  'Sabina',
+  'Sabrina',
+  'Samanta',
+  'Samona',
+  'Sandra',
+  'Santina',
+  'Sara',
+  'Savina',
+  'Scolastica',
+  'Sebastiana',
+  'Seconda',
+  'Secondina',
+  'Sefora',
+  'Selene',
+  'Selvaggia',
+  'Semiramide',
+  'Serafina',
+  'Serena',
+  'Severa',
+  'Sibilla',
+  'Sidonia',
+  'Silvana',
+  'Silvia',
+  'Simona',
+  'Simonetta',
+  'Siria',
+  'Smeralda',
+  'Soave',
+  'Sofia',
+  'Sofronia',
+  'Solange',
+  'Sonia',
+  'Speranza',
+  'Stefania',
+  'Stella',
+  'Susanna',
+  'Sveva',
+  'Tabita',
+  'Tamara',
+  'Tarquinia',
+  'Tarsilla',
+  'Taziana',
+  'Tea',
+  'Tecla',
+  'Telica',
+  'Teodata',
+  'Teodolinda',
+  'Teodora',
+  'Teresa',
+  'Teudosia',
+  'Tina',
+  'Tiziana',
+  'Tosca',
+  'Trasea',
+  'Tullia',
+  'Ugolina',
+  'Ulfa',
+  'Uliva',
+  'Unna',
+  'Vala',
+  'Valentina',
+  'Valeria',
+  'Valeriana',
+  'Vanda',
+  'Vanessa',
+  'Vanna',
+  'Venera',
+  'Veneranda',
+  'Venere',
+  'Venusta',
+  'Vera',
+  'Verdiana',
+  'Verena',
+  'Veriana',
+  'Veridiana',
+  'Veronica',
+  'Viliana',
+  'Vilma',
+  'Vincenza',
+  'Viola',
+  'Violante',
+  'Virginia',
+  'Vissia',
+  'Vittoria',
+  'Viviana',
+  'Wanda',
+  'Zabina',
+  'Zaira',
+  'Zama',
+  'Zanita',
+  'Zarina',
+  'Zelinda',
+  'Zenobia',
+  'Zita',
+  'Zoe',
+  'Zosima'
 ];
diff --git a/lib/locales/it/name/index.js b/lib/locales/it/name/index.js
index 9161e2de..8aa8a8de 100644
--- a/lib/locales/it/name/index.js
+++ b/lib/locales/it/name/index.js
@@ -1,5 +1,7 @@
 var name = {};
 module['exports'] = name;
+name.male_first_name = require("./male_first_name");
+name.female_first_name = require("./female_first_name");
 name.first_name = require("./first_name");
 name.last_name = require("./last_name");
 name.prefix = require("./prefix");
diff --git a/lib/locales/it/name/last_name.js b/lib/locales/it/name/last_name.js
index 28f29337..07051a41 100644
--- a/lib/locales/it/name/last_name.js
+++ b/lib/locales/it/name/last_name.js
@@ -1,102 +1,637 @@
-module["exports"] = [
-  "Amato",
-  "Barbieri",
-  "Barone",
-  "Basile",
-  "Battaglia",
-  "Bellini",
-  "Benedetti",
-  "Bernardi",
-  "Bianc",
-  "Bianchi",
-  "Bruno",
-  "Caputo",
-  "Carbon",
-  "Caruso",
-  "Cattaneo",
-  "Colombo",
-  "Cont",
-  "Conte",
-  "Coppola",
-  "Costa",
-  "Costantin",
-  "D'amico",
-  "D'angelo",
-  "Damico",
-  "De Angelis",
-  "De luca",
-  "De rosa",
-  "De Santis",
-  "Donati",
-  "Esposito",
-  "Fabbri",
-  "Farin",
-  "Ferrara",
-  "Ferrari",
-  "Ferraro",
-  "Ferretti",
-  "Ferri",
-  "Fior",
-  "Fontana",
-  "Galli",
-  "Gallo",
-  "Gatti",
-  "Gentile",
-  "Giordano",
-  "Giuliani",
-  "Grassi",
-  "Grasso",
-  "Greco",
-  "Guerra",
-  "Leone",
-  "Lombardi",
-  "Lombardo",
-  "Longo",
-  "Mancini",
-  "Marchetti",
-  "Marian",
-  "Marini",
-  "Marino",
-  "Martinelli",
-  "Martini",
-  "Martino",
-  "Mazza",
-  "Messina",
-  "Milani",
-  "Montanari",
-  "Monti",
-  "Morelli",
-  "Moretti",
-  "Negri",
-  "Neri",
-  "Orlando",
-  "Pagano",
-  "Palmieri",
-  "Palumbo",
-  "Parisi",
-  "Pellegrini",
-  "Pellegrino",
-  "Piras",
-  "Ricci",
-  "Rinaldi",
-  "Riva",
-  "Rizzi",
-  "Rizzo",
-  "Romano",
-  "Ross",
-  "Rossetti",
-  "Ruggiero",
-  "Russo",
-  "Sala",
-  "Sanna",
-  "Santoro",
-  "Sartori",
-  "Serr",
-  "Silvestri",
-  "Sorrentino",
-  "Testa",
-  "Valentini",
-  "Villa",
-  "Vitale",
-  "Vitali"
+module['exports'] = [
+  'Acquadro',
+  'Acquistapace',
+  'Adami',
+  'Addis',
+  'Agostinelli',
+  'Aiello',
+  'Alaimo',
+  'Alberti',
+  'Amadori',
+  'Amato',
+  'Amerio',
+  'Amico',
+  'Andrisani',
+  'Anelli',
+  'Angelini',
+  'Angelucci',
+  'Arena',
+  'Asaro',
+  'Atzeni',
+  'Azara',
+  'Babini',
+  'Bacci',
+  'Baggio',
+  'Balboni',
+  'Baldi',
+  'Baldini',
+  'Ballarin',
+  'Bandini',
+  'Baraldi',
+  'Barbera',
+  'Barberis',
+  'Barbero',
+  'Barbieri',
+  'Barsotti',
+  'Bartolini',
+  'Bartolucci',
+  'Basile',
+  'Basso',
+  'Battaglia',
+  'Battistini',
+  'Bellini',
+  'Bellucci',
+  'Belotti',
+  'Beltrame',
+  'Beltrami',
+  'Benatti',
+  'Benedetti',
+  'Benini',
+  'Benvenuti',
+  'Beretta',
+  'Bernardini',
+  'Bernasconi',
+  'Bertini',
+  'Berto',
+  'Bertolini',
+  'Bertolussi',
+  'Betti',
+  'Biagini',
+  'Biancheri',
+  'Bianchi',
+  'Bianco',
+  'Bini',
+  'Bionaz',
+  'Bisio',
+  'Blanc',
+  'Bocchi',
+  'Bodini',
+  'Bonato',
+  'Borghi',
+  'Bortolin',
+  'Bortoluzzi',
+  'Bortot',
+  'Boscolo',
+  'Brambilla',
+  'Bresciani',
+  'Bressan',
+  'Briano',
+  'Brogi',
+  'Brumat',
+  'Bruni',
+  'Bruno',
+  'Bruzzone',
+  'Bucci',
+  'Calligaris',
+  'Cammarata',
+  'Campanini',
+  'Campisi',
+  'Campoli',
+  'Canepa',
+  'Cannone',
+  'Canova',
+  'Canu',
+  'Capasso',
+  'Capecchi',
+  'Cappelli',
+  'Cappello',
+  'Capriotti',
+  'Caputo',
+  'Careddu',
+  'Caretti',
+  'Carini',
+  'Carletti',
+  'Carlucci',
+  'Carminati',
+  'Carnovale',
+  'Carrara',
+  'Carraro',
+  'Carrieri',
+  'Carrozzo',
+  'Carta',
+  'Caruso',
+  'Carvelli',
+  'Casadei',
+  'Casadio',
+  'Casagrande',
+  'Cascone',
+  'Casini',
+  'Cassano',
+  'Castiglioni',
+  'Catellani',
+  'Cattaneo',
+  'Cavallari',
+  'Cavalli',
+  'Cavallo',
+  'Ceccarelli',
+  'Cecchi',
+  'Cecchini',
+  'Cerise',
+  'Cerrani',
+  'Cerrato',
+  'Cerutti',
+  'Ciavarella',
+  'Cingolani',
+  'Ciuffreda',
+  'Colangelo',
+  'Colombo',
+  'Colonna',
+  'Colucci',
+  'Concas',
+  'Conte',
+  'Conti',
+  'Coppola',
+  'Corazza',
+  'Cordioli',
+  'Corradi',
+  'Corridori',
+  'Corti',
+  'Cortinovis',
+  'Coslovich',
+  'Cossu',
+  'Costa',
+  'Costantini',
+  'Coviello',
+  'Cozzani',
+  'Cozzolino',
+  'Crea',
+  'Cremonesi',
+  'Crepaldi',
+  'Crespi',
+  'Crevatin',
+  'Crippa',
+  "D'Agostino",
+  "D'Alessandro",
+  "D'Amico",
+  "D'Andrea",
+  "D'Angelo",
+  "D'Incà",
+  "D'Orazio",
+  'Da Rold',
+  'Dal Farra',
+  'Dalmasso',
+  'Davoli',
+  'De Angelis',
+  'De Bona',
+  'De Col',
+  'De Giorgi',
+  'De Luca',
+  'De Lucia',
+  'De Maio',
+  'De Marco',
+  'De Palma',
+  'De Rosa',
+  'De Santis',
+  'Degano',
+  'Degrassi',
+  'Deiana',
+  'Delfino',
+  "Dell'Amico",
+  'Demurtas',
+  'Denti',
+  'Di Bari',
+  'Di Carlo',
+  'Di Cesare',
+  'Di Dio',
+  'Di Domenico',
+  'Di Felice',
+  'Di Francesco',
+  'Di Giovanni',
+  'Di Girolamo',
+  'Di Giuseppe',
+  'Di Iorio',
+  'Di Marco',
+  'Di Matteo',
+  'Di Mauro',
+  'Di Nardo',
+  'Di Paolo',
+  'Di Pietro',
+  'Di Stefano',
+  'Diana',
+  'Donati',
+  'Donda',
+  'Doronzo',
+  'Dragoni',
+  'Dutto',
+  'Egger',
+  'Epifani',
+  'Ercoli',
+  'Esposito',
+  'Fabbri',
+  'Fabbro',
+  'Fabris',
+  'Falzone',
+  'Fanelli',
+  'Fasoli',
+  'Favaro',
+  'Favero',
+  'Favre',
+  'Ferluga',
+  'Ferracuti',
+  'Ferrando',
+  'Ferrara',
+  'Ferrari',
+  'Ferrario',
+  'Ferraris',
+  'Ferraro',
+  'Ferrarotti',
+  'Ferrero',
+  'Ferretti',
+  'Ferri',
+  'Ferro',
+  'Festuccia',
+  'Filippi',
+  'Filippini',
+  'Finotti',
+  'Fioravanti',
+  'Fiore',
+  'Fiorini',
+  'Fiorucci',
+  'Floris',
+  'Fonda',
+  'Fontana',
+  'Fornara',
+  'Forte',
+  'Foschi',
+  'Foti',
+  'Francese',
+  'Franco',
+  'Franzoni',
+  'Franzè',
+  'Frigerio',
+  'Frigo',
+  'Fumagalli',
+  'Fumarola',
+  'Furlan',
+  'Fusco',
+  'Gabriele',
+  'Gabrielli',
+  'Gagliano',
+  'Galati',
+  'Galli',
+  'Gallo',
+  'Gamberini',
+  'Gambino',
+  'Gamper',
+  'Garau',
+  'Garavaglia',
+  'Gargiulo',
+  'Gasser',
+  'Gatti',
+  'Gazzola',
+  'Genna',
+  'Gentile',
+  'Gentili',
+  'Giacalone',
+  'Giannini',
+  'Gigliotti',
+  'Giordano',
+  'Giovannini',
+  'Giraudo',
+  'Giuffrida',
+  'Giuliani',
+  'Giunta',
+  'Giusti',
+  'Gori',
+  'Govoni',
+  'Granata',
+  'Grandi',
+  'Grange',
+  'Grasso',
+  'Greco',
+  'Gregori',
+  'Greppi',
+  'Grieco',
+  'Grillo',
+  'Grossi',
+  'Gruber',
+  'Guarneri',
+  'Guastella',
+  'Guastone',
+  'Guerra',
+  'Guerriero',
+  'Guerrini',
+  'Guglielmi',
+  'Guidi',
+  'Gurrieri',
+  'Gusmeroli',
+  'Hofer',
+  'Huber',
+  'Iacono',
+  'Iannaccone',
+  'Ierardi',
+  'Iezzi',
+  'Innocenti',
+  'Iotti',
+  'Izzi',
+  'Izzo',
+  'Kofler',
+  'Laganà',
+  'Lai',
+  'Landi',
+  'Lanteri',
+  'Lanza',
+  'Lenzi',
+  'Leonardi',
+  'Leone',
+  'Leonetti',
+  'Licata',
+  'Licitra',
+  'Ligorio',
+  'Liverani',
+  'Locatelli',
+  'Lodi',
+  'Loi',
+  'Lombardi',
+  'Lombardo',
+  'Lonardi',
+  'Longo',
+  'Lorusso',
+  'Lovato',
+  'Lucchesi',
+  'Luciani',
+  'Lugli',
+  'Luppi',
+  'Macchi',
+  'Maggi',
+  'Maggiani',
+  'Magnani',
+  'Maio',
+  'Mair',
+  'Malagoli',
+  'Malavasi',
+  'Manca',
+  'Mancini',
+  'Mancuso',
+  'Manetti',
+  'Manfredi',
+  'Mantovani',
+  'Marangon',
+  'Marchesan',
+  'Marchetti',
+  'Marcon',
+  'Marconi',
+  'Marega',
+  'Marelli',
+  'Mariani',
+  'Marinelli',
+  'Marini',
+  'Marino',
+  'Martinelli',
+  'Martini',
+  'Martino',
+  'Marziali',
+  'Masiero',
+  'Massaro',
+  'Mastroianni',
+  'Matera',
+  'Mauro',
+  'Mazza',
+  'Mazzeo',
+  'Mazzocchi',
+  'Mazzoleno',
+  'Mazzoni',
+  'Mazzotti',
+  'Mecca',
+  'Medeot',
+  'Melandri',
+  'Melis',
+  'Meloni',
+  'Menconi',
+  'Menegatti',
+  'Menna',
+  'Menozzi',
+  'Mereu',
+  'Merola',
+  'Messina',
+  'Miglio',
+  'Mignogna',
+  'Milan',
+  'Milani',
+  'Minniti',
+  'Moffa',
+  'Molinari',
+  'Molteni',
+  'Monaci',
+  'Montagna',
+  'Montalbano',
+  'Montanari',
+  'Montemurro',
+  'Monti',
+  'Mora',
+  'Morabito',
+  'Morandi',
+  'Moras',
+  'Morelli',
+  'Moretti',
+  'Moro',
+  'Morri',
+  'Mosca',
+  'Moser',
+  'Mosti',
+  'Mura',
+  'Murgia',
+  'Murru',
+  'Musso',
+  'Nanni',
+  'Napolitano',
+  'Natale',
+  'Negri',
+  'Neri',
+  'Nesti',
+  'Niccolai',
+  'Nicoletti',
+  'Nobili',
+  'Nocentini',
+  'Occhipinti',
+  'Pace',
+  'Pacini',
+  'Palladino',
+  'Palmisani',
+  'Palmisano',
+  'Palumbo',
+  'Panzeri',
+  'Paolicelli',
+  'Paolucci',
+  'Pappalardo',
+  'Pardini',
+  'Parente',
+  'Parisi',
+  'Parodi',
+  'Parrinello',
+  'Pastorino',
+  'Pavan',
+  'Peaquin',
+  'Pedrazzini',
+  'Pedrotti',
+  'Pellegrini',
+  'Pellegrino',
+  'Penzo',
+  'Pepe',
+  'Perego',
+  'Perri',
+  'Perrone',
+  'Pession',
+  'Petrarca',
+  'Petronio',
+  'Piana',
+  'Pianigiani',
+  'Piazzolla',
+  'Picariello',
+  'Picco',
+  'Pichler',
+  'Pieri',
+  'Pini',
+  'Pinna',
+  'Pintus',
+  'Pipitone',
+  'Piras',
+  'Pircher',
+  'Piscitelli',
+  'Pivetta',
+  'Poggio',
+  'Poletti',
+  'Porcu',
+  'Pozzo',
+  'Prencipe',
+  'Privitera',
+  'Procopio',
+  'Proietti',
+  'Pucci',
+  'Pugliese',
+  'Puglisi',
+  'Quaranta',
+  'Quarta',
+  'Quinto',
+  'Rallo',
+  'Ramella',
+  'Rampazzo',
+  'Randazzo',
+  'Rapisarda',
+  'Ravaioli',
+  'Rea',
+  'Redaelli',
+  'Repetto',
+  'Ricci',
+  'Riggi',
+  'Righetti',
+  'Righi',
+  'Rinaldi',
+  'Riva',
+  'Rizza',
+  'Rizzi',
+  'Rizzo',
+  'Rocca',
+  'Rodigari',
+  'Romagnoli',
+  'Romaniello',
+  'Romano',
+  'Romeo',
+  'Rosati',
+  'Rosset',
+  'Rossi',
+  'Rosso',
+  'Rota',
+  'Ruggeri',
+  'Ruggiero',
+  'Russo',
+  'Sabatini',
+  'Sabbatini',
+  'Sabia',
+  'Sacchet',
+  'Sacchi',
+  'Sacco',
+  'Sala',
+  'Salvadori',
+  'Salvatore',
+  'Salvucci',
+  'Sanfilippo',
+  'Sanna',
+  'Santarelli',
+  'Santarossa',
+  'Santarsiero',
+  'Santilli',
+  'Santini',
+  'Santoro',
+  'Saponaro',
+  'Sartor',
+  'Sartori',
+  'Sbrana',
+  'Scalise',
+  'Scarpa',
+  'Scherini',
+  'Schiavi',
+  'Schiavon',
+  'Sechi',
+  'Semeraro',
+  'Semprini',
+  'Senatore',
+  'Serafini',
+  'Serra',
+  'Silenzi',
+  'Silvestri',
+  'Siri',
+  'Sorrentino',
+  'Spano',
+  'Spina',
+  'Stigliano',
+  'Sucera',
+  'Surace',
+  'Tagliabue',
+  'Tagliaferri',
+  'Talarico',
+  'Tallarico',
+  'Tanzi',
+  'Tassone',
+  'Telesca',
+  'Tesi',
+  'Testa',
+  'Tiozzo',
+  'Tomasi',
+  'Tonelli',
+  'Torchio',
+  'Torresi',
+  'Torrisi',
+  'Totaro',
+  'Traini',
+  'Traverso',
+  'Trevisan',
+  'Tripodi',
+  'Trovato',
+  'Tumino',
+  'Usai',
+  'Vailati',
+  'Valentini',
+  'Valsecchi',
+  'Vascotto',
+  'Vella',
+  'Venezia',
+  'Venturelli',
+  'Venturi',
+  'Venturini',
+  'Vercesi',
+  'Veronese',
+  'Vezzoli',
+  'Viale',
+  'Vianello',
+  'Vichi',
+  'Vierin',
+  'Villa',
+  'Vincenzi',
+  'Visentin',
+  'Visintin',
+  'Vitale',
+  'Vitali',
+  'Vuillermoz',
+  'Zagaria',
+  'Zanatta',
+  'Zanella',
+  'Zanetta',
+  'Zanetti',
+  'Zani',
+  'Zeni',
+  'Zennaro',
+  'Zordan',
+  'Zuliani',
+  'Zunino'
 ];
diff --git a/lib/locales/it/name/male_first_name.js b/lib/locales/it/name/male_first_name.js
new file mode 100644
index 00000000..7d7494c3
--- /dev/null
+++ b/lib/locales/it/name/male_first_name.js
@@ -0,0 +1,1085 @@
+module['exports'] = [

+  'Abaco',

+  'Abbondanzio',

+  'Abbondio',

+  'Abdone',

+  'Abelardo',

+  'Abele',

+  'Abenzio',

+  'Abibo',

+  'Abramio',

+  'Abramo',

+  'Acacio',

+  'Acario',

+  'Accursio',

+  'Achille',

+  'Acilio',

+  'Aciscolo',

+  'Acrisio',

+  'Adalardo',

+  'Adalberto',

+  'Adalfredo',

+  'Adalgiso',

+  'Adalrico',

+  'Adamo',

+  'Addo',

+  'Adelardo',

+  'Adelberto',

+  'Adelchi',

+  'Adelfo',

+  'Adelgardo',

+  'Adelmo',

+  'Adeodato',

+  'Adolfo',

+  'Adone',

+  'Adriano',

+  'Adrione',

+  'Afro',

+  'Agabio',

+  'Agamennone',

+  'Agapito',

+  'Agazio',

+  'Agenore',

+  'Agesilao',

+  'Agostino',

+  'Agrippa',

+  'Aiace',

+  'Aidano',

+  'Aimone',

+  'Aladino',

+  'Alamanno',

+  'Alano',

+  'Alarico',

+  'Albano',

+  'Alberico',

+  'Alberto',

+  'Albino',

+  'Alboino',

+  'Albrico',

+  'Alceo',

+  'Alceste',

+  'Alcibiade',

+  'Alcide',

+  'Alcino',

+  'Aldo',

+  'Aldobrando',

+  'Aleandro',

+  'Aleardo',

+  'Aleramo',

+  'Alessandro',

+  'Alessio',

+  'Alfio',

+  'Alfonso',

+  'Alfredo',

+  'Algiso',

+  'Alighiero',

+  'Almerigo',

+  'Almiro',

+  'Aloisio',

+  'Alvaro',

+  'Alviero',

+  'Alvise',

+  'Amabile',

+  'Amadeo',

+  'Amando',

+  'Amanzio',

+  'Amaranto',

+  'Amato',

+  'Amatore',

+  'Amauri',

+  'Ambrogio',

+  'Ambrosiano',

+  'Amedeo',

+  'Amelio',

+  'Amerigo',

+  'Amico',

+  'Amilcare',

+  'Amintore',

+  'Amleto',

+  'Amone',

+  'Amore',

+  'Amos',

+  'Ampelio',

+  'Anacleto',

+  'Andrea',

+  'Angelo',

+  'Aniceto',

+  'Aniello',

+  'Annibale',

+  'Ansaldo',

+  'Anselmo',

+  'Ansovino',

+  'Antelmo',

+  'Antero',

+  'Antimo',

+  'Antino',

+  'Antioco',

+  'Antonello',

+  'Antonio',

+  'Apollinare',

+  'Apollo',

+  'Apuleio',

+  'Aquilino',

+  'Araldo',

+  'Aratone',

+  'Arcadio',

+  'Archimede',

+  'Archippo',

+  'Arcibaldo',

+  'Ardito',

+  'Arduino',

+  'Aresio',

+  'Argimiro',

+  'Argo',

+  'Arialdo',

+  'Ariberto',

+  'Ariele',

+  'Ariosto',

+  'Aris',

+  'Aristarco',

+  'Aristeo',

+  'Aristide',

+  'Aristione',

+  'Aristo',

+  'Aristofane',

+  'Aristotele',

+  'Armando',

+  'Arminio',

+  'Arnaldo',

+  'Aronne',

+  'Arrigo',

+  'Arturo',

+  'Ascanio',

+  'Asdrubale',

+  'Asimodeo',

+  'Assunto',

+  'Asterio',

+  'Astianatte',

+  'Ataleo',

+  'Atanasio',

+  'Athos',

+  'Attila',

+  'Attilano',

+  'Attilio',

+  'Auberto',

+  'Audace',

+  'Augusto',

+  'Aureliano',

+  'Aurelio',

+  'Auro',

+  'Ausilio',

+  'Averardo',

+  'Azeglio',

+  'Azelio',

+  'Bacco',

+  'Baldassarre',

+  'Balderico',

+  'Baldo',

+  'Baldomero',

+  'Baldovino',

+  'Barbarigo',

+  'Bardo',

+  'Bardomiano',

+  'Barnaba',

+  'Barsaba',

+  'Barsimeo',

+  'Bartolo',

+  'Bartolomeo',

+  'Basileo',

+  'Basilio',

+  'Bassiano',

+  'Bastiano',

+  'Battista',

+  'Beato',

+  'Bellino',

+  'Beltramo',

+  'Benedetto',

+  'Beniamino',

+  'Benigno',

+  'Benito',

+  'Benvenuto',

+  'Berardo',

+  'Berengario',

+  'Bernardo',

+  'Beronico',

+  'Bertoldo',

+  'Bertolfo',

+  'Biagio',

+  'Bibiano',

+  'Bindo',

+  'Bino',

+  'Birino',

+  'Bonagiunta',

+  'Bonaldo',

+  'Bonaventura',

+  'Bonavita',

+  'Bonifacio',

+  'Bonito',

+  'Boris',

+  'Bortolo',

+  'Brancaleone',

+  'Brando',

+  'Bruno',

+  'Bruto',

+  'Caino',

+  'Caio',

+  'Calanico',

+  'Calcedonio',

+  'Callisto',

+  'Calogero',

+  'Camillo',

+  'Candido',

+  'Cantidio',

+  'Canziano',

+  'Carlo',

+  'Carmelo',

+  'Carmine',

+  'Caronte',

+  'Carponio',

+  'Casimiro',

+  'Cassiano',

+  'Cassio',

+  'Casto',

+  'Cataldo',

+  'Catullo',

+  'Cecco',

+  'Cecilio',

+  'Celso',

+  'Cesare',

+  'Cesario',

+  'Cherubino',

+  'Chiaffredo',

+  'Cino',

+  'Cipriano',

+  'Cirano',

+  'Ciriaco',

+  'Cirillo',

+  'Cirino',

+  'Ciro',

+  'Clarenzio',

+  'Claudio',

+  'Cleandro',

+  'Clemente',

+  'Cleonico',

+  'Climaco',

+  'Clinio',

+  'Clodomiro',

+  'Clodoveo',

+  'Colmanno',

+  'Colmazio',

+  'Colombano',

+  'Colombo',

+  'Concetto',

+  'Concordio',

+  'Corbiniano',

+  'Coreno',

+  'Coriolano',

+  'Cornelio',

+  'Coronato',

+  'Corrado',

+  'Cosimo',

+  'Cosma',

+  'Costante',

+  'Costantino',

+  'Costanzo',

+  'Cremenzio',

+  'Crescente',

+  'Crescenzio',

+  'Crespignano',

+  'Crispino',

+  'Cristaldo',

+  'Cristiano',

+  'Cristoforo',

+  'Crocefisso',

+  'Cuniberto',

+  'Cupido',

+  'Daciano',

+  'Dacio',

+  'Dagoberto',

+  'Dalmazio',

+  'Damaso',

+  'Damiano',

+  'Damocle',

+  'Daniele',

+  'Danilo',

+  'Danio',

+  'Dante',

+  'Dario',

+  'Davide',

+  'Davino',

+  'Decimo',

+  'Delfino',

+  'Demetrio',

+  'Democrito',

+  'Demostene',

+  'Deodato',

+  'Desiderato',

+  'Desiderio',

+  'Didimo',

+  'Diego',

+  'Dino',

+  'Diocleziano',

+  'Diodoro',

+  'Diogene',

+  'Diomede',

+  'Dione',

+  'Dionigi',

+  'Dionisio',

+  'Divo',

+  'Dodato',

+  'Domenico',

+  'Domezio',

+  'Domiziano',

+  'Donatello',

+  'Donato',

+  'Doriano',

+  'Doroteo',

+  'Duccio',

+  'Duilio',

+  'Durante',

+  'Eberardo',

+  'Ecclesio',

+  'Edgardo',

+  'Edilberto',

+  'Edmondo',

+  'Edoardo',

+  'Efisio',

+  'Efrem',

+  'Egeo',

+  'Egidio',

+  'Eginardo',

+  'Egisto',

+  'Eleuterio',

+  'Elia',

+  'Eliano',

+  'Elifio',

+  'Eligio',

+  'Elio',

+  'Eliodoro',

+  'Eliseo',

+  'Elita',

+  'Elmo',

+  'Elogio',

+  'Elpidio',

+  'Elvezio',

+  'Elvino',

+  'Emanuele',

+  'Emidio',

+  'Emiliano',

+  'Emilio',

+  'Emmerico',

+  'Empirio',

+  'Endrigo',

+  'Enea',

+  'Enecone',

+  'Ennio',

+  'Enrico',

+  'Enzo',

+  'Eraclide',

+  'Eraldo',

+  'Erardo',

+  'Erasmo',

+  'Erberto',

+  'Ercolano',

+  'Ercole',

+  'Erenia',

+  'Eriberto',

+  'Erico',

+  'Ermanno',

+  'Ermenegildo',

+  'Ermes',

+  'Ermete',

+  'Ermilo',

+  'Erminio',

+  'Ernesto',

+  'Eros',

+  'Esaù',

+  'Esuperio',

+  'Eterie',

+  'Ettore',

+  'Euclide',

+  'Eufebio',

+  'Eufemio',

+  'Eufronio',

+  'Eugenio',

+  'Eusebio',

+  'Euseo',

+  'Eustorgio',

+  'Eustosio',

+  'Eutalio',

+  'Evaldo',

+  'Evandro',

+  'Evaristo',

+  'Evasio',

+  'Everardo',

+  'Evidio',

+  'Evodio',

+  'Evremondo',

+  'Ezechiele',

+  'Ezio',

+  'Fabiano',

+  'Fabio',

+  'Fabrizio',

+  'Famiano',

+  'Fausto',

+  'Fazio',

+  'Fedele',

+  'Federico',

+  'Fedro',

+  'Felice',

+  'Feliciano',

+  'Ferdinando',

+  'Fermiano',

+  'Fermo',

+  'Fernando',

+  'Ferruccio',

+  'Festo',

+  'Fidenziano',

+  'Fidenzio',

+  'Filiberto',

+  'Filippo',

+  'Filomeno',

+  'Fiorenziano',

+  'Fiorenzo',

+  'Flaviano',

+  'Flavio',

+  'Fleano',

+  'Floriano',

+  'Folco',

+  'Fortunato',

+  'Fosco',

+  'Francesco',

+  'Franco',

+  'Frido',

+  'Frontiniano',

+  'Fulberto',

+  'Fulgenzio',

+  'Fulvio',

+  'Furio',

+  'Furseo',

+  'Fuscolo',

+  'Gabino',

+  'Gabriele',

+  'Gaetano',

+  'Gaglioffo',

+  'Gaio',

+  'Galdino',

+  'Galeazzo',

+  'Galileo',

+  'Gallicano',

+  'Gandolfo',

+  'Garimberto',

+  'Gaspare',

+  'Gastone',

+  'Gaudenzio',

+  'Gaudino',

+  'Gautiero',

+  'Gavino',

+  'Gedeone',

+  'Geminiano',

+  'Generoso',

+  'Genesio',

+  'Gennaro',

+  'Gentile',

+  'Genziano',

+  'Gerardo',

+  'Gerasimo',

+  'Geremia',

+  'Gerino',

+  'Germano',

+  'Gerolamo',

+  'Geronimo',

+  'Geronzio',

+  'Gervasio',

+  'Gesualdo',

+  'Gherardo',

+  'Giacinto',

+  'Giacobbe',

+  'Giacomo',

+  'Giadero',

+  'Giambattista',

+  'Gianbattista',

+  'Giancarlo',

+  'Giandomenico',

+  'Gianfranco',

+  'Gianluca',

+  'Gianluigi',

+  'Gianmarco',

+  'Gianmaria',

+  'Gianmario',

+  'Gianni',

+  'Gianpaolo',

+  'Gianpiero',

+  'Gianpietro',

+  'Gianuario',

+  'Giasone',

+  'Gilberto',

+  'Gildo',

+  'Gillo',

+  'Gineto',

+  'Gino',

+  'Gioacchino',

+  'Giobbe',

+  'Gioberto',

+  'Giocondo',

+  'Gioele',

+  'Giona',

+  'Gionata',

+  'Giordano',

+  'Giorgio',

+  'Giosuè',

+  'Giosuele',

+  'Giotto',

+  'Giovanni',

+  'Giove',

+  'Gioventino',

+  'Giovenzio',

+  'Girardo',

+  'Girolamo',

+  'Giuda',

+  'Giuliano',

+  'Giulio',

+  'Giuseppe',

+  'Giustiniano',

+  'Giusto',

+  'Glauco',

+  'Goffredo',

+  'Golia',

+  'Gomberto',

+  'Gondulfo',

+  'Gonerio',

+  'Gonzaga',

+  'Gordiano',

+  'Gosto',

+  'Gottardo',

+  'Graciliano',

+  'Grato',

+  'Graziano',

+  'Gregorio',

+  'Grimaldo',

+  'Gualberto',

+  'Gualtiero',

+  'Guelfo',

+  'Guerrino',

+  'Guglielmo',

+  'Guiberto',

+  'Guido',

+  'Guiscardo',

+  'Gumesindo',

+  'Gustavo',

+  'Iacopo',

+  'Iacopone',

+  'Iago',

+  'Icaro',

+  'Icilio',

+  'Ido',

+  'Iginio',

+  'Igino',

+  'Ignazio',

+  'Igor',

+  'Ilario',

+  'Ildebrando',

+  'Ildefonso',

+  'Illidio',

+  'Illuminato',

+  'Immacolato',

+  'Indro',

+  'Innocente',

+  'Innocenzo',

+  'Iorio',

+  'Ippocrate',

+  'Ippolito',

+  'Ireneo',

+  'Isacco',

+  'Isaia',

+  'Ischirione',

+  'Isidoro',

+  'Ismaele',

+  'Italo',

+  'Ivan',

+  'Ivano',

+  'Ivanoe',

+  'Ivo',

+  'Ivone',

+  'Ladislao',

+  'Lamberto',

+  'Lancilotto',

+  'Landolfo',

+  'Lanfranco',

+  'Lapo',

+  'Laurentino',

+  'Lauriano',

+  'Lautone',

+  'Lavinio',

+  'Lazzaro',

+  'Leandro',

+  'Leo',

+  'Leonardo',

+  'Leone',

+  'Leonida',

+  'Leonio',

+  'Leonzio',

+  'Leopardo',

+  'Leopoldo',

+  'Letterio',

+  'Liberato',

+  'Liberatore',

+  'Liberio',

+  'Libero',

+  'Liberto',

+  'Liborio',

+  'Lidio',

+  'Lieto',

+  'Lino',

+  'Lisandro',

+  'Livino',

+  'Livio',

+  'Lodovico',

+  'Loreno',

+  'Lorenzo',

+  'Loris',

+  'Luca',

+  'Luciano',

+  'Lucio',

+  'Ludano',

+  'Ludovico',

+  'Luigi',

+  'Macario',

+  'Maccabeo',

+  'Maffeo',

+  'Maggiorino',

+  'Magno',

+  'Maiorico',

+  'Malco',

+  'Mamante',

+  'Mancio',

+  'Manetto',

+  'Manfredo',

+  'Manilio',

+  'Manlio',

+  'Mansueto',

+  'Manuele',

+  'Marcello',

+  'Marciano',

+  'Marco',

+  'Mariano',

+  'Marino',

+  'Mario',

+  'Marolo',

+  'Martino',

+  'Marzio',

+  'Massimiliano',

+  'Massimo',

+  'Matroniano',

+  'Matteo',

+  'Mattia',

+  'Maurilio',

+  'Maurizio',

+  'Mauro',

+  'Medardo',

+  'Medoro',

+  'Melanio',

+  'Melchiade',

+  'Melchiorre',

+  'Melezio',

+  'Menardo',

+  'Menelao',

+  'Meneo',

+  'Mennone',

+  'Mercurio',

+  'Metello',

+  'Metrofane',

+  'Michelangelo',

+  'Michele',

+  'Milo',

+  'Minervino',

+  'Mirco',

+  'Mirko',

+  'Mirocleto',

+  'Misaele',

+  'Modesto',

+  'Monaldo',

+  'Monitore',

+  'Moreno',

+  'Mosè',

+  'Muziano',

+  'Namazio',

+  'Napoleone',

+  'Narciso',

+  'Narseo',

+  'Narsete',

+  'Natale',

+  'Nazario',

+  'Nazzareno',

+  'Nazzaro',

+  'Neopolo',

+  'Neoterio',

+  'Nereo',

+  'Neri',

+  'Nestore',

+  'Nicarete',

+  'Nicea',

+  'Niceforo',

+  'Niceto',

+  'Nicezio',

+  'Nico',

+  'Nicodemo',

+  'Nicola',

+  'Nicolò',

+  'Niniano',

+  'Nino',

+  'Noè',

+  'Norberto',

+  'Nostriano',

+  'Nunzio',

+  'Oddone',

+  'Oderico',

+  'Odidone',

+  'Odorico',

+  'Olimpio',

+  'Olindo',

+  'Oliviero',

+  'Omar',

+  'Omero',

+  'Onesto',

+  'Onofrio',

+  'Onorino',

+  'Onorio',

+  'Orazio',

+  'Orenzio',

+  'Oreste',

+  'Orfeo',

+  'Orio',

+  'Orlando',

+  'Oronzo',

+  'Orsino',

+  'Orso',

+  'Ortensio',

+  'Oscar',

+  'Osmondo',

+  'Osvaldo',

+  'Otello',

+  'Ottaviano',

+  'Ottavio',

+  'Ottone',

+  'Ovidio',

+  'Paciano',

+  'Pacifico',

+  'Pacomio',

+  'Palatino',

+  'Palladio',

+  'Pammachio',

+  'Pancario',

+  'Pancrazio',

+  'Panfilo',

+  'Pantaleo',

+  'Pantaleone',

+  'Paolo',

+  'Pardo',

+  'Paride',

+  'Parmenio',

+  'Pasquale',

+  'Paterniano',

+  'Patrizio',

+  'Patroclo',

+  'Pauside',

+  'Peleo',

+  'Pellegrino',

+  'Pericle',

+  'Perseo',

+  'Petronio',

+  'Pierangelo',

+  'Piergiorgio',

+  'Pierluigi',

+  'Piermarco',

+  'Piero',

+  'Piersilvio',

+  'Pietro',

+  'Pio',

+  'Pippo',

+  'Placido',

+  'Platone',

+  'Plinio',

+  'Plutarco',

+  'Polidoro',

+  'Polifemo',

+  'Pollione',

+  'Pompeo',

+  'Pomponio',

+  'Ponziano',

+  'Ponzio',

+  'Porfirio',

+  'Porziano',

+  'Postumio',

+  'Prassede',

+  'Priamo',

+  'Primo',

+  'Prisco',

+  'Privato',

+  'Procopio',

+  'Prospero',

+  'Protasio',

+  'Proteo',

+  'Prudenzio',

+  'Publio',

+  'Pupolo',

+  'Pusicio',

+  'Quarto',

+  'Quasimodo',

+  'Querano',

+  'Quintiliano',

+  'Quintilio',

+  'Quintino',

+  'Quinziano',

+  'Quinzio',

+  'Quirino',

+  'Radolfo',

+  'Raffaele',

+  'Raide',

+  'Raimondo',

+  'Rainaldo',

+  'Ramiro',

+  'Raniero',

+  'Ranolfo',

+  'Reginaldo',

+  'Regolo',

+  'Remigio',

+  'Remo',

+  'Remondo',

+  'Renato',

+  'Renzo',

+  'Respicio',

+  'Ricario',

+  'Riccardo',

+  'Richelmo',

+  'Rinaldo',

+  'Rino',

+  'Robaldo',

+  'Roberto',

+  'Rocco',

+  'Rodiano',

+  'Rodolfo',

+  'Rodrigo',

+  'Rolando',

+  'Rolfo',

+  'Romano',

+  'Romeo',

+  'Romero',

+  'Romoaldo',

+  'Romolo',

+  'Romualdo',

+  'Rosario',

+  'Rubiano',

+  'Rufino',

+  'Rufo',

+  'Ruggero',

+  'Ruperto',

+  'Rutilo',

+  'Sabato',

+  'Sabazio',

+  'Sabele',

+  'Sabino',

+  'Saffiro',

+  'Saffo',

+  'Saladino',

+  'Salomè',

+  'Salomone',

+  'Salustio',

+  'Salvatore',

+  'Salvo',

+  'Samuele',

+  'Sandro',

+  'Sansone',

+  'Sante',

+  'Santo',

+  'Sapiente',

+  'Sarbello',

+  'Saturniano',

+  'Saturnino',

+  'Saul',

+  'Saverio',

+  'Savino',

+  'Sebastiano',

+  'Secondiano',

+  'Secondo',

+  'Semplicio',

+  'Sempronio',

+  'Senesio',

+  'Senofonte',

+  'Serafino',

+  'Serapione',

+  'Sergio',

+  'Servidio',

+  'Serviliano',

+  'Sesto',

+  'Settimio',

+  'Settimo',

+  'Severiano',

+  'Severino',

+  'Severo',

+  'Sico',

+  'Sicuro',

+  'Sidonio',

+  'Sigfrido',

+  'Sigismondo',

+  'Silvano',

+  'Silverio',

+  'Silvestro',

+  'Silvio',

+  'Simeone',

+  'Simone',

+  'Sinesio',

+  'Sinfronio',

+  'Sireno',

+  'Siriano',

+  'Siricio',

+  'Sirio',

+  'Siro',

+  'Sisto',

+  'Soccorso',

+  'Socrate',

+  'Solocone',

+  'Sostene',

+  'Sosteneo',

+  'Sostrato',

+  'Spano',

+  'Spartaco',

+  'Speranzio',

+  'Stanislao',

+  'Stefano',

+  'Stiliano',

+  'Stiriaco',

+  'Surano',

+  'Sviturno',

+  'Taddeo',

+  'Taide',

+  'Tammaro',

+  'Tancredi',

+  'Tarcisio',

+  'Tarso',

+  'Taziano',

+  'Tazio',

+  'Telchide',

+  'Telemaco',

+  'Temistocle',

+  'Teobaldo',

+  'Teodoro',

+  'Teodosio',

+  'Teodoto',

+  'Teogene',

+  'Terenzio',

+  'Terzo',

+  'Tesauro',

+  'Tesifonte',

+  'Tibaldo',

+  'Tiberio',

+  'Tiburzio',

+  'Ticone',

+  'Timoteo',

+  'Tirone',

+  'Tito',

+  'Tiziano',

+  'Tizio',

+  'Tobia',

+  'Tolomeo',

+  'Tommaso',

+  'Torquato',

+  'Tosco',

+  'Tranquillo',

+  'Tristano',

+  'Tulliano',

+  'Tullio',

+  'Turi',

+  'Turibio',

+  'Tussio',

+  'Ubaldo',

+  'Ubertino',

+  'Uberto',

+  'Ugo',

+  'Ugolino',

+  'Uguccione',

+  'Ulberto',

+  'Ulderico',

+  'Ulfo',

+  'Ulisse',

+  'Ulpiano',

+  'Ulrico',

+  'Ulstano',

+  'Ultimo',

+  'Umberto',

+  'Umile',

+  'Uranio',

+  'Urbano',

+  'Urdino',

+  'Uriele',

+  'Ursicio',

+  'Ursino',

+  'Ursmaro',

+  'Valente',

+  'Valentino',

+  'Valeriano',

+  'Valerico',

+  'Valerio',

+  'Valfredo',

+  'Valfrido',

+  'Valtena',

+  'Valter',

+  'Varo',

+  'Vasco',

+  'Vedasto',

+  'Velio',

+  'Venanzio',

+  'Venceslao',

+  'Venerando',

+  'Venerio',

+  'Ventura',

+  'Venustiano',

+  'Venusto',

+  'Verano',

+  'Verecondo',

+  'Verenzio',

+  'Verulo',

+  'Vespasiano',

+  'Vezio',

+  'Vidiano',

+  'Vidone',

+  'Vilfredo',

+  'Viliberto',

+  'Vincenzo',

+  'Vindonio',

+  'Vinebaldo',

+  'Vinfrido',

+  'Vinicio',

+  'Virgilio',

+  'Virginio',

+  'Virone',

+  'Viscardo',

+  'Vitale',

+  'Vitalico',

+  'Vito',

+  'Vittore',

+  'Vittoriano',

+  'Vittorio',

+  'Vivaldo',

+  'Viviano',

+  'Vladimiro',

+  'Vodingo',

+  'Volfango',

+  'Vulmaro',

+  'Vulpiano',

+  'Walter',

+  'Zabedeo',

+  'Zaccaria',

+  'Zaccheo',

+  'Zanobi',

+  'Zefiro',

+  'Zena',

+  'Zenaide',

+  'Zenebio',

+  'Zeno',

+  'Zenobio',

+  'Zenone',

+  'Zetico',

+  'Zoilo',

+  'Zosimo'

+];

diff --git a/lib/locales/it/name/name.js b/lib/locales/it/name/name.js
index 23c77b5e..1aa6d0a4 100644
--- a/lib/locales/it/name/name.js
+++ b/lib/locales/it/name/name.js
@@ -3,6 +3,6 @@ module["exports"] = [
   "#{first_name} #{last_name}",
   "#{first_name} #{last_name}",
   "#{first_name} #{last_name}",
-  "#{first_name} #{last_name}",
-  "#{first_name} #{last_name}"
+  "#{male_first_name} #{last_name}",
+  "#{female_first_name} #{last_name}"
 ];
diff --git a/lib/locales/nl_BE/address/city.js b/lib/locales/nl_BE/address/city.js
index b86bb82d..5cbe713b 100644
--- a/lib/locales/nl_BE/address/city.js
+++ b/lib/locales/nl_BE/address/city.js
@@ -1,4 +1,4 @@
 module["exports"] = [
   "#{city_prefix}",
-  "#{city_prefix}}#{city_suffix}"
+  "#{city_prefix}#{city_suffix}"
 ];
diff --git a/lib/locales/pl/name/last_name.js b/lib/locales/pl/name/last_name.js
index 0e68e697..64585810 100644
--- a/lib/locales/pl/name/last_name.js
+++ b/lib/locales/pl/name/last_name.js
@@ -33,6 +33,7 @@ module["exports"] = [
   "Białas",
   "Białek",
   "Białkowski",
+  "Biedrzyński",
   "Bielak",
   "Bielawski",
   "Bielecki",
@@ -169,6 +170,7 @@ module["exports"] = [
   "Grzywacz",
   "Gutowski",
   "Guzik",
+  "Gwoździk",
   "Gwóźdź",
   "Góra",
   "Góral",
@@ -184,6 +186,7 @@ module["exports"] = [
   "Głąb",
   "Hajduk",
   "Herman",
+  "Iwanowski",
   "Iwański",
   "Izdebski",
   "Jabłoński",
@@ -394,6 +397,7 @@ module["exports"] = [
   "Mielczarek",
   "Mierzejewski",
   "Mika",
+  "Miklaś",
   "Mikołajczak",
   "Mikołajczyk",
   "Mikulski",
@@ -445,6 +449,7 @@ module["exports"] = [
   "Paczkowski",
   "Pająk",
   "Pakuła",
+  "Palacz",
   "Paluch",
   "Panek",
   "Partyka",
@@ -459,6 +464,7 @@ module["exports"] = [
   "Pałka",
   "Piasecki",
   "Piechota",
+  "Pieczek",
   "Piekarski",
   "Pietras",
   "Pietruszka",
@@ -605,6 +611,7 @@ module["exports"] = [
   "Tomaszewski",
   "Tomczak",
   "Tomczyk",
+  "Tomys",
   "Tracz",
   "Trojanowski",
   "Trzciński",
@@ -660,6 +667,7 @@ module["exports"] = [
   "Wójcik",
   "Wójtowicz",
   "Wąsik",
+  "Wąsowski",
   "Węgrzyn",
   "Włodarczyk",
   "Włodarski",
diff --git a/lib/locales/pt_BR/address/city_prefix.js b/lib/locales/pt_BR/address/city_prefix.js
index 4c476753..4464cf4b 100644
--- a/lib/locales/pt_BR/address/city_prefix.js
+++ b/lib/locales/pt_BR/address/city_prefix.js
@@ -1,7 +1,2 @@
 module["exports"] = [
-  "Nova",
-  "Velha",
-  "Grande",
-  "Vila",
-  "Município de"
 ];
diff --git a/lib/locales/pt_BR/address/city_suffix.js b/lib/locales/pt_BR/address/city_suffix.js
index f3c3db72..4464cf4b 100644
--- a/lib/locales/pt_BR/address/city_suffix.js
+++ b/lib/locales/pt_BR/address/city_suffix.js
@@ -1,6 +1,2 @@
 module["exports"] = [
-  "do Descoberto",
-  "de Nossa Senhora",
-  "do Norte",
-  "do Sul"
 ];
diff --git a/lib/locales/pt_BR/address/postcode.js b/lib/locales/pt_BR/address/postcode.js
index dea501ec..dd444da2 100644
--- a/lib/locales/pt_BR/address/postcode.js
+++ b/lib/locales/pt_BR/address/postcode.js
@@ -1,4 +1,3 @@
 module["exports"] = [
-  "#####",
   "#####-###"
 ];
diff --git a/lib/locales/pt_BR/address/street_suffix.js b/lib/locales/pt_BR/address/street_suffix.js
index afa9cba0..25a1f692 100644
--- a/lib/locales/pt_BR/address/street_suffix.js
+++ b/lib/locales/pt_BR/address/street_suffix.js
@@ -2,9 +2,7 @@ module["exports"] = [
   "Rua",
   "Avenida",
   "Travessa",
-  "Ponte",
   "Alameda",
   "Marginal",
-  "Viela",
   "Rodovia"
 ];
diff --git a/lib/locales/pt_BR/commerce/color.js b/lib/locales/pt_BR/commerce/color.js
new file mode 100644
index 00000000..0b139d15
--- /dev/null
+++ b/lib/locales/pt_BR/commerce/color.js
@@ -0,0 +1,47 @@
+module["exports"] = [
+  "amarelo",
+  "âmbar",
+  "ametista",
+  "azul",
+  "azul celeste",
+  "azul marinho",
+  "azul petróleo",
+  "açafrão",
+  "bordô",
+  "bronze",
+  "caramelo",
+  "castanho ",
+  "cenoura",
+  "cinza",
+  "cobre",
+  "coral",
+  "dourado",
+  "escarlate",
+  "esmeralda",
+  "ferrugem",
+  "fuligem",
+  "fúchsia",
+  "grená",
+  "índigo",
+  "jade",
+  "laranja",
+  "lilás",
+  "limão",
+  "madeira",
+  "magenta",
+  "marrom",
+  "ouro",
+  "pele",
+  "prata",
+  "preto",
+  "púrpura",
+  "rosa",
+  "roxo",
+  "salmão",
+  "turquesa",
+  "verde",
+  "verde lima",
+  "verde-azulado",
+  "vermelho",
+  "violeta"
+];
diff --git a/lib/locales/pt_BR/commerce/department.js b/lib/locales/pt_BR/commerce/department.js
new file mode 100644
index 00000000..c43a9f92
--- /dev/null
+++ b/lib/locales/pt_BR/commerce/department.js
@@ -0,0 +1,24 @@
+module["exports"] = [
+  "Livros",
+  "Filmes",
+  "Música",
+  "Jogos",
+  "Eletrônicos",
+  "Computadores",
+  "Casa",
+  "Jardim",
+  "Ferramentas",
+  "Mercearia",
+  "Saúde",
+  "Beleza",
+  "Brinquedos",
+  "Crianças",
+  "Bebê",
+  "Roupas",
+  "Sapatos",
+  "Jóias",
+  "Esportes",
+  "Turismo",
+  "Automotivo",
+  "Industrial"
+];
diff --git a/lib/locales/pt_BR/commerce/index.js b/lib/locales/pt_BR/commerce/index.js
new file mode 100644
index 00000000..c05b5272
--- /dev/null
+++ b/lib/locales/pt_BR/commerce/index.js
@@ -0,0 +1,5 @@
+var commerce = {};
+module['exports'] = commerce;
+commerce.color = require("./color");
+commerce.department = require("./department");
+commerce.product_name = require("./product_name");
diff --git a/lib/locales/pt_BR/commerce/product_name.js b/lib/locales/pt_BR/commerce/product_name.js
new file mode 100644
index 00000000..5260ef02
--- /dev/null
+++ b/lib/locales/pt_BR/commerce/product_name.js
@@ -0,0 +1,59 @@
+module["exports"] = {
+  "adjective": [
+    "Pequeno",
+    "Ergonômico",
+    "Rústico",
+    "Inteligente",
+    "Lindo",
+    "Incrível",
+    "Fantástico",
+    "Prático",
+    "Lustroso",
+    "Impressionante",
+    "Genérico",
+    "Feito à mão",
+    "Licenciado",
+    "Refinado",
+    "Sem marca",
+    "Gostoso"
+  ],
+  "material": [
+    "Aço",
+    "Madeira",
+    "Concreto",
+    "Plástico",
+    "Algodão",
+    "Granito",
+    "Borracha",
+    "Metal",
+    "Macio",
+    "Fresco",
+    "Congelado"
+  ],
+  "product": [
+    "Cadeira",
+    "Carro",
+    "Computador",
+    "Teclado",
+    "Mouse",
+    "Bicicleta",
+    "Bola",
+    "Luvas",
+    "Calças",
+    "Camiseta",
+    "Mesa",
+    "Sapatos",
+    "Chapéu",
+    "Toalhas",
+    "Sabonete",
+    "Atum",
+    "Frango",
+    "Peixe",
+    "Queijo",
+    "Bacon",
+    "Pizza",
+    "Salada",
+    "Salsicha",
+    "Salgadinhos"
+  ]
+};
diff --git a/lib/locales/pt_BR/index.js b/lib/locales/pt_BR/index.js
index 6578d3c5..d79a7f81 100644
--- a/lib/locales/pt_BR/index.js
+++ b/lib/locales/pt_BR/index.js
@@ -3,6 +3,7 @@ module['exports'] = pt_BR;
 pt_BR.title = "Portuguese (Brazil)";
 pt_BR.address = require("./address");
 pt_BR.company = require("./company");
+pt_BR.commerce = require("./commerce");
 pt_BR.internet = require("./internet");
 pt_BR.lorem = require("./lorem");
 pt_BR.name = require("./name");
diff --git a/lib/locales/pt_BR/name/first_name.js b/lib/locales/pt_BR/name/first_name.js
index 4a33223c..3fde0618 100644
--- a/lib/locales/pt_BR/name/first_name.js
+++ b/lib/locales/pt_BR/name/first_name.js
@@ -1,93 +1,171 @@
 module["exports"] = [
-  "Alessandro",
   "Alessandra",
+  "Alessandro",
   "Alexandre",
+  "Alice",
   "Aline",
+  "Alícia",
+  "Ana Clara",
+  "Ana Júlia",
+  "Ana Laura",
+  "Ana Luiza",
+  "Anthony",
+  "Antonella",
   "Antônio",
+  "Arthur",
+  "Beatriz",
+  "Benjamin",
+  "Benício",
+  "Bernardo",
   "Breno",
   "Bruna",
-  "Carlos",
+  "Bryan",
+  "Caio",
+  "Calebe",
   "Carla",
-  "Célia",
+  "Carlos",
+  "Cauã",
   "Cecília",
+  "Clara",
+  "Célia",
   "César",
-  "Danilo",
   "Dalila",
+  "Daniel",
+  "Danilo",
+  "Davi",
+  "Davi Lucca",
   "Deneval",
-  "Eduardo",
   "Eduarda",
-  "Esther",
+  "Eduardo",
+  "Elisa",
+  "Eloá",
   "Elísio",
-  "Fábio",
-  "Fabrício",
+  "Emanuel",
+  "Emanuelly",
+  "Enzo",
+  "Enzo Gabriel",
+  "Esther",
+  "Fabiano",
   "Fabrícia",
-  "Félix",
-  "Felícia",
+  "Fabrício",
   "Feliciano",
+  "Felipe",
+  "Felícia",
   "Frederico",
-  "Fabiano",
-  "Gustavo",
+  "Fábio",
+  "Félix",
+  "Gabriel",
+  "Gael",
+  "Giovanna",
   "Guilherme",
+  "Gustavo",
   "Gúbio",
   "Heitor",
-  "Hélio",
+  "Helena",
+  "Heloísa",
+  "Henrique",
   "Hugo",
+  "Hélio",
+  "Isaac",
   "Isabel",
   "Isabela",
-  "Ígor",
-  "João",
+  "Isabella",
+  "Isabelly",
+  "Isadora",
+  "Isis",
+  "Janaína",
   "Joana",
-  "Júlio César",
-  "Júlio",
+  "Joaquim",
+  "João",
+  "João Lucas",
+  "João Miguel",
+  "João Pedro",
   "Júlia",
-  "Janaína",
+  "Júlio",
+  "Júlio César",
   "Karla",
   "Kléber",
-  "Lucas",
+  "Ladislau",
+  "Lara",
+  "Larissa",
+  "Laura",
+  "Lavínia",
+  "Leonardo",
+  "Liz",
   "Lorena",
+  "Lorenzo",
   "Lorraine",
-  "Larissa",
-  "Ladislau",
-  "Marcos",
-  "Meire",
-  "Marcelo",
+  "Lucas",
+  "Lucca",
+  "Luiza",
+  "Lívia",
+  "Maitê",
+  "Manuela",
   "Marcela",
+  "Marcelo",
+  "Marcos",
   "Margarida",
-  "Mércia",
-  "Márcia",
+  "Maria",
+  "Maria Alice",
+  "Maria Cecília",
+  "Maria Clara",
+  "Maria Eduarda",
+  "Maria Helena",
+  "Maria Júlia",
+  "Maria Luiza",
+  "Mariana",
+  "Marina",
   "Marli",
+  "Matheus",
+  "Meire",
+  "Melissa",
+  "Miguel",
   "Morgana",
-  "Maria",
-  "Norberto",
-  "Natália",
+  "Murilo",
+  "Márcia",
+  "Mércia",
   "Nataniel",
+  "Natália",
+  "Nicolas",
+  "Noah",
+  "Norberto",
   "Núbia",
   "Ofélia",
-  "Paulo",
-  "Paula",
   "Pablo",
+  "Paula",
+  "Paulo",
   "Pedro",
-  "Raul",
+  "Pedro Henrique",
+  "Pietro",
   "Rafael",
   "Rafaela",
+  "Raul",
+  "Rebeca",
   "Ricardo",
-  "Roberto",
   "Roberta",
-  "Sílvia",
-  "Sílvia",
-  "Silas",
-  "Suélen",
-  "Sara",
+  "Roberto",
   "Salvador",
+  "Samuel",
+  "Sara",
+  "Sarah",
+  "Silas",
   "Sirineu",
+  "Sophia",
+  "Suélen",
+  "Sílvia",
   "Talita",
   "Tertuliano",
+  "Théo",
+  "Valentina",
   "Vicente",
-  "Víctor",
+  "Vitor",
   "Vitória",
-  "Yango",
+  "Víctor",
+  "Warley",
+  "Washington",
   "Yago",
+  "Yango",
+  "Yasmin",
   "Yuri",
-  "Washington",
-  "Warley"
+  "Ígor"
 ];
diff --git a/lib/locales/ro/internet/avatar_uri.js b/lib/locales/ro/internet/avatar_uri.js
index 5902367a..45dda8bf 100644
--- a/lib/locales/ro/internet/avatar_uri.js
+++ b/lib/locales/ro/internet/avatar_uri.js
@@ -23,7 +23,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/peejfancher/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/andyisonline/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ultragex/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/fuck_you_two/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/adellecharles/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ateneupopular/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/ahmetalpbalkan/128.jpg",
@@ -407,7 +406,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/id835559/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/kudretkeskin/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/anjhero/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/duck4fuck/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/scott_riley/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/noufalibrahim/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/h1brd/128.jpg",
@@ -1074,7 +1072,6 @@ module["exports"] = [
   "https://s3.amazonaws.com/uifaces/faces/twitter/deeenright/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/cybind/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/eyronn/128.jpg",
-  "https://s3.amazonaws.com/uifaces/faces/twitter/vickyshits/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/sweetdelisa/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/cboller1/128.jpg",
   "https://s3.amazonaws.com/uifaces/faces/twitter/andresdjasso/128.jpg",
diff --git a/lib/locales/ru/address/city_name.js b/lib/locales/ru/address/city_name.js
index 6aad56a3..17f4e62a 100644
--- a/lib/locales/ru/address/city_name.js
+++ b/lib/locales/ru/address/city_name.js
@@ -39,7 +39,8 @@ module["exports"] = [
   "Киров",
   "Чебоксары",
   "Курск",
-  "Брянскm Магнитогорск",
+  "Брянск", 
+  "Магнитогорск",
   "Иваново",
   "Тверь",
   "Ставрополь",
diff --git a/lib/locales/ru/address/street_title.js b/lib/locales/ru/address/street_title.js
index de564a20..f5fd1430 100644
--- a/lib/locales/ru/address/street_title.js
+++ b/lib/locales/ru/address/street_title.js
@@ -49,7 +49,6 @@ module["exports"] = [
   "Парковая",
   "Чкалова",
   "Мичурина",
-  "речень улиц",
   "Подгорная",
   "Дружбы",
   "Почтовая",
diff --git a/lib/locales/ru/index.js b/lib/locales/ru/index.js
index a9a36bc5..b7c66be8 100644
--- a/lib/locales/ru/index.js
+++ b/lib/locales/ru/index.js
@@ -4,6 +4,7 @@ ru.title = "Russian";
 ru.separator = " и ";
 ru.address = require("./address");
 ru.internet = require("./internet");
+ru.lorem = require("./lorem");
 ru.name = require("./name");
 ru.phone_number = require("./phone_number");
 ru.commerce = require("./commerce");
diff --git a/lib/locales/ru/lorem/index.js b/lib/locales/ru/lorem/index.js
new file mode 100644
index 00000000..33080405
--- /dev/null
+++ b/lib/locales/ru/lorem/index.js
@@ -0,0 +1,3 @@
+var lorem = {};
+module["exports"] = lorem;
+lorem.words = require("./words");
diff --git a/lib/locales/ru/lorem/words.js b/lib/locales/ru/lorem/words.js
new file mode 100644
index 00000000..7fa30d91
--- /dev/null
+++ b/lib/locales/ru/lorem/words.js
@@ -0,0 +1,191 @@
+module["exports"] = [
+  "а",
+  "административных",
+  "активизации",
+  "активности",
+  "активом",
+  "актуальность",
+  "анализа",
+  "базы",
+  "богатый",
+  "в",
+  "важную",
+  "важные",
+  "влечёт",
+  "внедрения",
+  "воздействия",
+  "всего",
+  "выбранный",
+  "вызывает",
+  "выполнять",
+  "высокотехнологичная",
+  "высшего",
+  "гражданского",
+  "дальнейшее",
+  "дальнейших",
+  "демократической",
+  "деятельности",
+  "для",
+  "другой",
+  "же",
+  "за",
+  "забывать",
+  "зависит",
+  "задания",
+  "задач",
+  "задача",
+  "занимаемых",
+  "значение",
+  "значимость",
+  "значительной",
+  "и",
+  "играет",
+  "идейные",
+  "изменений",
+  "инновационный",
+  "интересный",
+  "информационно-пропогандистское",
+  "кадров",
+  "кадровой",
+  "качества",
+  "качественно",
+  "количественный",
+  "консультация",
+  "концепция",
+  "кругу",
+  "курс",
+  "массового",
+  "материально-технической",
+  "место",
+  "мира",
+  "модели",
+  "модель",
+  "модернизации",
+  "на",
+  "намеченных",
+  "нами",
+  "направлений",
+  "напрямую",
+  "нас",
+  "настолько",
+  "насущным",
+  "национальный",
+  "начало",
+  "нашей",
+  "не",
+  "новая",
+  "новых",
+  "обеспечение",
+  "обеспечивает",
+  "образом",
+  "обуславливает",
+  "обучения",
+  "общества",
+  "общественной",
+  "обществом",
+  "однако",
+  "определения",
+  "опыт",
+  "организации",
+  "организационной",
+  "особенности",
+  "от",
+  "отметить",
+  "отношении",
+  "оценить",
+  "очевидна",
+  "плановых",
+  "по",
+  "повседневная",
+  "повседневной",
+  "повышение",
+  "повышению",
+  "подготовке",
+  "позволяет",
+  "позиции",
+  "показывает",
+  "понимание",
+  "порядка",
+  "последовательного",
+  "поставленных",
+  "постоянное",
+  "постоянный",
+  "потребностям",
+  "поэтапного",
+  "правительством",
+  "практика",
+  "предложений",
+  "предпосылки",
+  "представляет",
+  "прежде",
+  "принимаемых",
+  "принципов",
+  "проблем",
+  "проверки",
+  "прогресса",
+  "прогрессивного",
+  "проект",
+  "профессионального",
+  "процесс",
+  "путь",
+  "работы",
+  "равным",
+  "развития",
+  "различных",
+  "разнообразный",
+  "разработке",
+  "рамки",
+  "реализация",
+  "ресурсосберегающих",
+  "роль",
+  "рост",
+  "с",
+  "систему",
+  "системы",
+  "следует",
+  "сложившаяся",
+  "собой",
+  "современного",
+  "создаёт",
+  "создание",
+  "сознания",
+  "сомнений",
+  "соображения",
+  "соответствующей",
+  "соответствующих",
+  "социально-ориентированный",
+  "социально-экономическое",
+  "специалистов",
+  "способствует",
+  "степени",
+  "стороны",
+  "структура",
+  "структуры",
+  "существующий",
+  "сущности",
+  "сфера",
+  "также",
+  "таким",
+  "технологий",
+  "требует",
+  "укрепления",
+  "управление",
+  "уровня",
+  "условий",
+  "уточнения",
+  "участия",
+  "участниками",
+  "финансовых",
+  "форм",
+  "формировании",
+  "формированию",
+  "формирования",
+  "целесообразности",
+  "что",
+  "шагов",
+  "широким",
+  "широкому",
+  "экономической",
+  "эксперимент",
+  "этих"
+];
diff --git a/lib/locales/ru/name/index.js b/lib/locales/ru/name/index.js
index 59b00ba6..772a2d8c 100644
--- a/lib/locales/ru/name/index.js
+++ b/lib/locales/ru/name/index.js
@@ -1,11 +1,12 @@
 var name = {};
 module['exports'] = name;
-name.male_first_name = require("./male_first_name");
-name.male_middle_name = require("./male_middle_name");
-name.male_last_name = require("./male_last_name");
 name.female_first_name = require("./female_first_name");
-name.female_middle_name = require("./female_middle_name");
 name.female_last_name = require("./female_last_name");
+name.female_middle_name = require("./female_middle_name");
+name.male_first_name = require("./male_first_name");
+name.male_last_name = require("./male_last_name");
+name.male_middle_name = require("./male_middle_name");
+name.name = require("./name");
 name.prefix = require("./prefix");
 name.suffix = require("./suffix");
-name.name = require("./name");
+name.title = require("./title");
diff --git a/lib/locales/ru/name/title.js b/lib/locales/ru/name/title.js
new file mode 100644
index 00000000..667e9756
--- /dev/null
+++ b/lib/locales/ru/name/title.js
@@ -0,0 +1,42 @@
+module["exports"] = {
+  "descriptor": [
+    "Ведущий",
+    "Генеральный",
+    "Главный",
+    "Глобальный",
+    "Международный",
+    "Национальный",
+    "Областной",
+    "Районный",
+    "Региональный",
+    "Центральный"
+  ],
+  "level": [
+    "интеграционный",
+    "логистический",
+    "маркетинговый",
+    "оптимизационный",
+    "страховой",
+    "функциональный",
+    "коммуникационный",
+    "операционный"
+  ],
+  "job": [
+    "агент",
+    "администратор",
+    "аналитик",
+    "архитектор",
+    "дизайнер",
+    "инженер",
+    "консультант",
+    "координатор",
+    "менеджер",
+    "планировщик",
+    "помощник",
+    "разработчик",
+    "руководитель",
+    "сотрудник",
+    "специалист",
+    "техник"
+  ]
+};
diff --git a/lib/locales/sk/name/name.js b/lib/locales/sk/name/name.js
index 09beaf04..b1e852c5 100644
--- a/lib/locales/sk/name/name.js
+++ b/lib/locales/sk/name/name.js
@@ -1,12 +1,12 @@
 module["exports"] = [
-  "#{prefix} #{man_first_name} #{man_last_name}",
-  "#{prefix} #{woman_first_name} #{woman_last_name}",
-  "#{man_first_name} #{man_last_name} #{suffix}",
-  "#{woman_first_name} #{woman_last_name} #{suffix}",
-  "#{man_first_name} #{man_last_name}",
-  "#{man_first_name} #{man_last_name}",
-  "#{man_first_name} #{man_last_name}",
-  "#{woman_first_name} #{woman_last_name}",
-  "#{woman_first_name} #{woman_last_name}",
-  "#{woman_first_name} #{woman_last_name}"
+  "#{prefix} #{male_first_name} #{male_last_name}",
+  "#{prefix} #{female_first_name} #{female_last_name}",
+  "#{male_first_name} #{male_last_name} #{suffix}",
+  "#{female_first_name} #{female_last_name} #{suffix}",
+  "#{male_first_name} #{male_last_name}",
+  "#{male_first_name} #{male_last_name}",
+  "#{male_first_name} #{male_last_name}",
+  "#{female_first_name} #{female_last_name}",
+  "#{female_first_name} #{female_last_name}",
+  "#{female_first_name} #{female_last_name}"
 ];
diff --git a/lib/locales/sv/commerce/product_name.js b/lib/locales/sv/commerce/product_name.js
index dc89271e..e5fdebf1 100644
--- a/lib/locales/sv/commerce/product_name.js
+++ b/lib/locales/sv/commerce/product_name.js
@@ -6,7 +6,7 @@ module["exports"] = {
     "Intelligent",
     "Söt",
     "Otrolig",
-    "Fatastisk",
+    "Fantastisk",
     "Praktisk",
     "Slimmad",
     "Grym"
@@ -17,8 +17,8 @@ module["exports"] = {
     "Trä",
     "Betong",
     "Plast",
-    "Bomul",
-    "Grnit",
+    "Bomull",
+    "Granit",
     "Gummi",
     "Latex"
   ],
@@ -27,10 +27,10 @@ module["exports"] = {
     "Bil",
     "Dator",
     "Handskar",
-    "Pants",
-    "Shirt",
-    "Table",
-    "Shoes",
-    "Hat"
+    "Byxor",
+    "Skjorta",
+    "Bord",
+    "Skor",
+    "Hatt"
   ]
 };
diff --git a/lib/locales/vi/address/city_root.js b/lib/locales/vi/address/city_root.js
index 242a71a5..8bf56ea2 100644
--- a/lib/locales/vi/address/city_root.js
+++ b/lib/locales/vi/address/city_root.js
@@ -1,65 +1,65 @@
 module["exports"] = [
-  "Bắc Giang",
+  "An Giang",
+  "Bà Rịa-Vũng Tàu",
+  "Bạc Liêu",
   "Bắc Kạn",
+  "Bắc Giang",
   "Bắc Ninh",
+  "Bến Tre",
+  "Bình Dương",
+  "Bình Định",
+  "Bình Phước",
+  "Bình Thuận",
+  "Cà Mau",
   "Cao Bằng",
+  "Cần Thơ",
+  "Đà Nẵng",
+  "Đắk Lắk",
+  "Đắk Nông",
   "Điện Biên",
+  "Đồng Nai",
+  "Đồng Tháp",
+  "Gia Lai",
   "Hà Giang",
   "Hà Nam",
-  "Hà Tây",
+  "Hà Nội",
+  "Hà Tĩnh",
   "Hải Dương",
-  "TP Hải Phòng",
+  "Hải Phòng",
+  "Hậu Giang",
   "Hòa Bình",
+  "TP. Hồ Chí Minh",
   "Hưng Yên",
+  "Khánh Hoà",
+  "Kiên Giang",
+  "Kon Tum",
   "Lai Châu",
-  "Lào Cai",
   "Lạng Sơn",
+  "Lào Cai",
+  "Lâm Đồng",
+  "Long An",
   "Nam Định",
+  "Nghệ An",
   "Ninh Bình",
+  "Ninh Thuận",
   "Phú Thọ",
-  "Quảng Ninh",
-  "Sơn La",
-  "Thái Bình",
-  "Thái Nguyên",
-  "Tuyên Quang",
-  "Vĩnh Phúc",
-  "Yên Bái",
-  "TP Đà Nẵng",
-  "Bình Định",
-  "Đắk Lắk",
-  "Đắk Nông",
-  "Gia Lai",
-  "Hà Tĩnh",
-  "Khánh Hòa",
-  "Kon Tum",
-  "Nghệ An",
   "Phú Yên",
   "Quảng Bình",
   "Quảng Nam",
   "Quảng Ngãi",
+  "Quảng Ninh",
   "Quảng Trị",
-  "Thanh Hóa",
-  "Thừa Thiên Huế",
-  "TP TP. Hồ Chí Minh",
-  "An Giang",
-  "Bà Rịa Vũng Tàu",
-  "Bạc Liêu",
-  "Bến Tre",
-  "Bình Dương",
-  "Bình Phước",
-  "Bình Thuận",
-  "Cà Mau",
-  "TP Cần Thơ",
-  "Đồng Nai",
-  "Đồng Tháp",
-  "Hậu Giang",
-  "Kiên Giang",
-  "Lâm Đồng",
-  "Long An",
-  "Ninh Thuận",
   "Sóc Trăng",
+  "Sơn La",
   "Tây Ninh",
+  "Thái Bình",
+  "Thái Nguyên",
+  "Thanh Hoá",
+  "Thừa Thiên-Huế",
   "Tiền Giang",
   "Trà Vinh",
-  "Vĩnh Long"
+  "Tuyên Quang",
+  "Vĩnh Long",
+  "Vĩnh Phúc",
+  "Yên Bái"
 ];
diff --git a/lib/locales/vi/address/country.js b/lib/locales/vi/address/country.js
new file mode 100644
index 00000000..e7bd4709
--- /dev/null
+++ b/lib/locales/vi/address/country.js
@@ -0,0 +1,195 @@
+module["exports"] = [

+  "Afghanistan",

+  "Ai Cập",

+  "Albania",

+  "Algérie",

+  "Andorra",

+  "Angola",

+  "Vương quốc Liên hiệp Anh và Bắc Ireland",

+  "Antigua và Barbuda",

+  "Áo",

+  "Ả Rập Xê Út",

+  "Argentina",

+  "Armenia",

+  "Azerbaijan",

+  "Ấn Độ",

+  "Bahamas",

+  "Bahrain",

+  "Bangladesh",

+  "Barbados",

+  "Belarus",

+  "Belize",

+  "Bénin",

+  "Bhutan",

+  "Bỉ",

+  "Bolivia",

+  "Bosna và Hercegovina",

+  "Botswana",

+  "Bồ Đào Nha",

+  "Bờ Biển Ngà",

+  "Brasil",

+  "Brunei",

+  "Bulgaria",

+  "Burkina Faso",

+  "Burundi",

+  "Cabo Verde",

+  "Các Tiểu Vương quốc Ả Rập Thống nhất",

+  "Cameroon",

+  "Campuchia",

+  "Canada",

+  "Chile",

+  "Colombia",

+  "Comoros",

+  "Cộng hòa Congo",

+  "Cộng hòa Dân chủ Congo",

+  "Costa Rica",

+  "Croatia",

+  "Cuba",

+  "Djibouti",

+  "Dominica",

+  "Cộng hòa Dominica",

+  "Đan Mạch",

+  "Đông Timor",

+  "Đức",

+  "Ecuador",

+  "El Salvador",

+  "Eritrea",

+  "Estonia",

+  "Ethiopia",

+  "Fiji",

+  "Gabon",

+  "Gambia",

+  "Ghana",

+  "Grenada",

+  "Gruzia",

+  "Guatemala",

+  "Guiné-Bissau",

+  "Guinea Xích Đạo",

+  "Guinée",

+  "Guyana",

+  "Haiti",

+  "Hà Lan",

+  "Hàn Quốc",

+  "Hoa Kỳ",

+  "Honduras",

+  "Hungary",

+  "Hy Lạp",

+  "Iceland",

+  "Indonesia",

+  "Iran",

+  "Iraq",

+  "Ireland",

+  "Israel",

+  "Jamaica",

+  "Jordan",

+  "Kazakhstan",

+  "Kenya",

+  "Kiribati",

+  "Kosovo",

+  "Kuwait",

+  "Kyrgyzstan",

+  "Lào",

+  "Latvia",

+  "Lesotho",

+  "Liban",

+  "Liberia",

+  "Libya",

+  "Liechtenstein",

+  "Litva",

+  "Luxembourg",

+  "Macedonia",

+  "Madagascar",

+  "Malaysia",

+  "Mali",

+  "Malta",

+  "Maroc",

+  "Quần đảo Marshall",

+  "Mauritanie",

+  "Mauritius",

+  "México",

+  "Micronesia",

+  "Moldova",

+  "Monaco",

+  "Mông Cổ",

+  "Montenegro",

+  "Mozambique",

+  "Myanmar",

+  "Namibia",

+  "Nam Sudan",

+  "Nam Phi",

+  "Nauru",

+  "Na Uy",

+  "Nepal",

+  "New Zealand",

+  "Nicaragua",

+  "Niger",

+  "Nigeria",

+  "Nga",

+  "Nhật Bản",

+  "Oman",

+  "Pakistan",

+  "Palau",

+  "Palestine",

+  "Panama",

+  "Papua New Guinea",

+  "Paraguay",

+  "Peru",

+  "Pháp",

+  "Phần Lan",

+  "Philippines",

+  "Qatar",

+  "România",

+  "Rwanda",

+  "Saint Kitts và Nevis",

+  "Saint Lucia",

+  "Saint Vincent và Grenadines",

+  "Samoa",

+  "San Marino",

+  "São Tomé và Príncipe",

+  "Séc",

+  "Sénégal",

+  "Serbia",

+  "Seychelles",

+  "Sierra Leone",

+  "Singapore",

+  "Síp",

+  "Slovakia",

+  "Slovenia",

+  "Solomon",

+  "Somalia",

+  "Sri Lanka",

+  "Sudan",

+  "Suriname",

+  "Swaziland",

+  "Syria",

+  "Tajikistan",

+  "Tanzania",

+  "Tây Ban Nha",

+  "Tchad",

+  "Thái Lan",

+  "Thổ Nhĩ Kỳ",

+  "Thụy Điển",

+  "Thụy Sĩ",

+  "Togo",

+  "Tonga",

+  "Triều Tiên",

+  "Trinidad và Tobago",

+  "Trung Quốc",

+  "Trung Phi",

+  "Tunisia",

+  "Turkmenistan",

+  "Tuvalu",

+  "Úc",

+  "Uganda",

+  "Ukraina",

+  "Uruguay",

+  "Uzbekistan",

+  "Vanuatu",

+  "Vatican",

+  "Venezuela",

+  "Việt Nam",

+  "Ý",

+  "Yemen",

+  "Zambia",

+  "Zimbabwe"

+];

diff --git a/lib/locales/vi/address/county.js b/lib/locales/vi/address/county.js
deleted file mode 100644
index 0e14002d..00000000
--- a/lib/locales/vi/address/county.js
+++ /dev/null
@@ -1,73 +0,0 @@
-module["exports"] = [
-  "Avon",
-  "Bedfordshire",
-  "Berkshire",
-  "Borders",
-  "Buckinghamshire",
-  "Cambridgeshire",
-  "Central",
-  "Cheshire",
-  "Cleveland",
-  "Clwyd",
-  "Cornwall",
-  "County Antrim",
-  "County Armagh",
-  "County Down",
-  "County Fermanagh",
-  "County Londonderry",
-  "County Tyrone",
-  "Cumbria",
-  "Derbyshire",
-  "Devon",
-  "Dorset",
-  "Dumfries and Galloway",
-  "Durham",
-  "Dyfed",
-  "East Sussex",
-  "Essex",
-  "Fife",
-  "Gloucestershire",
-  "Grampian",
-  "Greater Manchester",
-  "Gwent",
-  "Gwynedd County",
-  "Hampshire",
-  "Herefordshire",
-  "Hertfordshire",
-  "Highlands and Islands",
-  "Humberside",
-  "Isle of Wight",
-  "Kent",
-  "Lancashire",
-  "Leicestershire",
-  "Lincolnshire",
-  "Lothian",
-  "Merseyside",
-  "Mid Glamorgan",
-  "Norfolk",
-  "North Yorkshire",
-  "Northamptonshire",
-  "Northumberland",
-  "Nottinghamshire",
-  "Oxfordshire",
-  "Powys",
-  "Rutland",
-  "Shropshire",
-  "Somerset",
-  "South Glamorgan",
-  "South Yorkshire",
-  "Staffordshire",
-  "Strathclyde",
-  "Suffolk",
-  "Surrey",
-  "Tayside",
-  "Tyne and Wear",
-  "Việt Nam",
-  "Warwickshire",
-  "West Glamorgan",
-  "West Midlands",
-  "West Sussex",
-  "West Yorkshire",
-  "Wiltshire",
-  "Worcestershire"
-];
diff --git a/lib/locales/vi/address/index.js b/lib/locales/vi/address/index.js
index 5b3b16ee..676be305 100644
--- a/lib/locales/vi/address/index.js
+++ b/lib/locales/vi/address/index.js
@@ -2,5 +2,6 @@ var address = {};
 module['exports'] = address;
 address.city_root = require("./city_root");
 address.city = require("./city");
-address.county = require("./county");
 address.default_country = require("./default_country");
+address.postcode = require("./postcode");
+address.country = require("./country");
diff --git a/lib/locales/vi/address/postcode.js b/lib/locales/vi/address/postcode.js
new file mode 100644
index 00000000..43599e57
--- /dev/null
+++ b/lib/locales/vi/address/postcode.js
@@ -0,0 +1,3 @@
+module["exports"] = [

+  "#####"

+];

diff --git a/lib/locales/vi/cell_phone/formats.js b/lib/locales/vi/cell_phone/formats.js
index f0093f3d..ecb7c41e 100644
--- a/lib/locales/vi/cell_phone/formats.js
+++ b/lib/locales/vi/cell_phone/formats.js
@@ -1,8 +1,7 @@
 module["exports"] = [
-  "074## ######",
-  "075## ######",
-  "076## ######",
-  "077## ######",
-  "078## ######",
-  "079## ######"
+  "03# ### ####",
+  "05# ### ####",
+  "07# ### ####",
+  "08# ### ####",
+  "09# ### ####"
 ];
diff --git a/lib/locales/vi/date/index.js b/lib/locales/vi/date/index.js
new file mode 100644
index 00000000..8c45d3f6
--- /dev/null
+++ b/lib/locales/vi/date/index.js
@@ -0,0 +1,4 @@
+var date = {};
+module["exports"] = date;
+date.month = require("./month");
+date.weekday = require("./weekday");
diff --git a/lib/locales/vi/date/month.js b/lib/locales/vi/date/month.js
new file mode 100644
index 00000000..9f3cb1c6
--- /dev/null
+++ b/lib/locales/vi/date/month.js
@@ -0,0 +1,63 @@
+// Source: http://unicode.org/cldr/trac/browser/tags/release-27/common/main/en.xml#L1799
+module["exports"] = {
+  wide: [
+    "Tháng Giêng",
+    "Tháng Hai",
+    "Tháng Ba",
+    "Tháng Tư",
+    "Tháng Năm",
+    "Tháng Sáu",
+    "Tháng Bảy",
+    "Tháng Tám",
+    "Tháng Chín",
+    "Tháng Mười",
+    "Tháng Mười Một",
+    "Tháng Mười Hai"
+  ],
+  // Property "wide_context" is optional, if not set then "wide" will be used instead
+  // It is used to specify a word in context, which may differ from a stand-alone word
+  wide_context: [
+    "Tháng Giêng",
+    "Tháng Hai",
+    "Tháng Ba",
+    "Tháng Tư",
+    "Tháng Năm",
+    "Tháng Sáu",
+    "Tháng Bảy",
+    "Tháng Tám",
+    "Tháng Chín",
+    "Tháng Mười",
+    "Tháng Mười Một",
+    "Tháng Mười Hai"
+  ],
+  abbr: [
+    "Tháng 1",
+    "Tháng 2",
+    "Tháng 3",
+    "Tháng 4",
+    "Tháng 5",
+    "Tháng 6",
+    "Tháng 7",
+    "Tháng 8",
+    "Tháng 9",
+    "Tháng 10",
+    "Tháng 11",
+    "Tháng 12"
+  ],
+  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
+  // It is used to specify a word in context, which may differ from a stand-alone word
+  abbr_context: [
+    "Tháng 1",
+    "Tháng 2",
+    "Tháng 3",
+    "Tháng 4",
+    "Tháng 5",
+    "Tháng 6",
+    "Tháng 7",
+    "Tháng 8",
+    "Tháng 9",
+    "Tháng 10",
+    "Tháng 11",
+    "Tháng 12"
+  ]
+};
diff --git a/lib/locales/vi/date/weekday.js b/lib/locales/vi/date/weekday.js
new file mode 100644
index 00000000..18eeca76
--- /dev/null
+++ b/lib/locales/vi/date/weekday.js
@@ -0,0 +1,43 @@
+// Source: http://unicode.org/cldr/trac/browser/tags/release-27/common/main/en.xml#L1847
+module["exports"] = {
+  wide: [
+    "Chủ nhật",
+    "Thứ hai",
+    "Thứ ba",
+    "Thứ tư",
+    "Thứ năm",
+    "Thứ sáu",
+    "Thứ bảy"
+  ],
+  // Property "wide_context" is optional, if not set then "wide" will be used instead
+  // It is used to specify a word in context, which may differ from a stand-alone word
+  wide_context: [
+    "Chủ nhật",
+    "Thứ hai",
+    "Thứ ba",
+    "Thứ tư",
+    "Thứ năm",
+    "Thứ sáu",
+    "Thứ bảy"
+  ],
+  abbr: [
+    "CN",
+    "T2",
+    "T3",
+    "T4",
+    "T5",
+    "T6",
+    "T7",
+  ],
+  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
+  // It is used to specify a word in context, which may differ from a stand-alone word
+  abbr_context: [
+    "C.Nhật",
+    "Thứ 2",
+    "Thứ 3",
+    "Thứ 4",
+    "Thứ 5",
+    "Thứ 6",
+    "Thứ 7",
+  ]
+};
diff --git a/lib/locales/vi/index.js b/lib/locales/vi/index.js
index 0fb639ec..427211d7 100644
--- a/lib/locales/vi/index.js
+++ b/lib/locales/vi/index.js
@@ -8,3 +8,4 @@ vi.cell_phone = require("./cell_phone");
 vi.name = require("./name");
 vi.company = require("./company");
 vi.lorem = require("./lorem");
+vi.date = require("./date");
diff --git a/lib/locales/vi/phone_number/formats.js b/lib/locales/vi/phone_number/formats.js
index b8164833..69b372ea 100644
--- a/lib/locales/vi/phone_number/formats.js
+++ b/lib/locales/vi/phone_number/formats.js
@@ -1,17 +1,4 @@
 module["exports"] = [
-  "01#### #####",
-  "01### ######",
-  "01#1 ### ####",
-  "011# ### ####",
   "02# #### ####",
-  "03## ### ####",
-  "055 #### ####",
-  "056 #### ####",
-  "0800 ### ####",
-  "08## ### ####",
-  "09## ### ####",
-  "016977 ####",
-  "01### #####",
-  "0500 ######",
-  "0800 ######"
+  "02## #### ####"
 ];
diff --git a/lib/locales/zh_CN/name/first_name.js b/lib/locales/zh_CN/name/first_name.js
index 0f3897b3..eebd2199 100644
--- a/lib/locales/zh_CN/name/first_name.js
+++ b/lib/locales/zh_CN/name/first_name.js
@@ -1,102 +1,136 @@
 module["exports"] = [
-  "王",
-  "李",
-  "张",
-  "刘",
-  "陈",
-  "杨",
-  "黄",
-  "吴",
-  "赵",
-  "周",
-  "徐",
-  "孙",
-  "马",
-  "朱",
-  "胡",
-  "林",
-  "郭",
-  "何",
-  "高",
-  "罗",
-  "郑",
-  "梁",
-  "谢",
-  "宋",
-  "唐",
-  "许",
-  "邓",
-  "冯",
-  "韩",
-  "曹",
-  "曾",
-  "彭",
-  "萧",
-  "蔡",
-  "潘",
-  "田",
-  "董",
-  "袁",
-  "于",
-  "余",
-  "叶",
-  "蒋",
-  "杜",
-  "苏",
-  "魏",
-  "程",
-  "吕",
-  "丁",
-  "沈",
-  "任",
-  "姚",
-  "卢",
-  "傅",
-  "钟",
-  "姜",
-  "崔",
-  "谭",
-  "廖",
-  "范",
-  "汪",
-  "陆",
-  "金",
-  "石",
-  "戴",
-  "贾",
-  "韦",
-  "夏",
-  "邱",
-  "方",
-  "侯",
-  "邹",
-  "熊",
-  "孟",
-  "秦",
-  "白",
-  "江",
-  "阎",
-  "薛",
-  "尹",
-  "段",
-  "雷",
-  "黎",
-  "史",
-  "龙",
-  "陶",
-  "贺",
-  "顾",
-  "毛",
-  "郝",
-  "龚",
-  "邵",
-  "万",
-  "钱",
-  "严",
-  "赖",
-  "覃",
-  "洪",
-  "武",
-  "莫",
-  "孔"
+  "绍齐",
+  "博文",
+  "梓晨",
+  "胤祥",
+  "瑞霖",
+  "明哲",
+  "天翊",
+  "凯瑞",
+  "健雄",
+  "耀杰",
+  "潇然",
+  "子涵",
+  "越彬",
+  "钰轩",
+  "智辉",
+  "致远",
+  "俊驰",
+  "雨泽",
+  "烨磊",
+  "晟睿",
+  "文昊",
+  "修洁",
+  "黎昕",
+  "远航",
+  "旭尧",
+  "鸿涛",
+  "伟祺",
+  "荣轩",
+  "越泽",
+  "浩宇",
+  "瑾瑜",
+  "皓轩",
+  "擎苍",
+  "擎宇",
+  "志泽",
+  "子轩",
+  "睿渊",
+  "弘文",
+  "哲瀚",
+  "雨泽",
+  "楷瑞",
+  "建辉",
+  "晋鹏",
+  "天磊",
+  "绍辉",
+  "泽洋",
+  "鑫磊",
+  "鹏煊",
+  "昊强",
+  "伟宸",
+  "博超",
+  "君浩",
+  "子骞",
+  "鹏涛",
+  "炎彬",
+  "鹤轩",
+  "越彬",
+  "风华",
+  "靖琪",
+  "明辉",
+  "伟诚",
+  "明轩",
+  "健柏",
+  "修杰",
+  "志泽",
+  "弘文",
+  "峻熙",
+  "嘉懿",
+  "煜城",
+  "懿轩",
+  "烨伟",
+  "苑博",
+  "伟泽",
+  "熠彤",
+  "鸿煊",
+  "博涛",
+  "烨霖",
+  "烨华",
+  "煜祺",
+  "智宸",
+  "正豪",
+  "昊然",
+  "明杰",
+  "立诚",
+  "立轩",
+  "立辉",
+  "峻熙",
+  "弘文",
+  "熠彤",
+  "鸿煊",
+  "烨霖",
+  "哲瀚",
+  "鑫鹏",
+  "昊天",
+  "思聪",
+  "展鹏",
+  "笑愚",
+  "志强",
+  "炫明",
+  "雪松",
+  "思源",
+  "智渊",
+  "思淼",
+  "晓啸",
+  "天宇",
+  "浩然",
+  "文轩",
+  "鹭洋",
+  "振家",
+  "乐驹",
+  "晓博",
+  "文博",
+  "昊焱",
+  "立果",
+  "金鑫",
+  "锦程",
+  "嘉熙",
+  "鹏飞",
+  "子默",
+  "思远",
+  "浩轩",
+  "语堂",
+  "聪健",
+  "明",
+  "文",
+  "果",
+  "思",
+  "鹏",
+  "驰",
+  "涛",
+  "琪",
+  "浩",
+  "航",
+  "彬"
 ];
diff --git a/lib/locales/zh_CN/name/last_name.js b/lib/locales/zh_CN/name/last_name.js
index eebd2199..0f3897b3 100644
--- a/lib/locales/zh_CN/name/last_name.js
+++ b/lib/locales/zh_CN/name/last_name.js
@@ -1,136 +1,102 @@
 module["exports"] = [
-  "绍齐",
-  "博文",
-  "梓晨",
-  "胤祥",
-  "瑞霖",
-  "明哲",
-  "天翊",
-  "凯瑞",
-  "健雄",
-  "耀杰",
-  "潇然",
-  "子涵",
-  "越彬",
-  "钰轩",
-  "智辉",
-  "致远",
-  "俊驰",
-  "雨泽",
-  "烨磊",
-  "晟睿",
-  "文昊",
-  "修洁",
-  "黎昕",
-  "远航",
-  "旭尧",
-  "鸿涛",
-  "伟祺",
-  "荣轩",
-  "越泽",
-  "浩宇",
-  "瑾瑜",
-  "皓轩",
-  "擎苍",
-  "擎宇",
-  "志泽",
-  "子轩",
-  "睿渊",
-  "弘文",
-  "哲瀚",
-  "雨泽",
-  "楷瑞",
-  "建辉",
-  "晋鹏",
-  "天磊",
-  "绍辉",
-  "泽洋",
-  "鑫磊",
-  "鹏煊",
-  "昊强",
-  "伟宸",
-  "博超",
-  "君浩",
-  "子骞",
-  "鹏涛",
-  "炎彬",
-  "鹤轩",
-  "越彬",
-  "风华",
-  "靖琪",
-  "明辉",
-  "伟诚",
-  "明轩",
-  "健柏",
-  "修杰",
-  "志泽",
-  "弘文",
-  "峻熙",
-  "嘉懿",
-  "煜城",
-  "懿轩",
-  "烨伟",
-  "苑博",
-  "伟泽",
-  "熠彤",
-  "鸿煊",
-  "博涛",
-  "烨霖",
-  "烨华",
-  "煜祺",
-  "智宸",
-  "正豪",
-  "昊然",
-  "明杰",
-  "立诚",
-  "立轩",
-  "立辉",
-  "峻熙",
-  "弘文",
-  "熠彤",
-  "鸿煊",
-  "烨霖",
-  "哲瀚",
-  "鑫鹏",
-  "昊天",
-  "思聪",
-  "展鹏",
-  "笑愚",
-  "志强",
-  "炫明",
-  "雪松",
-  "思源",
-  "智渊",
-  "思淼",
-  "晓啸",
-  "天宇",
-  "浩然",
-  "文轩",
-  "鹭洋",
-  "振家",
-  "乐驹",
-  "晓博",
-  "文博",
-  "昊焱",
-  "立果",
-  "金鑫",
-  "锦程",
-  "嘉熙",
-  "鹏飞",
-  "子默",
-  "思远",
-  "浩轩",
-  "语堂",
-  "聪健",
-  "明",
-  "文",
-  "果",
-  "思",
-  "鹏",
-  "驰",
-  "涛",
-  "琪",
-  "浩",
-  "航",
-  "彬"
+  "王",
+  "李",
+  "张",
+  "刘",
+  "陈",
+  "杨",
+  "黄",
+  "吴",
+  "赵",
+  "周",
+  "徐",
+  "孙",
+  "马",
+  "朱",
+  "胡",
+  "林",
+  "郭",
+  "何",
+  "高",
+  "罗",
+  "郑",
+  "梁",
+  "谢",
+  "宋",
+  "唐",
+  "许",
+  "邓",
+  "冯",
+  "韩",
+  "曹",
+  "曾",
+  "彭",
+  "萧",
+  "蔡",
+  "潘",
+  "田",
+  "董",
+  "袁",
+  "于",
+  "余",
+  "叶",
+  "蒋",
+  "杜",
+  "苏",
+  "魏",
+  "程",
+  "吕",
+  "丁",
+  "沈",
+  "任",
+  "姚",
+  "卢",
+  "傅",
+  "钟",
+  "姜",
+  "崔",
+  "谭",
+  "廖",
+  "范",
+  "汪",
+  "陆",
+  "金",
+  "石",
+  "戴",
+  "贾",
+  "韦",
+  "夏",
+  "邱",
+  "方",
+  "侯",
+  "邹",
+  "熊",
+  "孟",
+  "秦",
+  "白",
+  "江",
+  "阎",
+  "薛",
+  "尹",
+  "段",
+  "雷",
+  "黎",
+  "史",
+  "龙",
+  "陶",
+  "贺",
+  "顾",
+  "毛",
+  "郝",
+  "龚",
+  "邵",
+  "万",
+  "钱",
+  "严",
+  "赖",
+  "覃",
+  "洪",
+  "武",
+  "莫",
+  "孔"
 ];
diff --git a/lib/locales/zh_CN/phone_number/formats.js b/lib/locales/zh_CN/phone_number/formats.js
index 60177513..3f74f9a9 100644
--- a/lib/locales/zh_CN/phone_number/formats.js
+++ b/lib/locales/zh_CN/phone_number/formats.js
@@ -1,5 +1,5 @@
 module["exports"] = [
-  "###-########",
-  "####-########",
-  "###########"
+  "0##-########",
+  "0###-########",
+  "1##########"
 ];
diff --git a/lib/locales/zh_TW/name/first_name.js b/lib/locales/zh_TW/name/first_name.js
index 55675aca..ca1c0273 100644
--- a/lib/locales/zh_TW/name/first_name.js
+++ b/lib/locales/zh_TW/name/first_name.js
@@ -1,102 +1,125 @@
 module["exports"] = [
-  "王",
-  "李",
-  "張",
-  "劉",
-  "陳",
-  "楊",
-  "黃",
-  "吳",
-  "趙",
-  "週",
-  "徐",
-  "孫",
-  "馬",
-  "朱",
-  "胡",
-  "林",
-  "郭",
-  "何",
-  "高",
-  "羅",
-  "鄭",
-  "梁",
-  "謝",
-  "宋",
-  "唐",
-  "許",
-  "鄧",
-  "馮",
-  "韓",
-  "曹",
-  "曾",
-  "彭",
-  "蕭",
-  "蔡",
-  "潘",
-  "田",
-  "董",
-  "袁",
-  "於",
-  "餘",
-  "葉",
-  "蔣",
-  "杜",
-  "蘇",
-  "魏",
-  "程",
-  "呂",
-  "丁",
-  "沈",
-  "任",
-  "姚",
-  "盧",
-  "傅",
-  "鐘",
-  "姜",
-  "崔",
-  "譚",
-  "廖",
-  "範",
-  "汪",
-  "陸",
-  "金",
-  "石",
-  "戴",
-  "賈",
-  "韋",
-  "夏",
-  "邱",
-  "方",
-  "侯",
-  "鄒",
-  "熊",
-  "孟",
-  "秦",
-  "白",
-  "江",
-  "閻",
-  "薛",
-  "尹",
-  "段",
-  "雷",
-  "黎",
-  "史",
-  "龍",
-  "陶",
-  "賀",
-  "顧",
-  "毛",
-  "郝",
-  "龔",
-  "邵",
-  "萬",
-  "錢",
-  "嚴",
-  "賴",
-  "覃",
-  "洪",
-  "武",
-  "莫",
-  "孔"
+  "紹齊",
+  "博文",
+  "梓晨",
+  "胤祥",
+  "瑞霖",
+  "明哲",
+  "天翊",
+  "凱瑞",
+  "健雄",
+  "耀傑",
+  "瀟然",
+  "子涵",
+  "越彬",
+  "鈺軒",
+  "智輝",
+  "致遠",
+  "俊馳",
+  "雨澤",
+  "燁磊",
+  "晟睿",
+  "文昊",
+  "修潔",
+  "黎昕",
+  "遠航",
+  "旭堯",
+  "鴻濤",
+  "偉祺",
+  "榮軒",
+  "越澤",
+  "浩宇",
+  "瑾瑜",
+  "皓軒",
+  "擎蒼",
+  "擎宇",
+  "志澤",
+  "子軒",
+  "睿淵",
+  "弘文",
+  "哲瀚",
+  "雨澤",
+  "楷瑞",
+  "建輝",
+  "晉鵬",
+  "天磊",
+  "紹輝",
+  "澤洋",
+  "鑫磊",
+  "鵬煊",
+  "昊強",
+  "偉宸",
+  "博超",
+  "君浩",
+  "子騫",
+  "鵬濤",
+  "炎彬",
+  "鶴軒",
+  "越彬",
+  "風華",
+  "靖琪",
+  "明輝",
+  "偉誠",
+  "明軒",
+  "健柏",
+  "修傑",
+  "志澤",
+  "弘文",
+  "峻熙",
+  "嘉懿",
+  "煜城",
+  "懿軒",
+  "燁偉",
+  "苑博",
+  "偉澤",
+  "熠彤",
+  "鴻煊",
+  "博濤",
+  "燁霖",
+  "燁華",
+  "煜祺",
+  "智宸",
+  "正豪",
+  "昊然",
+  "明杰",
+  "立誠",
+  "立軒",
+  "立輝",
+  "峻熙",
+  "弘文",
+  "熠彤",
+  "鴻煊",
+  "燁霖",
+  "哲瀚",
+  "鑫鵬",
+  "昊天",
+  "思聰",
+  "展鵬",
+  "笑愚",
+  "志強",
+  "炫明",
+  "雪松",
+  "思源",
+  "智淵",
+  "思淼",
+  "曉嘯",
+  "天宇",
+  "浩然",
+  "文軒",
+  "鷺洋",
+  "振家",
+  "樂駒",
+  "曉博",
+  "文博",
+  "昊焱",
+  "立果",
+  "金鑫",
+  "錦程",
+  "嘉熙",
+  "鵬飛",
+  "子默",
+  "思遠",
+  "浩軒",
+  "語堂",
+  "聰健"
 ];
diff --git a/lib/locales/zh_TW/name/last_name.js b/lib/locales/zh_TW/name/last_name.js
index ca1c0273..55675aca 100644
--- a/lib/locales/zh_TW/name/last_name.js
+++ b/lib/locales/zh_TW/name/last_name.js
@@ -1,125 +1,102 @@
 module["exports"] = [
-  "紹齊",
-  "博文",
-  "梓晨",
-  "胤祥",
-  "瑞霖",
-  "明哲",
-  "天翊",
-  "凱瑞",
-  "健雄",
-  "耀傑",
-  "瀟然",
-  "子涵",
-  "越彬",
-  "鈺軒",
-  "智輝",
-  "致遠",
-  "俊馳",
-  "雨澤",
-  "燁磊",
-  "晟睿",
-  "文昊",
-  "修潔",
-  "黎昕",
-  "遠航",
-  "旭堯",
-  "鴻濤",
-  "偉祺",
-  "榮軒",
-  "越澤",
-  "浩宇",
-  "瑾瑜",
-  "皓軒",
-  "擎蒼",
-  "擎宇",
-  "志澤",
-  "子軒",
-  "睿淵",
-  "弘文",
-  "哲瀚",
-  "雨澤",
-  "楷瑞",
-  "建輝",
-  "晉鵬",
-  "天磊",
-  "紹輝",
-  "澤洋",
-  "鑫磊",
-  "鵬煊",
-  "昊強",
-  "偉宸",
-  "博超",
-  "君浩",
-  "子騫",
-  "鵬濤",
-  "炎彬",
-  "鶴軒",
-  "越彬",
-  "風華",
-  "靖琪",
-  "明輝",
-  "偉誠",
-  "明軒",
-  "健柏",
-  "修傑",
-  "志澤",
-  "弘文",
-  "峻熙",
-  "嘉懿",
-  "煜城",
-  "懿軒",
-  "燁偉",
-  "苑博",
-  "偉澤",
-  "熠彤",
-  "鴻煊",
-  "博濤",
-  "燁霖",
-  "燁華",
-  "煜祺",
-  "智宸",
-  "正豪",
-  "昊然",
-  "明杰",
-  "立誠",
-  "立軒",
-  "立輝",
-  "峻熙",
-  "弘文",
-  "熠彤",
-  "鴻煊",
-  "燁霖",
-  "哲瀚",
-  "鑫鵬",
-  "昊天",
-  "思聰",
-  "展鵬",
-  "笑愚",
-  "志強",
-  "炫明",
-  "雪松",
-  "思源",
-  "智淵",
-  "思淼",
-  "曉嘯",
-  "天宇",
-  "浩然",
-  "文軒",
-  "鷺洋",
-  "振家",
-  "樂駒",
-  "曉博",
-  "文博",
-  "昊焱",
-  "立果",
-  "金鑫",
-  "錦程",
-  "嘉熙",
-  "鵬飛",
-  "子默",
-  "思遠",
-  "浩軒",
-  "語堂",
-  "聰健"
+  "王",
+  "李",
+  "張",
+  "劉",
+  "陳",
+  "楊",
+  "黃",
+  "吳",
+  "趙",
+  "週",
+  "徐",
+  "孫",
+  "馬",
+  "朱",
+  "胡",
+  "林",
+  "郭",
+  "何",
+  "高",
+  "羅",
+  "鄭",
+  "梁",
+  "謝",
+  "宋",
+  "唐",
+  "許",
+  "鄧",
+  "馮",
+  "韓",
+  "曹",
+  "曾",
+  "彭",
+  "蕭",
+  "蔡",
+  "潘",
+  "田",
+  "董",
+  "袁",
+  "於",
+  "餘",
+  "葉",
+  "蔣",
+  "杜",
+  "蘇",
+  "魏",
+  "程",
+  "呂",
+  "丁",
+  "沈",
+  "任",
+  "姚",
+  "盧",
+  "傅",
+  "鐘",
+  "姜",
+  "崔",
+  "譚",
+  "廖",
+  "範",
+  "汪",
+  "陸",
+  "金",
+  "石",
+  "戴",
+  "賈",
+  "韋",
+  "夏",
+  "邱",
+  "方",
+  "侯",
+  "鄒",
+  "熊",
+  "孟",
+  "秦",
+  "白",
+  "江",
+  "閻",
+  "薛",
+  "尹",
+  "段",
+  "雷",
+  "黎",
+  "史",
+  "龍",
+  "陶",
+  "賀",
+  "顧",
+  "毛",
+  "郝",
+  "龔",
+  "邵",
+  "萬",
+  "錢",
+  "嚴",
+  "賴",
+  "覃",
+  "洪",
+  "武",
+  "莫",
+  "孔"
 ];
diff --git a/lib/locales/zu_ZA/index.js b/lib/locales/zu_ZA/index.js
index 978d9087..4c86e78b 100644
--- a/lib/locales/zu_ZA/index.js
+++ b/lib/locales/zu_ZA/index.js
@@ -1,6 +1,6 @@
 var en_ZA = {};
 module['exports'] = en_ZA;
-en_ZA.title = "South Africa (Zulu)";
+en_ZA.title = "Zulu (South Africa)";
 en_ZA.address = require("./address");
 en_ZA.internet = require("./internet");
 en_ZA.phone_number = require("./phone_number");
diff --git a/lib/lorem.js b/lib/lorem.js
index db6aec72..c25234cb 100644
--- a/lib/lorem.js
+++ b/lib/lorem.js
@@ -8,13 +8,20 @@ var Lorem = function (faker) {
   var Helpers = faker.helpers;
 
   /**
-   * word
+   * generates a word of a specified length
    *
    * @method faker.lorem.word
-   * @param {number} num
+   * @param {number} length length of the word that should be returned. Defaults to a random length
    */
-  self.word = function (num) {
-    return faker.random.arrayElement(faker.definitions.lorem.words);
+  self.word = function (length) {
+    var hasRightLength = function(word) { return word.length === length; };
+    var properLengthWords;
+    if(typeof length === 'undefined') {
+      properLengthWords = faker.definitions.lorem.words;
+    } else {
+      properLengthWords = faker.definitions.lorem.words.filter(hasRightLength);
+    }
+    return faker.random.arrayElement(properLengthWords);
   };
 
   /**
diff --git a/lib/name.js b/lib/name.js
index 49b54614..3312b250 100644
--- a/lib/name.js
+++ b/lib/name.js
@@ -15,6 +15,16 @@ function Name (faker) {
     if (typeof faker.definitions.name.male_first_name !== "undefined" && typeof faker.definitions.name.female_first_name !== "undefined") {
       // some locale datasets ( like ru ) have first_name split by gender. since the name.first_name field does not exist in these datasets,
       // we must randomly pick a name from either gender array so faker.name.firstName will return the correct locale data ( and not fallback )
+
+      if(typeof gender === 'string') {
+        if(gender.toLowerCase() === 'male') {
+          gender = 0;
+        }
+        else if(gender.toLowerCase() === 'female') {
+          gender = 1;
+        }
+      }
+
       if (typeof gender !== 'number') {
         if(typeof faker.definitions.name.first_name === "undefined") {
           gender = faker.random.number(1);
diff --git a/lib/random.js b/lib/random.js
index 1f99eed3..5afd27e2 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -202,8 +202,8 @@ function Random (faker, seed) {
 
     // randomly pick from the many faker methods that can generate words
     var randomWordMethod = faker.random.arrayElement(wordMethods);
-    return faker.fake('{{' + randomWordMethod + '}}');
-
+    var result = faker.fake('{{' + randomWordMethod + '}}');
+    return faker.random.arrayElement(result.split(' '));
   }
 
   /**
diff --git a/lib/time.js b/lib/time.js
new file mode 100644
index 00000000..580d33ee
--- /dev/null
+++ b/lib/time.js
@@ -0,0 +1,37 @@
+/**
+ *
+ * @namespace faker.time
+ */
+var _Time = function(faker) {
+  var self = this;
+
+  /**
+   * recent
+   *
+   * @method faker.time.recent
+   * @param {string} outputType - 'abbr' || 'wide' || 'unix' (default choice)
+   */
+  self.recent = function(outputType) {
+    if (typeof outputType === "undefined") {
+        outputType = 'unix';
+    }
+
+    var date = new Date();
+    switch (outputType) {
+      case "abbr":
+        date = date.toLocaleTimeString();
+        break;
+      case "wide":
+        date = date.toTimeString();
+        break;
+      case "unix":
+        date = date.getTime();
+        break;
+    }
+    return date;
+  };
+
+  return self;
+};
+
+module["exports"] = _Time;