1 files changed, 13 insertions, 0 deletions
diff --git a/lib/address.js b/lib/address.js
index 38c1e38c..1ccbfdc9 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -60,6 +60,10 @@ function Address (faker) {
    * @param {String} format
    */
   this.city = function (format) {
+    if (!format && faker.definitions.address.city_name) {
+      return this.cityName();
+    }
+
     var formats = [
       '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
       '{{address.cityPrefix}} {{name.firstName}}',
@@ -93,6 +97,15 @@ function Address (faker) {
   }
 
   /**
+   * Returns a random city name
+   * 
+   * @method faker.address.cityName
+   */
+  this.cityName = function() {
+    return faker.random.arrayElement(faker.definitions.address.city_name);
+  }
+
+  /**
    * Returns a random localized street name
    *
    * @method faker.address.streetName