diff --git a/lib/faker/company.rb b/lib/faker/company.rb
index bc777df551..3055ae656e 100644
--- a/lib/faker/company.rb
+++ b/lib/faker/company.rb
@@ -69,8 +69,8 @@ def luhn_algorithm(number)
             multiplications << digit.to_i * 2
           else
             multiplications << digit.to_i
+          end
         end
-      end
 
         sum = 0
 
diff --git a/lib/locales/tr.yml b/lib/locales/tr.yml
new file mode 100644
index 0000000000..ae65b2f568
--- /dev/null
+++ b/lib/locales/tr.yml
@@ -0,0 +1,26 @@
+# encoding: utf-8
+tr:
+  faker:
+    name:
+      first_name: [Mehmet, Yiğit, Batuhan, Burak, İrem, Buse, Selim, Caner]
+      last_name: [Davut, Sağdıç, Özdemir, Özkanlı, Ekkaldır, Zengel, Eren]
+      prefix: [Sn., Av., Dr.]
+      title:
+        job: ['Müdür','Şef','Koordinatör', 'Ajan','Hacı','Başkan','Reyiz']
+      name:
+        - "#{prefix} #{first_name} #{last_name}"
+        - "#{first_name} #{last_name}"
+        - "#{last_name} #{first_name}"
+
+    internet:
+      free_email: [gmail.com, hotmail.com.tr, yandex.com.tr]
+      domain_suffix: [co, com, com.tr, net, org]
+      safe_email: ['mesela.com']
+
+
+    address:
+      city_name: ['İstanbul', 'İzmir', 'Eskişehir', 'Şırnak', 'Edirne', 'Van' ]
+      city:
+        - "#{city_name}"
+      country: [Afganistan, Amerika Birleşik Devletleri, Fransa, Hollanda, Belçika, Nepal, Hindistan, Kuala Lumpur, Rusya]
+      default_country: [Turkey]
diff --git a/test/test_tr_locale.rb b/test/test_tr_locale.rb
new file mode 100644
index 0000000000..ea7f2d6c77
--- /dev/null
+++ b/test/test_tr_locale.rb
@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class TestTRLocale < Test::Unit::TestCase
+  def setup
+    Faker::Config.locale = 'tr'
+  end
+
+  def teardown
+    Faker::Config.locale = nil
+  end
+
+  def test_it_default_country
+    assert_equal('Turkey', Faker::Address.default_country)
+  end
+
+  def test_tr_names
+    assert Faker::Name.name.is_a? String
+    assert Faker::Name.first_name.is_a? String
+    assert Faker::Name.last_name.is_a? String
+    assert Faker::Name.prefix.is_a? String
+    assert Faker::Name.title.is_a? String
+    assert Faker::Name.first_name.is_a? String
+  end
+
+  def test_tr_internet_fields
+    assert Faker::Internet.free_email.is_a? String
+    assert Faker::Internet.domain_suffix.is_a? String
+    assert Faker::Internet.safe_email.is_a? String
+  end
+
+  def test_tr_address_fields
+    assert Faker::Address.city.is_a? String
+    assert Faker::Address.country.is_a? String
+  end
+end