Merge branch 'master' into master

1 files changed, 9 insertions, 10 deletions

diff --git a/lib/random.js b/lib/random.js
index 1f99eed3..f959440d 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -5,15 +5,14 @@ var mersenne = require('../vendor/mersenne');
  * @namespace faker.random
  */
 function Random (faker, seed) {
-  // Use a user provided seed if it exists
-  if (seed) {
-    if (Array.isArray(seed) && seed.length) {
-      mersenne.seed_array(seed);
-    }
-    else {
-      mersenne.seed(seed);
-    }
+  // Use a user provided seed if it is an array or number
+  if (Array.isArray(seed) && seed.length) {
+    mersenne.seed_array(seed);
+  }
+  else if(!isNaN(seed)) {
+    mersenne.seed(seed);
   }
+
   /**
    * returns a single random number based on a max number or range
    *
@@ -202,8 +201,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(' '));
   }
 
   /**