Merge branch 'master' into develop

address.go

@@ -52,9 +52,9 @@ func street(r *rand.Rand) string {
 	var street = ""
 	switch randInt := randIntRange(r, 1, 2); randInt {
 	case 1:
-		street = streetNumber(r) + " " + streetPrefix(r) + " " + streetName(r) + " " + streetSuffix(r)
+		street = streetNumber(r) + " " + streetPrefix(r) + " " + streetName(r) + streetSuffix(r)
 	case 2:
-		street = streetNumber(r) + " " + streetName(r) + " " + streetSuffix(r)
+		street = streetNumber(r) + " " + streetName(r) + streetSuffix(r)
 	}
 
 	return street

address_test.go

@@ -16,8 +16,8 @@ func ExampleAddress() {
 	fmt.Println(address.Country)
 	fmt.Println(address.Latitude)
 	fmt.Println(address.Longitude)
-	// Output: 364 Unions ville, Norfolk, Ohio 99536
-	// 364 Unions ville
+	// Output: 364 Unionsville, Norfolk, Ohio 99536
+	// 364 Unionsville
 	// Norfolk
 	// Ohio
 	// 99536
@@ -37,8 +37,8 @@ func ExampleFaker_Address() {
 	fmt.Println(address.Country)
 	fmt.Println(address.Latitude)
 	fmt.Println(address.Longitude)
-	// Output: 364 Unions ville, Norfolk, Ohio 99536
-	// 364 Unions ville
+	// Output: 364 Unionsville, Norfolk, Ohio 99536
+	// 364 Unionsville
 	// Norfolk
 	// Ohio
 	// 99536
@@ -74,13 +74,13 @@ func BenchmarkAddress(b *testing.B) {
 func ExampleStreet() {
 	Seed(11)
 	fmt.Println(Street())
-	// Output: 364 Unions ville
+	// Output: 364 Unionsville
 }
 
 func ExampleFaker_Street() {
 	f := New(11)
 	fmt.Println(f.Street())
-	// Output: 364 Unions ville
+	// Output: 364 Unionsville
 }
 
 func BenchmarkStreet(b *testing.B) {

faker_test.go

@@ -24,7 +24,7 @@ func Example() {
 	// Name: Markus Moen
 	// Email: alaynawuckert@kozey.biz
 	// Phone: 9948995369
-	// Address: 35300 South Roads haven, Miami, Tennessee 58302
+	// Address: 35300 South Roadshaven, Miami, Tennessee 58302
 	// BS: streamline
 	// Beer Name: Pliny The Elder
 	// Color: Gray

generate_test.go

@@ -47,7 +47,7 @@ func ExampleGenerate() {
 	fmt.Println(Generate("{shuffleints:[1,2,3]}"))
 	fmt.Println(Generate("{number:1,50}"))
 	fmt.Println(Generate("{shufflestrings:[key:value,int:string,1:2,a:b]}"))
-	// Output: Markus Moen ssn is 526643139 and lives at 599 Dale ton
+	// Output: Markus Moen ssn is 526643139 and lives at 599 Daleton
 	// Niche backwards caused.
 	// [1 3 2]
 	// 27
@@ -62,7 +62,7 @@ func ExampleFaker_Generate() {
 	fmt.Println(f.Generate("{shuffleints:[1,2,3]}"))
 	fmt.Println(f.Generate("{number:1,50}"))
 	fmt.Println(f.Generate("{shufflestrings:[key:value,int:string,1:2,a:b]}"))
-	// Output: Markus Moen ssn is 526643139 and lives at 599 Dale ton
+	// Output: Markus Moen ssn is 526643139 and lives at 599 Daleton
 	// Niche backwards caused.
 	// [1 3 2]
 	// 27

json_test.go

@@ -29,8 +29,8 @@ func ExampleJSON_object() {
 	//     "first_name": "Markus",
 	//     "last_name": "Moen",
 	//     "address": {
-	//         "address": "4599 Dale ton, Norfolk, New Jersey 36906",
-	//         "street": "4599 Dale ton",
+	//         "address": "4599 Daleton, Norfolk, New Jersey 36906",
+	//         "street": "4599 Daleton",
 	//         "city": "Norfolk",
 	//         "state": "New Jersey",
 	//         "zip": "36906",
@@ -65,8 +65,8 @@ func ExampleFaker_JSON_object() {
 	//     "first_name": "Markus",
 	//     "last_name": "Moen",
 	//     "address": {
-	//         "address": "4599 Dale ton, Norfolk, New Jersey 36906",
-	//         "street": "4599 Dale ton",
+	//         "address": "4599 Daleton, Norfolk, New Jersey 36906",
+	//         "street": "4599 Daleton",
 	//         "city": "Norfolk",
 	//         "state": "New Jersey",
 	//         "zip": "36906",

person_test.go

@@ -215,8 +215,8 @@ func ExamplePerson() {
 	// Developer
 	// Direct
 	// Paradigm
-	// 369 North Corner bury, Miami, North Dakota 24259
-	// 369 North Corner bury
+	// 369 North Cornerbury, Miami, North Dakota 24259
+	// 369 North Cornerbury
 	// Miami
 	// North Dakota
 	// 24259
@@ -279,8 +279,8 @@ func ExampleFaker_Person() {
 	// Developer
 	// Direct
 	// Paradigm
-	// 369 North Corner bury, Miami, North Dakota 24259
-	// 369 North Corner bury
+	// 369 North Cornerbury, Miami, North Dakota 24259
+	// 369 North Cornerbury
 	// Miami
 	// North Dakota
 	// 24259

string.go

@@ -10,10 +10,10 @@ func (f *Faker) Letter() string { return letter(f.Rand) }
 
 func letter(r *rand.Rand) string { return string(randLetter(r)) }
 
-// LetterN will generate a random ASCII string with length N
+// LetterN will generate a random ASCII string with length N. Note that this function returns a string with a length of 1 when 0 is passed.
 func LetterN(n uint) string { return letterN(globalFaker.Rand, n) }
 
-// LetterN will generate a random ASCII string with length N
+// LetterN will generate a random ASCII string with length N. Note that this function returns a string with a length of 1 when 0 is passed.
 func (f *Faker) LetterN(n uint) string { return letterN(f.Rand, n) }
 
 func letterN(r *rand.Rand, n uint) string {
@@ -44,10 +44,10 @@ func (f *Faker) Digit() string { return digit(f.Rand) }
 
 func digit(r *rand.Rand) string { return string(randDigit(r)) }
 
-// DigitN will generate a random string of length N consists of ASCII digits (note it can start with 0).
+// DigitN will generate a random string of length N consists of ASCII digits. Note that the string generated can start with 0 and this function returns a string with a length of 1 when 0 is passed.
 func DigitN(n uint) string { return digitN(globalFaker.Rand, n) }
 
-// DigitN will generate a random string of length N consists of ASCII digits (note it can start with 0).
+// DigitN will generate a random string of length N consists of ASCII digits. Note that the string generated can start with 0 and this function returns a string with a length of 1 when 0 is passed.
 func (f *Faker) DigitN(n uint) string { return digitN(f.Rand, n) }
 
 func digitN(r *rand.Rand, n uint) string {