Merge branch 'master' into master

1 files changed, 11 insertions, 4 deletions

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);
   };
 
   /**