diff --git a/.gitignore b/.gitignore
index c06aa2e..d419a96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata/
+*.xcuserdatad
 *.xccheckout
 profile
 *.moved-aside
diff --git a/.swift-version b/.swift-version
index f398a20..7ed6ff8 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-3.0
\ No newline at end of file
+5
diff --git a/.travis.yml b/.travis.yml
index d8bd69f..5e6655f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,33 @@
-language: objective-c
-osx_image: xcode8
+language: swift
+osx_image: xcode10
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
   - WORKSPACE=Localize.xcworkspace
   - IOS_FRAMEWORK_SCHEME="LocalizeTests"
-  - IOS_SDK=iphonesimulator10.0
+  - IOS_SDK=iphonesimulator12.0
   - EXAMPLE_SCHEME="Example"
   matrix:
-    - DESTINATION="OS=10.0,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
+    - DESTINATION="OS=12.0,name=iPhone X"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
+    - DESTINATION="OS=11.1,name=iPhone 8 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
+    - DESTINATION="OS=10.1,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
     - DESTINATION="OS=9.0,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
+
 before_install:
   - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
+  - brew install swiftlint
+
 script:
   - set -o pipefail
   - xcodebuild -version
   - xcodebuild -showsdks
 
+  - swiftlint
+
+  # Build Framework
+  - xcodebuild -workspace "$WORKSPACE" -scheme "Localize" -sdk "$SDK" -destination "$DESTINATION"
+
   # Build Framework in Debug and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
       xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
@@ -34,10 +44,14 @@ script:
 
   # Build Example in Debug if specified
   - if [ $BUILD_EXAMPLE == "YES" ]; then
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
       xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
     fi
 
   # Run `pod lib lint` if specified
   - if [ $POD_LINT == "YES" ]; then
       pod lib lint;
-    fi
\ No newline at end of file
+    fi
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash) -J 'LocalizeTests' -t cba7ac32-fe0f-4d63-977c-bc2b5588a082
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44504a9..903a5cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,100 +1,233 @@
 # Change Log
+
 All notable changes to this project will be documented in this file.
 `Localize` adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.3.0](https://github.com/andresilvagomez/Localize/releases/tag/2.3.0)
+
+Released on 2019-04-30.
+
+- Pluralizations
+  - By [Andres Silva](https://github.com/andresilvagomez).
+
+---
+
+## [2.2.0](https://github.com/andresilvagomez/Localize/releases/tag/2.2.0)
+
+Released on 2019-03-28.
+
+- Added function to check if key exist
+- Added Swift 5
+  - By [Andres Silva](https://github.com/andresilvagomez).
+
+---
+
+## [2.1.0](https://github.com/andresilvagomez/Localize/releases/tag/2.1.0)
+
+Released on 2018-10-24.
+
+- Added auto localize flag to UI components.
+  - By [adbqpa](https://github.com/adbqpa) in Pull Request [#44](https://github.com/andresilvagomez/Localize/pull/44).
+- Added support for custom providers
+  - By [Andres Silva](https://github.com/andresilvagomez).
+
+---
+
+## [2.0.5](https://github.com/andresilvagomez/Localize/releases/tag/2.0.5)
+
+Released on 2018-09-26.
+
+- Swift 4.2 Support.
+  - By [Gustavo Graña](https://github.com/ggrana) in Pull Request [#36](https://github.com/andresilvagomez/Localize/pull/36).
+
+---
+
+## [2.0.4](https://github.com/andresilvagomez/Localize/releases/tag/2.0.4)
+
+Released on 2018-09-20.
+
+- Swift 4.2 Support.
+  - By [Daniel Clelland](https://github.com/dclelland) in Pull Request [#34](https://github.com/andresilvagomez/Localize/pull/34).
+
+---
+
+## [2.0.3](https://github.com/andresilvagomez/Localize/releases/tag/2.0.3)
+
+Released on 2018-05-15.
+
+### Added
+
+- Fix localize strings when user only has a one string file.
+  - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
+  [#27](https://github.com/andresilvagomez/Localize/pull/27).
+
+---
+
+## [2.0.2](https://github.com/andresilvagomez/Localize/releases/tag/2.0.2)
+
+Released on 2018-05-10.
+
+### Added
+
+- Improve strings with extended languajes like to es-mx for defaults localizations.
+  - By [Benjamin Erhart](https://github.com/tladesignz) in Pull Request
+  [#25](https://github.com/andresilvagomez/Localize/pull/25).
+
+---
+
+## [2.0.1](https://github.com/andresilvagomez/Localize/releases/tag/2.0.1)
+
+Released on 2018-04-15.
+
+### Added
+
+- Include testing with cocoapods.
+- Code coverage 99+.
+- General changes to improve test.
+- Included in awesome ios. 
+  - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
+  [#23](https://github.com/andresilvagomez/Localize/pull/23).
+
+---
+
+## [2.0.0](https://github.com/andresilvagomez/Localize/releases/tag/2.0.0)
+
+Released on 2018-04-12.
+
+### Added
+
+- Transfer ownership to [andresilvagomez](https://github.com/andresilvagomez/Localize)
+- Swift 4.1 Support.
+- Faster.
+- Localize.currentLanguage.
+- Localize.availableLanguages.
+- Segment controls localize key using "," and base.
+- UIView components tested.
+  - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
+  [#22](https://github.com/andresilvagomez/Localize/pull/22).
+
+---
+
+## [1.5.2](https://github.com/andresilvagomez/Localize/releases/tag/1.5.2)
+
+Released on 2017-09-27.
+
+### Added
+
+- Swift 4.
+- By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
+  [#18](https://github.com/andresilvagomez/Localize/pull/18).
+
 ---
 
-## [1.5.1](https://github.com/kekiiwaa/Localize/releases/tag/1.5.1)
+## [1.5.1](https://github.com/andresilvagomez/Localize/releases/tag/1.5.1)
+
 Released on 2017-08-10.
 
-#### Added
+### Added
+
 - Fix with country code.
   - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#14](https://github.com/Kekiiwaa/Localize/pull/17).
+  [#17](https://github.com/andresilvagomez/Localize/pull/17).
 
 ---
 
-## [1.5.0](https://github.com/kekiiwaa/Localize/releases/tag/1.5.0)
+## [1.5.0](https://github.com/andresilvagomez/Localize/releases/tag/1.5.0)
+
 Released on 2017-08-08.
 
-#### Added
+### Added
+
 - Localize UI elements with @IBInspectable.
   - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#14](https://github.com/Kekiiwaa/Localize/pull/14).
+  [#14](https://github.com/andresilvagomez/Localize/pull/14).
+
+### Deleted
 
-#### Deleted
-  - Delete custom classes for UI elements in favor to @IBInspectable extensions.
-    - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-    [#14](https://github.com/Kekiiwaa/Localize/pull/14).
+- Delete custom classes for UI elements in favor to @IBInspectable extensions.
+  - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
+    [#14](https://github.com/andresilvagomez/Localize/pull/14).
 
 ---
 
-## [1.4.0](https://github.com/kekiiwaa/Localize/releases/tag/1.4.0)
+## [1.4.0](https://github.com/andresilvagomez/Localize/releases/tag/1.4.0)
+
 Released on 2017-07-10.
 
-#### Added
+### Added
+
 - Dynamic bundle.
 - Update bundle.
   - Added by [Benjamin Erhart](https://github.com/tladesignz) in Pull Request
-  [#13](https://github.com/Kekiiwaa/Localize/pull/13).
+  [#13](https://github.com/andresilvagomez/Localize/pull/13).
+
+### Updated
 
-#### Updated
 - Remove enums for language.
 - Fixed #localize with placeholder replacement.
   - Added by [Benjamin Erhart](https://github.com/tladesignz) in Pull Request
-  [#13](https://github.com/kekiiwaa/Localize/pull/13).
+  [#13](https://github.com/andresilvagomez/Localize/pull/13).
 
 ---
 
-## [1.3.0](https://github.com/kekiiwaa/Localize/releases/tag/1.3.0)
+## [1.3.0](https://github.com/andresilvagomez/Localize/releases/tag/1.3.0)
+
 Released on 2017-02-14.
 
-#### Added
+### Added
+
 - Support to Apple Strings.
 - Get your localized string using different table names.
 - JSON Provider and Strings Provider.
 - Testing mode.
 - 100% documented using jazzy.
   - Added by [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#8](https://github.com/kekiiwaa/Localize/pull/4).
+  [#8](https://github.com/andresilvagomez/Localize/pull/4).
+
+### Updated
 
-#### Updated
 - Not use vars to config.
 - Delete cache json file.
   - Added by [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#8](https://github.com/kekiiwaa/Localize/pull/4).
+  [#8](https://github.com/andresilvagomez/Localize/pull/4).
 
 ---
 
-## [1.2.0](https://github.com/kekiiwaa/Localize/releases/tag/1.2.0)
+## [1.2.0](https://github.com/andresilvagomez/Localize/releases/tag/1.2.0)
+
 Released on 2017-01-19.
 
-#### Added
+### Added
+
 - Renamed JsonLocalized to Localize, according with the next features.
 - Static methods.
 - Config methods.
 - Testing mode.
 - Testing for more methods and cases.
   - Added by [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#4](https://github.com/kekiiwaa/Localize/pull/4).
+  [#4](https://github.com/andresilvagomez/Localize/pull/4).
+
+### Updated
 
-#### Updated
 - Config methods.
 - Statics calleds.
   - Added by [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#4](https://github.com/kekiiwaa/Localize/pull/4).
+  [#4](https://github.com/andresilvagomez/Localize/pull/4).
+
+### Fixed
 
-#### Fixed
 - Getting default language key when in current language key no was available.
   - Added by [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#4](https://github.com/kekiiwaa/Localize/pull/4).
+  [#4](https://github.com/andresilvagomez/Localize/pull/4).
 
 ---
 
-## [1.1](https://github.com/kekiiwaa/Localize/releases/tag/1.1)
+## [1.1](https://github.com/andresilvagomez/Localize/releases/tag/1.1)
+
 Released on 2017-01-17.
 
-#### Added
+### Added
+
 - Documentation for all methods.
 - Method to detect all available languages.
 - Method to localize languages codes.
@@ -102,9 +235,10 @@ Released on 2017-01-17.
 - Notification when user change a language.
 - Update all localized components when user change language.
   - Added by [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#2](https://github.com/kekiiwaa/Localize/pull/2).
+  [#2](https://github.com/andresilvagomez/Localize/pull/2).
+
+### Updated
 
-#### Updated
 - Updated Example.
   - Added by [Andres Silva](https://github.com/andresilvagomez) in Pull Request
-  [#2](https://github.com/kekiiwaa/Localize/pull/2).
+  [#2](https://github.com/andresilvagomez/Localize/pull/2).
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
index fb518bf..07b1b8b 100644
--- a/Example/Example.xcodeproj/project.pbxproj
+++ b/Example/Example.xcodeproj/project.pbxproj
@@ -14,21 +14,22 @@
 		9F761AEA1E3063AB00904B4B /* lang-fr.json in Resources */ = {isa = PBXBuildFile; fileRef = 9F761AE71E3063AB00904B4B /* lang-fr.json */; };
 		9F8D41511E29359A00D7CE9A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F8D41501E29359A00D7CE9A /* AppDelegate.swift */; };
 		9F8D41531E29359A00D7CE9A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F8D41521E29359A00D7CE9A /* ViewController.swift */; };
+		9FA387DC217E1C9F007D1D28 /* CustomLocalize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA387DB217E1C9F007D1D28 /* CustomLocalize.swift */; };
 		9FB68F231E2B5D1400D386CE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9FB68F1F1E2B5D1400D386CE /* LaunchScreen.storyboard */; };
 		9FB68F241E2B5D1400D386CE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9FB68F211E2B5D1400D386CE /* Main.storyboard */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		9F3617451E33CB1F006E81BC /* PBXContainerItemProxy */ = {
+		9FF5FC531F7C5618001C14D6 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9F3617401E33CB1F006E81BC /* Localize.xcodeproj */;
+			containerPortal = 9FF5FC4E1F7C5618001C14D6 /* Localize.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 69F1B5741D955990000A2B87;
 			remoteInfo = Localize;
 		};
-		9F3617471E33CB1F006E81BC /* PBXContainerItemProxy */ = {
+		9FF5FC551F7C5618001C14D6 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 9F3617401E33CB1F006E81BC /* Localize.xcodeproj */;
+			containerPortal = 9FF5FC4E1F7C5618001C14D6 /* Localize.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 9F9345531E291D4E00C400F7;
 			remoteInfo = LocalizeTests;
@@ -49,7 +50,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		9F3617401E33CB1F006E81BC /* Localize.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Localize.xcodeproj; path = ../Localize.xcodeproj; sourceTree = "<group>"; };
 		9F36174C1E33CDA1006E81BC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		9F761AE51E3063AB00904B4B /* lang-en.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "lang-en.json"; sourceTree = "<group>"; };
 		9F761AE61E3063AB00904B4B /* lang-es.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "lang-es.json"; sourceTree = "<group>"; };
@@ -59,8 +59,10 @@
 		9F8D41501E29359A00D7CE9A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		9F8D41521E29359A00D7CE9A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		9F8D415C1E29359A00D7CE9A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		9FA387DB217E1C9F007D1D28 /* CustomLocalize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomLocalize.swift; sourceTree = "<group>"; };
 		9FB68F201E2B5D1400D386CE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		9FB68F221E2B5D1400D386CE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		9FF5FC4E1F7C5618001C14D6 /* Localize.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Localize.xcodeproj; path = ../Localize.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -74,15 +76,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		9F3617411E33CB1F006E81BC /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				9F3617461E33CB1F006E81BC /* Localize.framework */,
-				9F3617481E33CB1F006E81BC /* LocalizeTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		9F761AE21E3060B100904B4B /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -100,7 +93,7 @@
 			children = (
 				9F8D414F1E29359A00D7CE9A /* Example */,
 				9F8D414E1E29359A00D7CE9A /* Products */,
-				9F3617401E33CB1F006E81BC /* Localize.xcodeproj */,
+				9FF5FC4E1F7C5618001C14D6 /* Localize.xcodeproj */,
 			);
 			sourceTree = "<group>";
 		};
@@ -117,6 +110,7 @@
 			children = (
 				9F8D41501E29359A00D7CE9A /* AppDelegate.swift */,
 				9F8D41521E29359A00D7CE9A /* ViewController.swift */,
+				9FA387DB217E1C9F007D1D28 /* CustomLocalize.swift */,
 				9FB68F1F1E2B5D1400D386CE /* LaunchScreen.storyboard */,
 				9FB68F211E2B5D1400D386CE /* Main.storyboard */,
 				9F36174C1E33CDA1006E81BC /* Images.xcassets */,
@@ -125,6 +119,15 @@
 			path = Example;
 			sourceTree = "<group>";
 		};
+		9FF5FC4F1F7C5618001C14D6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				9FF5FC541F7C5618001C14D6 /* Localize.framework */,
+				9FF5FC561F7C5618001C14D6 /* LocalizeTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -153,18 +156,18 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Kekiiwaa ";
 				TargetAttributes = {
 					9F8D414C1E29359A00D7CE9A = {
 						CreatedOnToolsVersion = 8.2.1;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 					};
 				};
 			};
 			buildConfigurationList = 9F8D41481E29359A00D7CE9A /* Build configuration list for PBXProject "Example" */;
 			compatibilityVersion = "Xcode 8.0";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -176,8 +179,8 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = 9F3617411E33CB1F006E81BC /* Products */;
-					ProjectRef = 9F3617401E33CB1F006E81BC /* Localize.xcodeproj */;
+					ProductGroup = 9FF5FC4F1F7C5618001C14D6 /* Products */;
+					ProjectRef = 9FF5FC4E1F7C5618001C14D6 /* Localize.xcodeproj */;
 				},
 			);
 			projectRoot = "";
@@ -188,18 +191,18 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		9F3617461E33CB1F006E81BC /* Localize.framework */ = {
+		9FF5FC541F7C5618001C14D6 /* Localize.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
 			path = Localize.framework;
-			remoteRef = 9F3617451E33CB1F006E81BC /* PBXContainerItemProxy */;
+			remoteRef = 9FF5FC531F7C5618001C14D6 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		9F3617481E33CB1F006E81BC /* LocalizeTests.xctest */ = {
+		9FF5FC561F7C5618001C14D6 /* LocalizeTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
 			path = LocalizeTests.xctest;
-			remoteRef = 9F3617471E33CB1F006E81BC /* PBXContainerItemProxy */;
+			remoteRef = 9FF5FC551F7C5618001C14D6 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -228,6 +231,7 @@
 			files = (
 				9F8D41531E29359A00D7CE9A /* ViewController.swift in Sources */,
 				9F8D41511E29359A00D7CE9A /* AppDelegate.swift in Sources */,
+				9FA387DC217E1C9F007D1D28 /* CustomLocalize.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -263,15 +267,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -294,7 +306,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -314,15 +326,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -339,7 +359,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -354,16 +374,16 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 69RRCEKXZC;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kekiiwaa.localize;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -373,15 +393,15 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 69RRCEKXZC;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kekiiwaa.localize;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
index bbb24aa..838afcd 100644
--- a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
+++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift
index c3c0cef..1c1c849 100644
--- a/Example/Example/AppDelegate.swift
+++ b/Example/Example/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  Example
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import UIKit
@@ -10,11 +10,13 @@ import Localize
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-        
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?)
+        -> Bool {
+
         let localize = Localize.shared
         // Set your localize provider.
         localize.update(provider: .json)
@@ -27,41 +29,36 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // If you want remove storaged languaje use
         localize.resetLanguage()
         // The used language
-        print(localize.language())
+        print(localize.currentLanguage)
         // List of aviable languajes
-        print(localize.availableLanguages())
-            
+        print(localize.availableLanguages)
+
         // Or you can use static methods for all
-            
+
         Localize.update(fileName: "lang")
         Localize.update(defaultLanguage: "fr")
         Localize.update(language: "en-DE")
-        
+
         return true
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+
     }
 
     func applicationWillEnterForeground(_ application: UIApplication) {
-        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+
     }
 
     func applicationDidBecomeActive(_ application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    }
 
-    func applicationWillTerminate(_ application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
+    func applicationWillTerminate(_ application: UIApplication) {
 
+    }
 }
-
diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
index 9716529..1900d8c 100644
--- a/Example/Example/Base.lproj/Main.storyboard
+++ b/Example/Example/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="3md-ly-arL">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="3md-ly-arL">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,7 +23,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Some text here" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BBe-T0-9G7">
-                                <rect key="frame" x="16" y="80" width="343" height="21"/>
+                                <rect key="frame" x="16" y="80" width="343" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -32,7 +32,7 @@
                                 </userDefinedRuntimeAttributes>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Search" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HTc-mN-LYL">
-                                <rect key="frame" x="16" y="117" width="343" height="30"/>
+                                <rect key="frame" x="16" y="116.5" width="343" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
@@ -46,6 +46,12 @@
                                     <constraint firstAttribute="height" constant="45" id="eO6-Rr-kSy"/>
                                 </constraints>
                                 <state key="normal" title="Continue"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="Continue"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <segue destination="QHj-YI-Ix7" kind="show" id="HBm-eo-j6C"/>
+                                </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t6w-Gh-I1B">
                                 <rect key="frame" x="16" y="545" width="343" height="45"/>
@@ -61,7 +67,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Language" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eRz-bg-Iry">
-                                <rect key="frame" x="16" y="163" width="343" height="21"/>
+                                <rect key="frame" x="16" y="162.5" width="343" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -101,13 +107,75 @@
             </objects>
             <point key="canvasLocation" x="842" y="-546"/>
         </scene>
+        <!--View Controller-->
+        <scene sceneID="NVm-i4-pSf">
+            <objects>
+                <viewController id="QHj-YI-Ix7" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="hJI-XG-4ql"/>
+                        <viewControllerLayoutGuide type="bottom" id="bLK-bW-LRg"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="uK2-dp-OwS">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="app.label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qqs-QI-Vck">
+                                <rect key="frame" x="32" y="96" width="311" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="app.label" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="0HU-Y9-uB5">
+                                <rect key="frame" x="32" y="148.5" width="311" height="128"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="128" id="oec-cu-UBT"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="Qqs-QI-Vck" firstAttribute="leading" secondItem="uK2-dp-OwS" secondAttribute="leading" constant="32" id="L6v-ZM-qM4"/>
+                            <constraint firstItem="Qqs-QI-Vck" firstAttribute="top" secondItem="hJI-XG-4ql" secondAttribute="bottom" constant="32" id="ShY-j7-TaI"/>
+                            <constraint firstItem="0HU-Y9-uB5" firstAttribute="leading" secondItem="uK2-dp-OwS" secondAttribute="leading" constant="32" id="Vpg-0k-pFy"/>
+                            <constraint firstAttribute="trailing" secondItem="Qqs-QI-Vck" secondAttribute="trailing" constant="32" id="anC-QM-DfQ"/>
+                            <constraint firstAttribute="trailing" secondItem="0HU-Y9-uB5" secondAttribute="trailing" constant="32" id="gxa-Ep-xwE"/>
+                            <constraint firstItem="0HU-Y9-uB5" firstAttribute="top" secondItem="Qqs-QI-Vck" secondAttribute="bottom" constant="32" id="ofP-yD-LYg"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="KpE-oJ-hOB">
+                        <nil key="title"/>
+                        <segmentedControl key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="jG6-iV-0U4">
+                            <rect key="frame" x="127" y="7" width="121" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <segments>
+                                <segment title=""/>
+                                <segment title=""/>
+                            </segments>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="navigation.segment: one, two, tree"/>
+                            </userDefinedRuntimeAttributes>
+                        </segmentedControl>
+                        <barButtonItem key="rightBarButtonItem" title="Item" id="Zu7-yN-4eL">
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="one"/>
+                            </userDefinedRuntimeAttributes>
+                        </barButtonItem>
+                    </navigationItem>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Gkz-PL-c8H" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1700" y="-546"/>
+        </scene>
         <!--Navigation Controller-->
         <scene sceneID="xk1-7E-ym5">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="3md-ly-arL" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="gtX-QQ-nV6">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
diff --git a/Example/Example/CustomLocalize.swift b/Example/Example/CustomLocalize.swift
new file mode 100644
index 0000000..b6551ba
--- /dev/null
+++ b/Example/Example/CustomLocalize.swift
@@ -0,0 +1,25 @@
+//
+//  CustomLocalizeProtocol.swift
+//  Example
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import Foundation
+import Localize
+
+class CustomLocalize: LocalizeCommonProtocol {
+    /// Custom init
+    override init() {
+        super.init()
+    }
+
+    /// Localize a string using your JSON File
+    /// If the key is not found return the same key
+    /// That prevent replace untagged values
+    ///
+    /// - returns: localized key or same text
+    public override func localize(key: String, tableName: String? = nil) -> String {
+        return key + " helloooooooooo"
+    }
+}
diff --git a/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
index 1d060ed..d8db8d6 100644
--- a/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -84,6 +84,11 @@
       "idiom" : "ipad",
       "size" : "83.5x83.5",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json
index 5a29666..a0ad363 100644
--- a/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,43 +3,30 @@
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
-      "scale" : "2x"
+      "scale" : "1x"
     },
     {
       "orientation" : "portrait",
-      "idiom" : "iphone",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
       "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
+      "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "1x"
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
     }
   ],
   "info" : {
diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift
index 0ce6771..06d3daf 100644
--- a/Example/Example/ViewController.swift
+++ b/Example/Example/ViewController.swift
@@ -2,16 +2,34 @@
 //  ViewController.swift
 //  Example
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © @andresilvagomez.
 //
 
 import UIKit
 import Localize
 
 class ViewController: UIViewController {
-
     override func viewDidLoad() {
         super.viewDidLoad()
+        localize()
+
+        let locale = Locale.preferredLanguages.first?.components(separatedBy: "-").first?.lowercased() ?? "es"
+
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(localize),
+            name: NSNotification.Name(localizeChangeNotification),
+            object: nil
+        )
+
+        Localize.shared.update(language: locale)
+    }
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+
+    @objc func localize() {
         print("hello.world".localize())
         print("name".localize(value: "Andres"))
         print("values".localize(values: "Andres", "Software Developer"))
@@ -21,21 +39,36 @@ class ViewController: UIViewController {
     }
 
     @IBAction func updateLanguage(_ sender: Any) {
-        let actionSheet = UIAlertController(title: nil, message: "app.update.language".localize(), preferredStyle: UIAlertControllerStyle.actionSheet)
-        for language in Localize.availableLanguages() {
+        let actionSheet = UIAlertController(
+            title: nil,
+            message: "app.update.language".localize(),
+            preferredStyle: UIAlertControllerStyle.actionSheet
+        )
+
+        for language in Localize.availableLanguages {
             let displayName = Localize.displayNameForLanguage(language)
-            let languageAction = UIAlertAction(title: displayName, style: .default, handler: {
-                (alert: UIAlertAction!) -> Void in
-                Localize.update(language: language)
+            let languageAction = UIAlertAction(
+                title: displayName,
+                style: .default,
+                handler: { (_: UIAlertAction!) -> Void in
+
+                    Localize.update(language: language)
             })
             actionSheet.addAction(languageAction)
         }
-        let cancelAction = UIAlertAction(title: "Cancel", style: UIAlertActionStyle.cancel, handler: {
-            (alert: UIAlertAction) -> Void in
-        })
+        let cancelAction = UIAlertAction(
+            title: "Cancel",
+            style: UIAlertActionStyle.cancel,
+            handler: nil
+        )
+
         actionSheet.addAction(cancelAction)
         self.present(actionSheet, animated: true, completion: nil)
     }
 
+    func customProtocol() {
+        let provider = CustomLocalize()
+        Localize.update(provider: .custom(provider: provider))
+        print("test.custom.provider".localized)
+    }
 }
-
diff --git a/Example/Example/lang-en-DE.json b/Example/Example/lang-en-DE.json
index 4396389..60746fd 100644
--- a/Example/Example/lang-en-DE.json
+++ b/Example/Example/lang-en-DE.json
@@ -15,7 +15,11 @@
     },
     "the.same.lavel" : "This is a localize in the same lavel",
     "navigation" : {
-        "title" : "Localize English DE"
+        "title" : "Localize English DE",
+        "segment": {
+            "one": "First",
+            "two": "Second"
+        }
     },
     "app" : {
         "label" : "In English, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
@@ -24,5 +28,7 @@
         "update" : {
             "language" : "Update language"
         }
-    }
+    },
+    "one": "First",
+    "two": "Second"
 }
diff --git a/Example/Example/lang-en.json b/Example/Example/lang-en.json
index 6c7934b..dd242ba 100644
--- a/Example/Example/lang-en.json
+++ b/Example/Example/lang-en.json
@@ -15,7 +15,11 @@
     },
     "the.same.lavel" : "This is a localize in the same lavel",
     "navigation" : {
-        "title" : "Localize English"
+        "title" : "Localize English",
+        "segment": {
+            "one": "First",
+            "two": "Second"
+        }
     },
     "app" : {
         "label" : "In English, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
@@ -24,5 +28,7 @@
         "update" : {
             "language" : "Update language"
         }
-    }
+    },
+    "one": "First",
+    "two": "Second"
 }
diff --git a/Example/Example/lang-es.json b/Example/Example/lang-es.json
index f8177bf..6959232 100644
--- a/Example/Example/lang-es.json
+++ b/Example/Example/lang-es.json
@@ -2,20 +2,24 @@
     "Continue" : "Continuar",
     "name" : "Hello %",
     "hello" : {
-        "world" : "Hello world!"
+        "world" : "Hola mundo!"
     },
-    "values" : "Hello everyone my name is % and I'm %, see you soon",
-    "username" : "My username is :username",
+    "values" : "Hola a todos mi nombre es % and yo sou %, nos vemos pronto",
+    "username" : "Mi nombre de usuario es :username",
     "level" : {
         "one" : {
             "two" : {
-                "three" : "This is a multilevel key"
+                "three" : "Esto es una llave multinivel"
             }
         }
     },
-    "the.same.lavel" : "This is a localize in the same lavel",
+    "the.same.lavel" : "Esto es una llave en el mismo nivel",
     "navigation" : {
-        "title" : "Localize Español"
+        "title" : "Localize Español",
+        "segment": {
+            "one": "Primero",
+            "two": "Segundo"
+        }
     },
     "app" : {
         "label" : "En Español, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
@@ -24,5 +28,7 @@
         "update" : {
             "language" : "Actualizar idioma"
         }
-    }
+    },
+    "one": "Primero",
+    "two": "Segundo"
 }
diff --git a/Example/Example/lang-fr.json b/Example/Example/lang-fr.json
index e49e9ab..795c1d2 100644
--- a/Example/Example/lang-fr.json
+++ b/Example/Example/lang-fr.json
@@ -15,7 +15,11 @@
     },
     "the.same.lavel" : "This is a localize in the same lavel",
     "navigation" : {
-        "title" : "Localize Français"
+        "title" : "Localize Français",
+        "segment": {
+            "one": "Premier",
+            "two": "Deuxième"
+        }
     },
     "app" : {
         "label" : "En Français, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
@@ -24,5 +28,7 @@
         "update" : {
             "language" : "Langue de mise à jour"
         }
-    }
+    },
+    "one": "Premier",
+    "two": "Deuxième"
 }
diff --git a/Localize.podspec b/Localize.podspec
index c84eeb3..7ef9fc0 100644
--- a/Localize.podspec
+++ b/Localize.podspec
@@ -1,14 +1,19 @@
 Pod::Spec.new do |s|
 
   s.name = "Localize"
-  s.version = "1.5.1"
+  s.version = "2.3.0"
   s.license = 'MIT'
   s.summary = "Localize is a framework writed in swift to localize your projects easier improves i18n, including storyboards and strings."
-  s.homepage = "https://github.com/Kekiiwaa/Localize"
-  s.author = { "Kekiiwaa" => "andresilvagomez@gmail.com" }
-  s.source = { :git => "https://github.com/Kekiiwaa/Localize.git", :tag => "1.5.1" }
+  s.homepage = "https://github.com/andresilvagomez/Localize"
+  s.author = { "Andres Silva" => "me@andresilvagomez.com" }
+  s.source = { :git => "https://github.com/andresilvagomez/Localize.git", :tag => "2.3.0" }
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.source_files = "Source/*.swift"
 
+  s.test_spec 'Localize' do |test_spec|
+    test_spec.source_files = 'Tests/*.swift'
+    test_spec.resources = 'Tests/*.{json,lproj,strings}'
+  end 
+
 end
diff --git a/Localize.xcodeproj/project.pbxproj b/Localize.xcodeproj/project.pbxproj
old mode 100644
new mode 100755
index 9448797..127a070
--- a/Localize.xcodeproj/project.pbxproj
+++ b/Localize.xcodeproj/project.pbxproj
@@ -7,16 +7,34 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		9F1677FA1E51DE270022F3F8 /* Strings.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9F1677FC1E51DE270022F3F8 /* Strings.strings */; };
+		2B41FFEB20AB19570012AF1E /* StringSingleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B41FFEA20AB19570012AF1E /* StringSingleTest.swift */; };
+		2B41FFEC20AB1A450012AF1E /* OnlyOneLang.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2B41FFE820AB18FE0012AF1E /* OnlyOneLang.strings */; };
+		2B717465207D9AFE0070DC5F /* LocalizeUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B717464207D9AFE0070DC5F /* LocalizeUI.swift */; };
+		2B717469207DC6E00070DC5F /* UIViewComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B717468207DC6E00070DC5F /* UIViewComponents.swift */; };
+		2B8E83BC2181100A00DB21FB /* UIViewComponentsWithDisabledAutoLocalize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B8E83BA21810F6500DB21FB /* UIViewComponentsWithDisabledAutoLocalize.swift */; };
+		2B931AA8208302FB00C26D6B /* lang-en.json in Resources */ = {isa = PBXBuildFile; fileRef = 9F761AEB1E3063E400904B4B /* lang-en.json */; };
+		2B931AA92083030400C26D6B /* langTable-en.json in Resources */ = {isa = PBXBuildFile; fileRef = 2BD853262081316E00FB0E53 /* langTable-en.json */; };
+		2B931AAA2083030700C26D6B /* lang-es.json in Resources */ = {isa = PBXBuildFile; fileRef = 9F4570211E3173A4008C37D1 /* lang-es.json */; };
+		2B931AAB2083031000C26D6B /* other-en.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FA3BC4A1E318BCB0054CA92 /* other-en.json */; };
+		2B931AAC2083031000C26D6B /* other-es.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FCD8EA61E53319900B5909C /* other-es.json */; };
+		2B931AAD2083031000C26D6B /* some-it.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FA3BC4C1E318BDC0054CA92 /* some-it.json */; };
+		2B931AAE2083031000C26D6B /* file-de.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FA3BC4E1E318BED0054CA92 /* file-de.json */; };
+		2B931AAF2083031000C26D6B /* badJSON-en.json in Resources */ = {isa = PBXBuildFile; fileRef = 2BD853282081330600FB0E53 /* badJSON-en.json */; };
+		2B931AB02083031700C26D6B /* Strings.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9F1677FC1E51DE270022F3F8 /* Strings.strings */; };
+		2B931AB12083031700C26D6B /* Other.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9FCD8EA21E52A9D800B5909C /* Other.strings */; };
+		2B931AB22083031700C26D6B /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2BD85322208130A100FB0E53 /* Storyboard.storyboard */; };
+		2BAA7AA4207FC9F6008E4E3A /* UIViewComponentsES.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BAA7AA3207FC9F6008E4E3A /* UIViewComponentsES.swift */; };
+		2BAA7AA6207FCA8B008E4E3A /* UIViewComponentsWithString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BAA7AA5207FCA8B008E4E3A /* UIViewComponentsWithString.swift */; };
+		2BB606BA2083120F00DFEF11 /* lang-fr.json in Resources */ = {isa = PBXBuildFile; fileRef = 2BB606B82083119100DFEF11 /* lang-fr.json */; };
+		2BD8531920812DD900FB0E53 /* StringBadSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BD8531820812DD900FB0E53 /* StringBadSources.swift */; };
+		2BD8531B20812EBD00FB0E53 /* JSONBadSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BD8531A20812EBD00FB0E53 /* JSONBadSources.swift */; };
 		9F1678011E51F33E0022F3F8 /* StringBaseTestInSpanish.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F1678001E51F33E0022F3F8 /* StringBaseTestInSpanish.swift */; };
 		9F19DFC71E4D2B1D00F953E6 /* StringBaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F19DFC61E4D2B1D00F953E6 /* StringBaseTest.swift */; };
 		9F262D911E525565002DD75A /* LocalizeCommonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F262D901E525565002DD75A /* LocalizeCommonProtocol.swift */; };
 		9F2FC5651E4275A300C15610 /* LocalizeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2FC5641E4275A300C15610 /* LocalizeProtocol.swift */; };
 		9F2FC5671E42793B00C15610 /* LocalizeJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2FC5661E42793B00C15610 /* LocalizeJson.swift */; };
 		9F2FC5691E427AFD00C15610 /* LocalizeStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2FC5681E427AFD00C15610 /* LocalizeStrings.swift */; };
-		9F4570221E3173A4008C37D1 /* lang-es.json in Resources */ = {isa = PBXBuildFile; fileRef = 9F4570211E3173A4008C37D1 /* lang-es.json */; };
 		9F761AD71E305B9B00904B4B /* LocalizeStatic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F761AD61E305B9B00904B4B /* LocalizeStatic.swift */; };
-		9F761AEC1E3063E400904B4B /* lang-en.json in Resources */ = {isa = PBXBuildFile; fileRef = 9F761AEB1E3063E400904B4B /* lang-en.json */; };
 		9F93453F1E29192300C400F7 /* LocalizeExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F93453A1E29192300C400F7 /* LocalizeExtensions.swift */; };
 		9F9345411E29192300C400F7 /* Localize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F93453C1E29192300C400F7 /* Localize.swift */; };
 		9F9345421E29192300C400F7 /* LocalizeString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F93453D1E29192300C400F7 /* LocalizeString.swift */; };
@@ -24,15 +42,15 @@
 		9F9345581E291D4E00C400F7 /* Localize.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69F1B5741D955990000A2B87 /* Localize.framework */; };
 		9F989F4C1E2B3B8200A19F67 /* BaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F989F411E2B34E700A19F67 /* BaseTest.swift */; };
 		9F989F4D1E2B3B8300A19F67 /* OtherLangTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F989F441E2B34E700A19F67 /* OtherLangTest.swift */; };
+		9F9CC4BE22788BBF00B66CEE /* Pluralize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9CC4BD22788BBF00B66CEE /* Pluralize.swift */; };
+		9F9CC4C0227898AA00B66CEE /* PluralizeJsonTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9CC4BF227898AA00B66CEE /* PluralizeJsonTest.swift */; };
+		9F9CC4C422789DEB00B66CEE /* PluralizeStringsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9CC4C322789DEB00B66CEE /* PluralizeStringsTest.swift */; };
 		9FA3BC491E3174980054CA92 /* BaseTestInSpanish.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA3BC481E3174980054CA92 /* BaseTestInSpanish.swift */; };
-		9FA3BC4B1E318BCB0054CA92 /* other-en.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FA3BC4A1E318BCB0054CA92 /* other-en.json */; };
-		9FA3BC4D1E318BDC0054CA92 /* some-it.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FA3BC4C1E318BDC0054CA92 /* some-it.json */; };
-		9FA3BC4F1E318BED0054CA92 /* file-de.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FA3BC4E1E318BED0054CA92 /* file-de.json */; };
 		9FA3BC511E318C080054CA92 /* ReadingOtherFiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA3BC501E318C080054CA92 /* ReadingOtherFiles.swift */; };
-		9FCD8EA01E52A9D800B5909C /* Other.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9FCD8EA21E52A9D800B5909C /* Other.strings */; };
 		9FCD8EA51E52AD3E00B5909C /* StringsChanginDefaultFileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCD8EA41E52AD3E00B5909C /* StringsChanginDefaultFileName.swift */; };
-		9FCD8EA71E53319900B5909C /* other-es.json in Resources */ = {isa = PBXBuildFile; fileRef = 9FCD8EA61E53319900B5909C /* other-es.json */; };
 		9FCD8EA91E53327D00B5909C /* JsonChanginFileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCD8EA81E53327D00B5909C /* JsonChanginFileName.swift */; };
+		9FE9F0C921FACAA800034A34 /* LocalizeConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FE9F0C821FACAA800034A34 /* LocalizeConfig.swift */; };
+		B6EECE2A215AD8CE007D8A59 /* StringFallbackTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EECE29215AD8CE007D8A59 /* StringFallbackTest.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -46,6 +64,22 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		2B41FFE820AB18FE0012AF1E /* OnlyOneLang.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = OnlyOneLang.strings; sourceTree = "<group>"; };
+		2B41FFEA20AB19570012AF1E /* StringSingleTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringSingleTest.swift; sourceTree = "<group>"; };
+		2B717464207D9AFE0070DC5F /* LocalizeUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizeUI.swift; sourceTree = "<group>"; };
+		2B717468207DC6E00070DC5F /* UIViewComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewComponents.swift; sourceTree = "<group>"; };
+		2B80F11B20830FBD00542924 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Storyboard.strings; sourceTree = "<group>"; };
+		2B80F11C20830FBD00542924 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Strings.strings; sourceTree = "<group>"; };
+		2B80F11D20830FBD00542924 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Other.strings; sourceTree = "<group>"; };
+		2B8E83BA21810F6500DB21FB /* UIViewComponentsWithDisabledAutoLocalize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewComponentsWithDisabledAutoLocalize.swift; sourceTree = "<group>"; };
+		2BAA7AA3207FC9F6008E4E3A /* UIViewComponentsES.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewComponentsES.swift; sourceTree = "<group>"; };
+		2BAA7AA5207FCA8B008E4E3A /* UIViewComponentsWithString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewComponentsWithString.swift; sourceTree = "<group>"; };
+		2BB606B82083119100DFEF11 /* lang-fr.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "lang-fr.json"; sourceTree = "<group>"; };
+		2BD8531820812DD900FB0E53 /* StringBadSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringBadSources.swift; sourceTree = "<group>"; };
+		2BD8531A20812EBD00FB0E53 /* JSONBadSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONBadSources.swift; sourceTree = "<group>"; };
+		2BD85325208130B400FB0E53 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Storyboard.storyboard; sourceTree = "<group>"; };
+		2BD853262081316E00FB0E53 /* langTable-en.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "langTable-en.json"; sourceTree = "<group>"; };
+		2BD853282081330600FB0E53 /* badJSON-en.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "badJSON-en.json"; sourceTree = "<group>"; };
 		69F1B5741D955990000A2B87 /* Localize.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Localize.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9F1677FB1E51DE270022F3F8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Strings.strings; sourceTree = "<group>"; };
 		9F1677FD1E51DE320022F3F8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Strings.strings; sourceTree = "<group>"; };
@@ -67,6 +101,9 @@
 		9F989F411E2B34E700A19F67 /* BaseTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTest.swift; sourceTree = "<group>"; };
 		9F989F421E2B34E700A19F67 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9F989F441E2B34E700A19F67 /* OtherLangTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OtherLangTest.swift; sourceTree = "<group>"; };
+		9F9CC4BD22788BBF00B66CEE /* Pluralize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pluralize.swift; sourceTree = "<group>"; };
+		9F9CC4BF227898AA00B66CEE /* PluralizeJsonTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluralizeJsonTest.swift; sourceTree = "<group>"; };
+		9F9CC4C322789DEB00B66CEE /* PluralizeStringsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluralizeStringsTest.swift; sourceTree = "<group>"; };
 		9FA3BC481E3174980054CA92 /* BaseTestInSpanish.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTestInSpanish.swift; sourceTree = "<group>"; };
 		9FA3BC4A1E318BCB0054CA92 /* other-en.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "other-en.json"; sourceTree = "<group>"; };
 		9FA3BC4C1E318BDC0054CA92 /* some-it.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "some-it.json"; sourceTree = "<group>"; };
@@ -77,6 +114,10 @@
 		9FCD8EA41E52AD3E00B5909C /* StringsChanginDefaultFileName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringsChanginDefaultFileName.swift; sourceTree = "<group>"; };
 		9FCD8EA61E53319900B5909C /* other-es.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "other-es.json"; sourceTree = "<group>"; };
 		9FCD8EA81E53327D00B5909C /* JsonChanginFileName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JsonChanginFileName.swift; sourceTree = "<group>"; };
+		9FE9F0C821FACAA800034A34 /* LocalizeConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizeConfig.swift; sourceTree = "<group>"; };
+		9FEDA663215C655000FD3BA0 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/Other.strings"; sourceTree = "<group>"; };
+		B6EECE29215AD8CE007D8A59 /* StringFallbackTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringFallbackTest.swift; sourceTree = "<group>"; };
+		B6EECE2B215ADA55007D8A59 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/Strings.strings"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -120,13 +161,16 @@
 			isa = PBXGroup;
 			children = (
 				9F93453C1E29192300C400F7 /* Localize.swift */,
-				9F761AD61E305B9B00904B4B /* LocalizeStatic.swift */,
-				9F93453D1E29192300C400F7 /* LocalizeString.swift */,
-				9F93453A1E29192300C400F7 /* LocalizeExtensions.swift */,
-				9F2FC5641E4275A300C15610 /* LocalizeProtocol.swift */,
 				9F262D901E525565002DD75A /* LocalizeCommonProtocol.swift */,
+				9F93453A1E29192300C400F7 /* LocalizeExtensions.swift */,
 				9F2FC5661E42793B00C15610 /* LocalizeJson.swift */,
+				9F2FC5641E4275A300C15610 /* LocalizeProtocol.swift */,
+				9F761AD61E305B9B00904B4B /* LocalizeStatic.swift */,
+				9F93453D1E29192300C400F7 /* LocalizeString.swift */,
 				9F2FC5681E427AFD00C15610 /* LocalizeStrings.swift */,
+				2B717464207D9AFE0070DC5F /* LocalizeUI.swift */,
+				9FE9F0C821FACAA800034A34 /* LocalizeConfig.swift */,
+				9F9CC4BD22788BBF00B66CEE /* Pluralize.swift */,
 				9F9345461E291A1800C400F7 /* Suporting Files */,
 			);
 			path = Source;
@@ -146,12 +190,22 @@
 			children = (
 				9F989F411E2B34E700A19F67 /* BaseTest.swift */,
 				9FA3BC481E3174980054CA92 /* BaseTestInSpanish.swift */,
+				2BD8531A20812EBD00FB0E53 /* JSONBadSources.swift */,
 				9FCD8EA81E53327D00B5909C /* JsonChanginFileName.swift */,
 				9F989F441E2B34E700A19F67 /* OtherLangTest.swift */,
 				9FA3BC501E318C080054CA92 /* ReadingOtherFiles.swift */,
+				2BD8531820812DD900FB0E53 /* StringBadSources.swift */,
 				9F19DFC61E4D2B1D00F953E6 /* StringBaseTest.swift */,
+				2B41FFEA20AB19570012AF1E /* StringSingleTest.swift */,
 				9F1678001E51F33E0022F3F8 /* StringBaseTestInSpanish.swift */,
 				9FCD8EA41E52AD3E00B5909C /* StringsChanginDefaultFileName.swift */,
+				B6EECE29215AD8CE007D8A59 /* StringFallbackTest.swift */,
+				2B717468207DC6E00070DC5F /* UIViewComponents.swift */,
+				2BAA7AA3207FC9F6008E4E3A /* UIViewComponentsES.swift */,
+				2BAA7AA5207FCA8B008E4E3A /* UIViewComponentsWithString.swift */,
+				2B8E83BA21810F6500DB21FB /* UIViewComponentsWithDisabledAutoLocalize.swift */,
+				9F9CC4BF227898AA00B66CEE /* PluralizeJsonTest.swift */,
+				9F9CC4C322789DEB00B66CEE /* PluralizeStringsTest.swift */,
 				9F989F4A1E2B3B5600A19F67 /* Supporting Files */,
 			);
 			path = Tests;
@@ -160,15 +214,20 @@
 		9F989F4A1E2B3B5600A19F67 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				2BB606B82083119100DFEF11 /* lang-fr.json */,
 				9F761AEB1E3063E400904B4B /* lang-en.json */,
+				2BD853262081316E00FB0E53 /* langTable-en.json */,
 				9F4570211E3173A4008C37D1 /* lang-es.json */,
 				9FA3BC4A1E318BCB0054CA92 /* other-en.json */,
 				9FCD8EA61E53319900B5909C /* other-es.json */,
 				9FA3BC4C1E318BDC0054CA92 /* some-it.json */,
 				9FA3BC4E1E318BED0054CA92 /* file-de.json */,
+				2BD853282081330600FB0E53 /* badJSON-en.json */,
 				9F989F421E2B34E700A19F67 /* Info.plist */,
 				9F1677FC1E51DE270022F3F8 /* Strings.strings */,
 				9FCD8EA21E52A9D800B5909C /* Other.strings */,
+				2BD85322208130A100FB0E53 /* Storyboard.storyboard */,
+				2B41FFE820AB18FE0012AF1E /* OnlyOneLang.strings */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -195,6 +254,7 @@
 				69F1B5701D955990000A2B87 /* Frameworks */,
 				69F1B5711D955990000A2B87 /* Headers */,
 				69F1B5721D955990000A2B87 /* Resources */,
+				9F80E5EE215C502D0048E0A6 /* SwiftLint */,
 			);
 			buildRules = (
 			);
@@ -230,27 +290,31 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = Kekiiwaa;
 				TargetAttributes = {
 					69F1B5731D955990000A2B87 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					9F9345521E291D4E00C400F7 = {
 						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 				};
 			};
 			buildConfigurationList = 69F1B56E1D955990000A2B87 /* Build configuration list for PBXProject "Localize" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				es,
+				Base,
+				fr,
+				"es-CO",
 			);
 			mainGroup = 69F1B56A1D955990000A2B87;
 			productRefGroup = 69F1B5751D955990000A2B87 /* Products */;
@@ -268,14 +332,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9FA3BC4F1E318BED0054CA92 /* file-de.json in Resources */,
-				9FCD8EA71E53319900B5909C /* other-es.json in Resources */,
-				9F761AEC1E3063E400904B4B /* lang-en.json in Resources */,
-				9F4570221E3173A4008C37D1 /* lang-es.json in Resources */,
-				9F1677FA1E51DE270022F3F8 /* Strings.strings in Resources */,
-				9FA3BC4D1E318BDC0054CA92 /* some-it.json in Resources */,
-				9FA3BC4B1E318BCB0054CA92 /* other-en.json in Resources */,
-				9FCD8EA01E52A9D800B5909C /* Other.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -283,11 +339,45 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2B931AAF2083031000C26D6B /* badJSON-en.json in Resources */,
+				2B931AB22083031700C26D6B /* Storyboard.storyboard in Resources */,
+				2B931AAD2083031000C26D6B /* some-it.json in Resources */,
+				2B931AB02083031700C26D6B /* Strings.strings in Resources */,
+				2B931AAE2083031000C26D6B /* file-de.json in Resources */,
+				2B41FFEC20AB1A450012AF1E /* OnlyOneLang.strings in Resources */,
+				2B931AAC2083031000C26D6B /* other-es.json in Resources */,
+				2B931AB12083031700C26D6B /* Other.strings in Resources */,
+				2B931AA8208302FB00C26D6B /* lang-en.json in Resources */,
+				2B931AA92083030400C26D6B /* langTable-en.json in Resources */,
+				2B931AAA2083030700C26D6B /* lang-es.json in Resources */,
+				2B931AAB2083031000C26D6B /* other-en.json in Resources */,
+				2BB606BA2083120F00DFEF11 /* lang-fr.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		9F80E5EE215C502D0048E0A6 /* SwiftLint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = SwiftLint;
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint autocorrect\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		69F1B56F1D955990000A2B87 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -295,12 +385,15 @@
 			files = (
 				9F2FC5691E427AFD00C15610 /* LocalizeStrings.swift in Sources */,
 				9F262D911E525565002DD75A /* LocalizeCommonProtocol.swift in Sources */,
+				9FE9F0C921FACAA800034A34 /* LocalizeConfig.swift in Sources */,
 				9F93453F1E29192300C400F7 /* LocalizeExtensions.swift in Sources */,
 				9F2FC5671E42793B00C15610 /* LocalizeJson.swift in Sources */,
+				9F9CC4BE22788BBF00B66CEE /* Pluralize.swift in Sources */,
 				9F9345411E29192300C400F7 /* Localize.swift in Sources */,
 				9F9345421E29192300C400F7 /* LocalizeString.swift in Sources */,
 				9F761AD71E305B9B00904B4B /* LocalizeStatic.swift in Sources */,
 				9F2FC5651E4275A300C15610 /* LocalizeProtocol.swift in Sources */,
+				2B717465207D9AFE0070DC5F /* LocalizeUI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -308,14 +401,24 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2B41FFEB20AB19570012AF1E /* StringSingleTest.swift in Sources */,
+				2B717469207DC6E00070DC5F /* UIViewComponents.swift in Sources */,
 				9F1678011E51F33E0022F3F8 /* StringBaseTestInSpanish.swift in Sources */,
 				9F989F4C1E2B3B8200A19F67 /* BaseTest.swift in Sources */,
+				2BD8531920812DD900FB0E53 /* StringBadSources.swift in Sources */,
 				9FCD8EA51E52AD3E00B5909C /* StringsChanginDefaultFileName.swift in Sources */,
 				9F989F4D1E2B3B8300A19F67 /* OtherLangTest.swift in Sources */,
 				9FA3BC511E318C080054CA92 /* ReadingOtherFiles.swift in Sources */,
+				2B8E83BC2181100A00DB21FB /* UIViewComponentsWithDisabledAutoLocalize.swift in Sources */,
+				9F9CC4C422789DEB00B66CEE /* PluralizeStringsTest.swift in Sources */,
+				2BAA7AA6207FCA8B008E4E3A /* UIViewComponentsWithString.swift in Sources */,
+				2BAA7AA4207FC9F6008E4E3A /* UIViewComponentsES.swift in Sources */,
 				9F19DFC71E4D2B1D00F953E6 /* StringBaseTest.swift in Sources */,
+				9F9CC4C0227898AA00B66CEE /* PluralizeJsonTest.swift in Sources */,
 				9FA3BC491E3174980054CA92 /* BaseTestInSpanish.swift in Sources */,
 				9FCD8EA91E53327D00B5909C /* JsonChanginFileName.swift in Sources */,
+				B6EECE2A215AD8CE007D8A59 /* StringFallbackTest.swift in Sources */,
+				2BD8531B20812EBD00FB0E53 /* JSONBadSources.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -330,11 +433,22 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
+		2BD85322208130A100FB0E53 /* Storyboard.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				2BD85325208130B400FB0E53 /* Base */,
+				2B80F11B20830FBD00542924 /* fr */,
+			);
+			name = Storyboard.storyboard;
+			sourceTree = "<group>";
+		};
 		9F1677FC1E51DE270022F3F8 /* Strings.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
 				9F1677FB1E51DE270022F3F8 /* en */,
 				9F1677FD1E51DE320022F3F8 /* es */,
+				2B80F11C20830FBD00542924 /* fr */,
+				B6EECE2B215ADA55007D8A59 /* es-CO */,
 			);
 			name = Strings.strings;
 			sourceTree = "<group>";
@@ -344,6 +458,8 @@
 			children = (
 				9FCD8EA11E52A9D800B5909C /* en */,
 				9FCD8EA31E52A9D900B5909C /* es */,
+				2B80F11D20830FBD00542924 /* fr */,
+				9FEDA663215C655000FD3BA0 /* es-CO */,
 			);
 			name = Other.strings;
 			sourceTree = "<group>";
@@ -361,15 +477,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -394,7 +518,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -416,15 +540,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -443,7 +575,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -467,13 +599,13 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.kekiiwaa.localize;
+				PRODUCT_BUNDLE_IDENTIFIER = com.andresilvagomez.localize;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -490,12 +622,12 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.kekiiwaa.localize;
+				PRODUCT_BUNDLE_IDENTIFIER = com.andresilvagomez.localize;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -510,7 +642,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kekiiwaa.localize-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -525,7 +657,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kekiiwaa.localize-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/Localize.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Localize.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Localize.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme b/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
index c1f4499..e17b8b1 100644
--- a/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
+++ b/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -20,12 +20,28 @@
                ReferencedContainer = "container:Localize.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9F9345521E291D4E00C400F7"
+               BuildableName = "LocalizeTests.xctest"
+               BlueprintName = "LocalizeTests"
+               ReferencedContainer = "container:Localize.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "en"
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
diff --git a/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme b/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
index d1453e2..d4716b0 100644
--- a/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
+++ b/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
-   version = "1.3">
+   LastUpgradeVersion = "0930"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -37,6 +38,10 @@
                BlueprintName = "LocalizeTests"
                ReferencedContainer = "container:Localize.xcodeproj">
             </BuildableReference>
+            <LocationScenarioReference
+               identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+               referenceType = "1">
+            </LocationScenarioReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
diff --git a/Localize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Localize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Localize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Localize.xcworkspace/xcuserdata/andresilvagomez.xcuserdatad/UserInterfaceState.xcuserstate b/Localize.xcworkspace/xcuserdata/andresilvagomez.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index da2c176..0000000
Binary files a/Localize.xcworkspace/xcuserdata/andresilvagomez.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/Localize.xcworkspace/xcuserdata/andresilvagomez.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Localize.xcworkspace/xcuserdata/andresilvagomez.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
deleted file mode 100644
index ed9a9b4..0000000
--- a/Localize.xcworkspace/xcuserdata/andresilvagomez.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   type = "0"
-   version = "2.0">
-</Bucket>
diff --git a/Package.swift b/Package.swift
index 2d55a48..0fcc171 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,26 +1,24 @@
-// Package.swift
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
 import PackageDescription
 
 let package = Package(
     name: "Localize",
-    dependencies : [],
-    exclude: ["Tests"]
-)
\ No newline at end of file
+    products: [
+        .library(
+            name: "Localize",
+            targets: ["Localize"]
+        )
+    ],
+    targets: [
+        .target(
+            name: "Localize",
+            path: "Source",
+            exclude: [
+                "LocalizeExtensions.swift",
+                "Tests",
+                "Example"
+            ]
+        ),
+    ]
+)
diff --git a/README.md b/README.md
index 5ba1fc3..5920dde 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
 # Localize
 
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![codecov.io](https://codecov.io/github/andresilvagomez/Localize/coverage.svg?branch=master)](https://codecov.io/github/andresilvagomez/Localize?branch=master)
 [![CocoaPods](https://img.shields.io/cocoapods/v/Localize.svg)](https://cocoapods.org/pods/Localize)
-[![Build Status](https://travis-ci.org/Kekiiwaa/Localize.svg?branch=master)](https://travis-ci.org/Kekiiwaa/Localize)
+[![Build Status](https://travis-ci.org/andresilvagomez/Localize.svg?branch=master)](https://travis-ci.org/andresilvagomez/Localize)
+[![Language](https://img.shields.io/badge/language-Swift%204.1-orange.svg)](https://swift.org)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/andresilvagomez/Localize/master/LICENSE)
+[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/vsouza/awesome-ios)
 
-Localize is a framework writed in swift to localize your projects easier improves i18n, including storyboards and strings.
+Localize is a framework written in swift to help you localize and pluralize your projects. It supports both storyboards and strings.
 
 ![Localize Storyboard](https://www.dropbox.com/s/t5uij0bg0tgignu/localize.gif?raw=1)
 ___
@@ -12,19 +16,23 @@ ___
 - [Features](#features)
 - [Requirements](#requirements)
 - [Installation](#installation)
+- [Usage](#usage)
+- [Notes for your App Store release](#notes-for-your-appstore-release)
 - [Credits](#credits)
 - [License](#license)
 
 ## Features
 
-- [x] Keep the Localizable.strings file your app already uses
+- [x] Storyboard with IBInspectable
+- [x] Pluralize and localize your keys
+- [x] Keep the File.strings files your app already uses
 - [x] Support Apple strings and JSON Files
 - [x] Change your app language without changing device language
 - [x] Localize your Storyboards without extra files or/and ids
 
 ## Requirements
 
-- iOS 8.0+
+- iOS 9.0+
 - Xcode 8.0+
 - Swift 3.0+
 
@@ -35,7 +43,7 @@ ___
 [CocoaPods](http://cocoapods.org) is a dependency manager for Cocoa projects. You can install it with the following command:
 
 ```bash
-$ gem install cocoapods
+gem install cocoapods
 ```
 
 > CocoaPods 1.1.0+ is required to build Localize 1.+.
@@ -44,18 +52,23 @@ To integrate Localize into your Xcode project using CocoaPods, specify it in you
 
 ```ruby
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '9.0'
 use_frameworks!
 
 target '<Your Target Name>' do
-    pod 'Localize' , '~> 1.5.1'
+    pod 'Localize' , '~> 2.3.0'
 end
+
+# If you are using Swift 4.x
+# target '<Your Target Name>' do
+#    pod 'Localize' , '~> 2.1.0'
+# end
 ```
 
 Then, run the following command:
 
 ```bash
-$ pod install
+pod install
 ```
 
 ### Carthage
@@ -65,51 +78,53 @@ $ pod install
 You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
 
 ```bash
-$ brew update
-$ brew install carthage
+brew update
+brew install carthage
 ```
 
 To integrate Localize into your Xcode project using Carthage, specify it in your `Cartfile`:
 
-```
-github "Kekiiwaa/Localize"
+```carthage
+github "andresilvagomez/Localize"
 ```
 
 Run `carthage update` to build the framework and drag the built `Localize.framework` into your Xcode project.
 
-### Swift Pacakge Manager
+### Swift Package Manager
 
-The [Swift Pacakage Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the swift compiler.
+The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the swift compiler.
 
 Once you have your Swift package set up, adding Localize as a dependency is as easy as adding it to the dependencies value of your Package.swift.
 
 ```swift
 dependencies: [
-    .Package(url: "https://github.com/Kekiiwaa/Localize.git")
+    .Package(url: "https://github.com/andresilvagomez/Localize.git")
 ]
 ```
 
----
+___
 
 ## Usage
 
 Add ```.localize()``` for any ```String``` if you want localize.
 
-You don't need import anything in your code, Localize use extensions to localize your Strings.
+You don't need import anything in your code, Localize uses extensions to localize your Strings.
 
 ```swift
 
 textLabel.text = "hello.world".localize()
+// Or
+textLabel.text = "hello.world".localized
 
 ```
 
-You can decide if you want use JSON or Apple Strings, we support both, if you decide use JSON please following this instructions.
+You can decide if you want use JSON or Apple Strings, we support both, if you decide to use JSON please follow these instructions.
 
 ### Create JSON file
 
 Please create a JSON file in your code with this rule:
 
-```
+```strings
 {your file name}-{your lang code}.json
 ```
 
@@ -139,7 +154,7 @@ If you decide use Apple strings, please follow [Apple Localization Guide](https:
 
 String file example
 
-```
+```strings
 
 "hello.world" = "Hello world!";
 
@@ -167,9 +182,14 @@ print( "hello.world".localize() )
 
 // Hello world!
 
+// Also you can use
+
+print( "hello.world".localized )
+
 ```
 
 ### Localize strings, replacing text
+
 Localize use `%` identifier to replace the text
 
 ```swift
@@ -181,6 +201,7 @@ print( "hello.name".localize(value: "everyone") )
 ```
 
 ### Localize strings, replacing many texts
+
 Localize use `%` identifier to replace the text
 
 ```swift
@@ -192,6 +213,7 @@ print( "values".localize(values: "everyone", "Software Developer") )
 ```
 
 ### Localize strings, replacing dictionary values
+
 Localize use `:yourid` to search your id in JSON File
 
 ```swift
@@ -202,9 +224,9 @@ print( "username".localize(dictionary: ["username": "Localize"]) )
 
 ```
 
-### Localize strings, using other files.
-If you decide use different files use methods with ```tableName``` in the end of each method, for example.
+### Localize strings, using other files
 
+If you decide use different files use methods with ```tableName``` in the end of each method, for example.
 
 ```swift
 
@@ -217,13 +239,16 @@ print( "values".localize(values: "everyone", "Software Developer", tableName: "Y
 print( "username".localize(dictionary: ["username": "Localize"], tableName: "YourFileName") )
 
 ```
----
 
-### We are amazing with storyboards.
+___
+
+### We are amazing with storyboards
 
-You don't need import anything in your code, Localize use extensions to localize your UIView components
+You don't need to import anything in your code, Localize uses extensions to localize your UIView components
 
-![Localize Storyboard](https://www.dropbox.com/s/d2ydhozqdetd1oo/Screenshot%202017-08-07%2023.12.12.png?raw=1)
+To prevent auto localization for some controls you created in storyboard can set **Auto Localize** to **Off**
+
+![Localize Storyboard](https://image.ibb.co/m5yz6V/screenshot.png)
 
 - lang-en.json
 
@@ -241,19 +266,20 @@ You don't need import anything in your code, Localize use extensions to localize
 
 You can use extensions for
 
-- ``` UIBarButtonItem ```
-- ``` UIButton ```
-- ``` UILabel ```
-- ``` UINavigationItem ```
-- ``` UISearchBar ```
-- ``` UISegmentedControl ```
-- ``` UITabBarItem ```
-- ``` UITextField ```
-- ``` UITextView ```
+- `UIBarButtonItem`
+- `UIButton`
+- `UILabel`
+- `UINavigationItem`
+- `UISearchBar`
+- `UISegmentedControl`
+- `UITabBarItem`
+- `UITextField`
+- `UITextView`
 
----
+___
 
 ## Updating language
+
 When you change a language, automatically all views update your content to new language
 
 ```swift
@@ -262,13 +288,13 @@ Localize.update(language: "fr")
 
 ```
 
-But with strings not is posible, for that your need implement a notification
+To make this work with strings, you need to implement a notification
 
 ```swift
 
 override func viewDidLoad() {
     super.viewDidLoad()
-    NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LanguageChangeNotification), object: nil)   
+    NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(localizeChangeNotification), object: nil)
 }
 
 public func localize() {
@@ -284,7 +310,7 @@ Implementing internal acction to change a language
 
 @IBAction func updateLanguage(_ sender: Any) {
     let actionSheet = UIAlertController(title: nil, message: "app.update.language".localize(), preferredStyle: UIAlertControllerStyle.actionSheet)
-    for language in Localize.availableLanguages() {
+    for language in Localize.availableLanguages {
         let displayName = Localize.displayNameForLanguage(language)
         let languageAction = UIAlertAction(title: displayName, style: .default, handler: {
             (alert: UIAlertAction!) -> Void in
@@ -302,7 +328,8 @@ Implementing internal acction to change a language
 ```
 
 ### Config
-This not is necesary, only if you need diferent results.
+
+This not is necesary, only if you need different results.
 
 ```swift
 // AppDelegate.swift
@@ -316,18 +343,18 @@ func application(_ application: UIApplication, didFinishLaunchingWithOptions lau
     localize.update(provider: .json)
     // Set your file name
     localize.update(fileName: "lang")
-    // Set your default languaje.
+    // Set your default language.
     localize.update(defaultLanguage: "fr")
     // If you want change a user language, different to default in phone use thimethod.
     localize.update(language: "en")
-    // If you want remove storaged languaje use
+    // If you want remove storaged language use
     localize.resetLanguage()
     // The used language
-    print(localize.language())
-    // List of aviable languajes
-    print(localize.availableLanguages())
+    print(localize.currentLanguage)
+    // List of available language
+    print(localize.availableLanguages)
 
-    // Or you can use static methods for all          
+    // Or you can use static methods for all
     Localize.update(fileName: "lang")
     Localize.update(defaultLanguage: "fr")
     Localize.update(language: "en-DE")
@@ -337,11 +364,102 @@ func application(_ application: UIApplication, didFinishLaunchingWithOptions lau
 
 ```
 
----
+## Pluralize
+
+```swift
+print( "people".pluralize(value: 0) )
+// there are no people
+
+print( "people".pluralize(value: 1) )
+// only one person
+
+print( "people".pluralize(value: 2) )
+// two people
+
+print( "people".pluralize(value: 27) )
+// many people
+
+print( "people".pluralize(value: 103) )
+// hundreds of people
+
+print( "people".pluralize(value: 1010) )
+// thousand of people
+
+print( "people".pluralize(value: 1000000) )
+// millions of people
+```
+
+how you need compose your file.
+
+```json
+// Json file
+
+{
+    "people": {
+        "zero": "there are no people",
+        "one": "only one person",
+        "two": "two people",
+        "many": "many people",
+        "hundreds": "hundreds of people",
+        "thousand": "thousand of people",
+        "millions": "millions of people",
+        "other": "not defined people"
+    }
+}
+```
+
+```strings
+# string file
+
+"people.zero" = "there are no people";
+"people.one" = "only one person";
+"people.two" = "two people";
+"people.many" = "many people";
+"people.hundreds" = "hundreds of people";
+"people.thousand" = "thousand of people";
+"people.millions" = "millions of people";
+"people.other" = "not defined people";
+```
+
+but also you can show your value
+
+```swift
+print( "people".pluralize(value: 1) )
+/// 1 Person
+```
+
+in your file
+
+```json
+// JSON
+{
+    "people": {
+        "one": "% Person",
+        ...
+    }
+}
+
+// Strings
+"people.one" = "% Person";
+```
+
+___
+
+## Notes for your AppStore release
+
+To make all languages you have localized your app for visible on the AppStore, you must add a language in the project's settings.
+
+1. For that, click on your project name in the left side bar.
+2. Then, choose project, instead of a target.
+3. At the bottom, under *Localizations*, press the + button & select a language you want to add
+4. On prompt, uncheck all files Xcode wants to add localization for, but keep a single one, that you won't actually localize, such as your launch screen for instance.
+    - if you need to localize all your files, I suggest adding a placeholder storyboard file that you'll then add to localization
+5. Done! (You don't actually have to localize the placehodler file.) The AppStore will now show the new language in localizations for your app.
+
+___
 
 ## Credits
 
-[Kekiiwaa](https://github.com/Kekiiwaa),
 [Andres Silva Gomez](https://github.com/andresilvagomez)
 
 Special thanks to [Benjamin Erhart](https://github.com/tladesignz)
diff --git a/Source/Info.plist b/Source/Info.plist
index 9d45612..344518f 100644
--- a/Source/Info.plist
+++ b/Source/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3</string>
+	<string>2.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Source/Localize.swift b/Source/Localize.swift
index 2b9dd42..1cbddb8 100644
--- a/Source/Localize.swift
+++ b/Source/Localize.swift
@@ -1,18 +1,17 @@
 //
-//  LocalizableSwift.swift
+//  LocalizeSwift.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
-import UIKit
+import Foundation
 
 /// Name for language change notification
-public let LocalizeChangeNotification = "LocalizeChangeNotification"
+public let localizeChangeNotification = "LocalizeChangeNotification"
 
 /// Internal current language key
-public let LocalizeStorageKey = "LocalizeDefaultLanguage"
-
+public let localizeStorageKey = "LocalizeDefaultLanguage"
 
 /// Different types to localize your app, using json files or strings default by Apple.
 public enum LocalizeType {
@@ -20,57 +19,75 @@ public enum LocalizeType {
     case json
     /// Default Apple protocol.
     case strings
+    // Custom provider
+    case custom(provider: LocalizeProtocol)
 }
 
 /// Is a pricipal class, contents all logic to localize your keys
 /// read json and determinate all configurations.
 public class Localize: NSObject {
-    
+
     // MARK: Properties
-    
-    /// Shated instance
+
+    /// Shared instance
     public static let shared: Localize = Localize()
-    
+
     /// Provider to localize your app.
     private var provider: LocalizeProtocol = LocalizeStrings()
-    
-    /// This override prevent user access to different instances for this class.
-    /// Always use shared instance.
-    private override init() {
-        super.init()
+
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public var availableLanguages: [String] {
+        return provider.availableLanguages
     }
-    
+
+    /// Return storaged language or default language in device
+    ///
+    /// - returns: current used language
+    public var currentLanguage: String {
+        return provider.currentLanguage
+    }
+
     // MARK: Public methods
-    
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, tableName: tableName)
+    public func localize(key: String, tableName: String? = nil) -> String {
+        return provider.localize(key: key, tableName: tableName)
     }
-    
+
     /// Localize a string using your JSON File
     /// That replace all % character in your string with replace value.
     ///
     /// - parameter value: The replacement value
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, replace:String, tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, replace: replace, tableName:tableName)
+    public func localize(
+        key: String,
+        replace: String,
+        tableName: String? = nil) -> String {
+
+        return provider.localize(key: key, replace: replace, tableName: tableName)
     }
-    
+
     /// Localize a string using your JSON File
     /// That replace each % character in your string with each replace value.
     ///
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, values:[Any], tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, values: values, tableName:tableName)
+    public func localize(
+        key: String,
+        values: [Any],
+        tableName: String? = nil) -> String {
+
+        return provider.localize(key: key, values: values, tableName: tableName)
     }
-    
+
     /// Localize string with dictionary values
     /// Get properties in your key with rule :property
     /// If property not exist in this string, not is used.
@@ -78,76 +95,70 @@ public class Localize: NSObject {
     /// - parameter value: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, dictionary:[String:String], tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, dictionary: dictionary, tableName:tableName)
+    public func localize(
+        key: String,
+        dictionary: [String: String],
+        tableName: String? = nil) -> String {
+
+        return provider.localize(key: key, dictionary: dictionary, tableName: tableName)
     }
 
-    
     // MARK: Config methods
-    
-    
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    public func language() -> String {
-        return self.provider.language()
-    }
-    
+
     /// Update default language, this stores a language key which can be retrieved the next time
-    public func update(language: String) -> Void {
-        self.provider.update(language: language)
+    public func update(language: String) {
+        provider.update(language: language)
     }
-    
+
     /// Update base file name, searched in path.
-    public func update(fileName:String) {
-        self.provider.update(fileName: fileName)
+    public func update(fileName: String) {
+        provider.update(fileName: fileName)
     }
-    
+
     /// Update the bundle used to load files from.
     public func update(bundle: Bundle) {
-        self.provider.update(bundle: bundle)
+        provider.update(bundle: bundle)
     }
 
     /// Update default language
     public func update(defaultLanguage: String) {
-        self.provider.update(defaultLanguage: defaultLanguage)
+        provider.update(defaultLanguage: defaultLanguage)
     }
-    
+
     /// This remove the language key storaged.
-    public func resetLanguage() -> Void {
-        self.provider.resetLanguage()
+    public func resetLanguage() {
+        provider.resetLanguage()
     }
-    
-    /// Show all aviable languajes whit criteria name
-    ///
-    /// - returns: list with storaged languages code
-    public func availableLanguages() -> [String] {
-        return self.provider.availableLanguages()
-    }
-    
+
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
     public func displayNameForLanguage(_ language: String) -> String {
-        return self.provider.displayNameForLanguage(language)
+        return provider.displayNameForLanguage(language)
     }
-    
-    /// Enable testing mode
-    /// Please not use in your code, is only for test schema.
-    public func testingMode() {
-        self.provider.testingMode()
+
+    /// Determines whether a localized string exists for given key
+    ///
+    /// - parameter key: localization key
+    /// - returns: boolean value determining whether a localized string exists for give key
+    public func localizeExists(forKey key: String, table: String? = nil) -> Bool {
+        guard let table = table else {
+            return key.localized != key
+        }
+        return key.localize(tableName: table) != key
     }
-    
+
     // MARK: Config providers
-    
+
     /// Update provider to localize your app.
     public func update(provider: LocalizeType) {
-        if provider == .strings {
-            self.provider = LocalizeStrings()
-        }
-        if provider == .json {
+        switch provider {
+        case .json:
             self.provider = LocalizeJson()
+        case .strings:
+            self.provider = LocalizeStrings()
+        case .custom(let provider):
+            self.provider = provider
         }
     }
-    
 }
diff --git a/Source/LocalizeCommonProtocol.swift b/Source/LocalizeCommonProtocol.swift
index bad0fc6..005f247 100644
--- a/Source/LocalizeCommonProtocol.swift
+++ b/Source/LocalizeCommonProtocol.swift
@@ -2,173 +2,148 @@
 //  LocalizeCommonProtocol.swift
 //  Localize
 //
-//  Copyright © 2017 Kekiiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
-import UIKit
+import Foundation
+
+/// Provide a default functionality.
+open class LocalizeCommonProtocol: LocalizeProtocol {
+
+    /// Empty Init
+    public init() {
+
+    }
+
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    open var availableLanguages: [String] {
+        return ["en"]
+    }
 
-class LocalizeCommonProtocol: NSObject {
-    
     /// Name for storaged Json Files
     /// The rule for name is fileName-LanguageKey.json
-    public var fileName = "lang"
+    open var fileName = "lang"
 
     /// Bundle used to load files from.
     /// Defaults to the main bundle.
-    public var usedBundle: Bundle = Bundle.main
+    private var usedBundle = Bundle.main
 
-    /// Use this for testing mode, search resources in different bundles.
-    var testing: Bool = false
-    
     /// Default language, if this can't find a key in your current language
     /// Try read key in default language
-    public var defaultLanguage: String = "en"
-    
+    open var defaultLanguage: String = "en"
+
     /// Storaged language or default language in device
-    public var currentLanguage: String {
-        get {
-            return self.language()
-        }
-    }
-    
-    // MARK: Internal methods.
-    
-    // Interator for String Enumerators
-    internal func iterateEnum<T: Hashable>(_: T.Type) -> AnyIterator<T> {
-        var i = 0
-        return AnyIterator {
-            let next = withUnsafePointer(to: &i) {
-                $0.withMemoryRebound(to: T.self, capacity: 1) { $0.pointee }
-            }
-            if next.hashValue != i { return nil }
-            i += 1
-            return next
+    open var currentLanguage: String {
+        let defaults = UserDefaults.standard
+        if let lang = defaults.string(forKey: localizeStorageKey) {
+            return lang
         }
+        return Locale.preferredLanguages.first ?? defaultLanguage
     }
-    
+
     /// Path for your env
     /// if testing mode is enable we change the bundle
     /// in other case use a main bundle.
     ///
     /// - returns: a string url where is your file
-    internal func bundle() -> Bundle {
-        if self.testing {
-            return Bundle(for: type(of: self))
-        }
+    internal var bundle: Bundle {
         return usedBundle
     }
-    
-    
+
+    // MARK: Internal methods.
+
     // MARK: Public methods
-    
-    
+
     /// Update default language, this stores a language key which can be retrieved the next time
-    public func update(language: String) -> Void {
+    open func update(language: String) {
         let defaults = UserDefaults.standard
-        defaults.setValue(language, forKey: LocalizeStorageKey)
+        defaults.setValue(language, forKey: localizeStorageKey)
         defaults.synchronize()
-        NotificationCenter.default.post(name: Notification.Name(rawValue: LocalizeChangeNotification), object: nil)
+        NotificationCenter.default.post(
+            name: Notification.Name(rawValue: localizeChangeNotification),
+            object: nil
+        )
     }
-    
+
     /// Update default language
-    public func update(defaultLanguage: String) {
+    open func update(defaultLanguage: String) {
         self.defaultLanguage = defaultLanguage
     }
-    
+
     /// This remove the language key storaged.
-    public func resetLanguage() -> Void {
+    open func resetLanguage() {
         let defaults = UserDefaults.standard
-        defaults.removeObject(forKey: LocalizeStorageKey)
+        defaults.removeObject(forKey: localizeStorageKey)
         defaults.synchronize()
     }
-    
+
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
-    public func displayNameForLanguage(_ language: String) -> String {
-        let locale : NSLocale = NSLocale(localeIdentifier: self.currentLanguage)
-        if let name = locale.displayName(forKey: NSLocale.Key.identifier, value: language) {
-            return name.capitalized
-        }
-        return ""
-    }
-    
-    /// Enable testing mode
-    /// Please not use in your code, is only for test schema.
-    public func testingMode() {
-        self.testing = true
-    }
-    
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    public func language() -> String {
-        let defaults = UserDefaults.standard
-        if let lang = defaults.string(forKey: LocalizeStorageKey) {
-            return lang
+    open func displayNameForLanguage(_ language: String) -> String {
+        let locale: NSLocale = NSLocale(localeIdentifier: currentLanguage)
+
+        guard let name = locale.displayName(
+            forKey: NSLocale.Key.identifier,
+            value: language) else {
+            return ""
         }
-        return Locale.preferredLanguages[0]
+
+        return name.capitalized
     }
-    
+
     /// Update base file name, searched in path.
-    public func update(fileName:String) {
+    open func update(fileName: String) {
         self.fileName = fileName
     }
-    
+
     /// Update the bundle used to load files from.
-    public func update(bundle: Bundle) {
+    open func update(bundle: Bundle) {
         self.usedBundle = bundle
     }
 
     // MARK: Localize methods.
-    
-    
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public func localize(key: String, tableName:String? = nil) -> String {
-        return ""
+    open func localize(key: String, tableName: String? = nil) -> String {
+        fatalError("implement it")
     }
-    
+
     /// Localize a string using your JSON File
     /// That replace all % character in your string with replace value.
     ///
     /// - parameter value: The replacement value
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, replace:String, tableName:String? = nil) -> String {
-        let string = self.localize(key: key, tableName:tableName)
+    open func localize(key: String, replace: String, tableName: String? = nil) -> String {
+        let string = localize(key: key, tableName: tableName)
 
         return string.replacingOccurrences(of: "%", with: replace)
     }
-    
+
     /// Localize a string using your JSON File
     /// That replace each % character in your string with each replace value.
     ///
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, values replace:[Any], tableName:String? = nil) -> String {
-        var string = self.localize(key: key, tableName:tableName)
-        if string == key {
-            return key
-        }
-        var array = string.components(separatedBy: "%")
-        string = ""
-        _ = replace.count + 1
-        for (index, element) in replace.enumerated() {
-            if index < array.count {
-                let new = array.remove(at: 0)
-                string = index == 0 ? "\(new)\(element)" : "\(string)\(new)\(element) "
-            }
-        }
-        string += array.joined(separator: "")
-        string = string.replacingOccurrences(of: "  ", with: " ")
-        return string
+    open func localize(
+      key: String,
+      values replace: [Any],
+      tableName: String? = nil) -> String {
+      
+      let string = localize(key: key, tableName: tableName)
+      let stringFormat = string.replacingOccurrences(of: "%", with: "%@")
+      return String(format: stringFormat, arguments: replace.map { "\($0)" })
     }
-    
+
+
     /// Localize string with dictionary values
     /// Get properties in your key with rule :property
     /// If property not exist in this string, not is used.
@@ -176,12 +151,16 @@ class LocalizeCommonProtocol: NSObject {
     /// - parameter value: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, dictionary replace:[String:String], tableName:String? = nil) -> String {
-        var string = self.localize(key: key, tableName:tableName)
+    open func localize(
+        key: String,
+        dictionary replace: [String: String],
+        tableName: String? = nil) -> String {
+
+        var string = localize(key: key, tableName: tableName)
         for (key, value) in replace {
             string = string.replacingOccurrences(of: ":\(key)", with: value)
         }
         return string
     }
-    
+
 }
diff --git a/Source/LocalizeConfig.swift b/Source/LocalizeConfig.swift
new file mode 100644
index 0000000..23117e1
--- /dev/null
+++ b/Source/LocalizeConfig.swift
@@ -0,0 +1,29 @@
+//
+//
+//  LocalizeSwift.swift
+//  Localize
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import Foundation
+
+class LocalizeConfig: NSObject {
+    var provider: LocalizeType
+    var fileName: String
+    var defaultLanguage: String
+    var currentLanguage: String?
+
+    init(
+        provider: LocalizeType = .strings,
+        fileName: String = "strings",
+        defaultLanguage: String = "en",
+        currentLanguage: String? = nil,
+        bundle: Bundle = .main) {
+
+        self.provider = provider
+        self.fileName = fileName
+        self.defaultLanguage = defaultLanguage
+        self.currentLanguage = currentLanguage
+    }
+}
diff --git a/Source/LocalizeExtensions.swift b/Source/LocalizeExtensions.swift
index 4229f79..555007c 100644
--- a/Source/LocalizeExtensions.swift
+++ b/Source/LocalizeExtensions.swift
@@ -1,445 +1,400 @@
 //
-//  LocalizableExtensions.swift
+//  LocalizeExtensions.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import UIKit
 
 private var localizeKey1: UInt8 = 0
 private var localizeKey2: UInt8 = 1
+private var autoLocalizeKey: UInt8 = 2
+
+/// Extension for NSCoding, easy way to storage IBInspectable properties.
+extension NSCoding {
+    /// Get associated property by IBInspectable var.
+    fileprivate func localizedValueFor(key: UnsafeMutablePointer<UInt8>) -> String? {
+        return objc_getAssociatedObject(self, key) as? String
+    }
+
+    /// Set associated property by IBInspectable var.
+    fileprivate func setLocalized(value: String?, key: UnsafeMutablePointer<UInt8>) {
+        guard let value = value else { return }
+        let policy = objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN
+        objc_setAssociatedObject(self, key, value, policy)
+    }
+
+    /// Get associated autoLocalize property by IBInspectable var.
+    fileprivate func autoLocalizeValue() -> Bool {
+        return objc_getAssociatedObject(self, &autoLocalizeKey) as? Bool ?? true
+    }
+
+    /// Set associated autoLocalize property by IBInspectable var.
+    fileprivate func setAutoLocalizeValue(value: Bool) {
+        let policy = objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN
+        objc_setAssociatedObject(self, &autoLocalizeKey, value, policy)
+    }
+}
+
+/// Extension for NotificationCenter to call easy the localize notification observer.
+extension NotificationCenter {
+    /// Custom function to add observers.
+    fileprivate static func localize(observer: Any, selector: Selector) {
+        NotificationCenter.default.addObserver(
+            observer,
+            selector: selector,
+            name: NSNotification.Name(localizeChangeNotification),
+            object: nil
+        )
+    }
+}
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UIBarButtonItem {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
-    @IBInspectable public var localizeKey: String! {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+    @IBInspectable public var localizeKey: String? {
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title for UIBarButtonItem
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
+        }
     }
-    
+
     /// Here we change text with key replacement
-    public func localize() {
-        if self.localizeKey != nil {
-            self.title = self.localizeKey?.localize()
-            return
-        }
-        if let title = self.title, !title.isEmpty {
-            self.title = title.localize()
-            if self.localizeKey == nil && self.title != title {
-                self.localizeKey = title
-            }
-        }
+    @objc public func localize() {
+        title = LocalizeUI.localize(key: &localizeKey, value: &title)
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UIButton {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
-    @IBInspectable public var localizeKey: String! {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+    @IBInspectable public var localizeKey: String? {
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title for UIButton in each state
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
+        }
     }
-    
+
     /// Here we change text with key replacement
-    public func localize() {
-        if self.localizeKey != nil {
-            for state in [UIControlState.normal, .highlighted, .selected, .disabled] {
-                if let title = title(for: state) , !title.isEmpty {
-                    self.setTitle(self.localizeKey?.localize(), for: state)
-                }
-            }
-            return
-        }
-        for state in [UIControlState.normal, .highlighted, .selected, .disabled] {
-            if let title = title(for: state), !title.isEmpty {
-                let localized = title.localize()
-                self.setTitle(localized, for: state)
-                if self.localizeKey == nil && localized != title {
-                    self.localizeKey = title
-                }
-            }
+    @objc public func localize() {
+        var title = titleLabel?.text
+        titleLabel?.text = LocalizeUI.localize(key: &localizeKey, value: &title)
+        #if swift(>=4.2)
+        let states: [UIControl.State] = [.normal, .highlighted, .selected, .disabled]
+        #else
+        let states: [UIControlState] = [.normal, .highlighted, .selected, .disabled]
+        #endif
+        for state in states {
+            var title = self.title(for: state)
+            title = LocalizeUI.localize(key: &localizeKey, value: &title)
+            setTitle(title, for: state)
         }
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UILabel {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title for UILabel
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
+        }
     }
-    
+
     /// Here we change text with key replacement
-    public func localize() {
-        if self.localizeKey != nil {
-            self.text = self.localizeKey?.localize()
-            return
-        }
-        if let text = text, !text.isEmpty {
-            self.text = text.localize()
-            if self.localizeKey == nil && self.text != text {
-                self.localizeKey = text
-            }
-        }
+    @objc public func localize() {
+        LocalizeUI.localize(key: &localizeKey, value: &text)
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UINavigationItem {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
     @IBInspectable public var localizeTitle: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Localizable tag storeged property
     @IBInspectable public var localizePrompt: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey2) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey2, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey2) }
+        set { setLocalized(value: newValue, key: &localizeKey2) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title and prompt for UINavigationItem
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
-    }
-    
-    /// Here we change text with key replacement
-    public func localize() {
-        self.localizeTitleFN()
-        self.localizePromptFN()
-    }
-    
-    /// Here we change text with key replacement for title
-    func localizeTitleFN() {
-        if self.localizeTitle != nil {
-            self.title = self.localizeTitle?.localize()
-            return
-        }
-        if let title = self.title, !title.isEmpty {
-            self.title = title.localize()
-            if self.localizeTitle == nil && self.title != title {
-                self.localizeTitle = title
-            }
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
         }
     }
-    
-    /// Here we change text with key replacement for prompt
-    func localizePromptFN() {
-        if self.localizePrompt != nil {
-            self.prompt = self.localizePrompt?.localize()
-            return
-        }
-        if let prompt = self.prompt, !prompt.isEmpty {
-            self.prompt = prompt.localize()
-            if self.localizePrompt == nil && self.prompt != prompt {
-                self.localizePrompt = prompt
-            }
-        }
+
+    /// Here we change text with key replacement
+    @objc public func localize() {
+        LocalizeUI.localize(key: &localizeTitle, value: &title)
+        LocalizeUI.localize(key: &localizePrompt, value: &prompt)
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UISearchBar {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
     @IBInspectable public var localizePlaceholder: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Localizable tag storeged property
     @IBInspectable public var localizePrompt: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey2) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey2, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey2) }
+        set { setLocalized(value: newValue, key: &localizeKey2) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title and prompt for UISearchBar
     open override  func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
-    }
-    
-    /// Here we change text with key replacement
-    public func localize() {
-        self.localizePlaceholderFN()
-        self.localizePromptFN()
-    }
-    
-    /// Here we change text with key replacement for placeholder
-    func localizePlaceholderFN() {
-        if self.localizePlaceholder != nil {
-            self.placeholder = self.localizePlaceholder?.localize()
-            return
-        }
-        if let placeholder = self.placeholder, !placeholder.isEmpty {
-            self.placeholder = placeholder.localize()
-            if self.localizePlaceholder == nil && self.placeholder != placeholder {
-                self.localizePlaceholder = placeholder
-            }
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
         }
     }
-    
-    /// Here we change text with key replacement for prompt
-    func localizePromptFN() {
-        if self.localizePrompt != nil {
-            self.prompt = self.localizePrompt?.localize()
-            return
-        }
-        if let prompt = self.prompt, !prompt.isEmpty {
-            self.prompt = prompt.localize()
-            if self.localizePrompt == nil && self.prompt != prompt {
-                self.localizePrompt = prompt
-            }
-        }
+
+    /// Here we change text with key replacement
+    @objc public func localize() {
+        LocalizeUI.localize(key: &localizePlaceholder, value: &placeholder)
+        LocalizeUI.localize(key: &localizePrompt, value: &prompt)
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UISegmentedControl {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title for UISegmentedControl in each state
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
+        }
     }
-    
+
     /// Here we change text with key replacement
-    public func localize() {
-        for index in 0...(self.numberOfSegments - 1) {
-            if let title = self.titleForSegment(at: index), !title.isEmpty {
-                self.setTitle(title.localize(), forSegmentAt: index)
-            }
+    @objc public func localize() {
+        for index in 0...(numberOfSegments - 1) {
+            var key = LocalizeUI.keyFor(index: index, localizeKey: localizeKey)
+            var title = titleForSegment(at: index)
+            title = LocalizeUI.localize(key: &key, value: &title, updateKey: false)
+            setTitle(title, forSegmentAt: index)
         }
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UITabBarItem {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title for UITabBarItem
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
+        }
     }
-    
+
     /// Here we change text with key replacement
-    public func localize() {
-        if self.localizeKey != nil {
-            self.title = self.localizeKey?.localize()
-            return
-        }
-        if let title = self.title, !title.isEmpty {
-            self.title = title.localize()
-            if self.localizeKey == nil && self.title != title {
-                self.localizeKey = title
-            }
-        }
+    @objc public func localize() {
+        LocalizeUI.localize(key: &localizeKey, value: &title)
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UITextField {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
     @IBInspectable public var localizeText: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Localizable tag storeged property
     @IBInspectable public var localizePlaceholder: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey2) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey2, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey2) }
+        set { setLocalized(value: newValue, key: &localizeKey2) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title and placeholder for UITextField
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
-    }
-    
-    /// Here we change text with key replacement
-    public func localize() {
-        self.localizePlaceholderFN()
-        self.localizeTextFN()
-    }
-    
-    /// Here we change text with key replacement for placeholder
-    func localizePlaceholderFN() {
-        if self.localizePlaceholder != nil {
-            self.placeholder = self.localizePlaceholder?.localize()
-            return
-        }
-        if let placeholder = self.placeholder, !placeholder.isEmpty {
-            self.placeholder = placeholder.localize()
-            if self.localizePlaceholder == nil && self.placeholder != placeholder {
-                self.localizePlaceholder = placeholder
-            }
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
         }
     }
-    
-    /// Here we change text with key replacement for text
-    func localizeTextFN() {
-        if self.localizeText != nil {
-            self.text = self.localizeText?.localize()
-            return
-        }
-        if let text = self.text, !text.isEmpty {
-            self.text = text.localize()
-            if self.localizeText == nil && self.text != text {
-                self.localizeText = text
-            }
-        }
+
+    /// Here we change text with key replacement
+    @objc public func localize() {
+        LocalizeUI.localize(key: &localizeText, value: &text)
+        LocalizeUI.localize(key: &localizePlaceholder, value: &placeholder)
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UITextView {
-    
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
     }
-    
+
     /// Override awakeFromNib when is going visible, try search a key in JSON File
     /// If key match replace text, if can't match return the key (original text)
     /// Set title for UITextView
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
+        }
     }
-    
+
     /// Here we change text with key replacement
-    public func localize() {
-        if self.localizeKey != nil {
-            self.text = self.localizeKey?.localize()
-            return
-        }
-        if let text = self.text, !text.isEmpty {
-            self.text = text.localize()
-            if self.localizeKey == nil && self.text != text {
-                self.localizeKey = text
-            }
+    @objc public func localize() {
+        var localize = text
+        localize = LocalizeUI.localize(key: &localizeKey, value: &localize)
+        text = localize
+    }
+}
+
+/// Extension for UI element is the easier way to localize your keys.
+extension UIViewController {
+    /// Auto localize stored property
+    @IBInspectable public var autoLocalize: Bool {
+        get { return autoLocalizeValue() }
+        set { setAutoLocalizeValue(value: newValue) }
+    }
+
+    /// Localizable tag storeged property
+    @IBInspectable public var localizeTitle: String? {
+        get { return localizedValueFor(key: &localizeKey1) }
+        set { setLocalized(value: newValue, key: &localizeKey1) }
+    }
+
+    /// Override awakeFromNib when is going visible, try search a key in JSON File
+    /// If key match replace text, if can't match return the key (original text)
+    /// Set title and placeholder for UITextField
+    open override func awakeFromNib() {
+        super.awakeFromNib()
+        if autoLocalize {
+            localize()
+            NotificationCenter.localize(observer: self, selector: #selector(localize))
         }
     }
-    
+
+    /// Here we change text with key replacement
+    @objc public func localize() {
+        LocalizeUI.localize(key: &localizeTitle, value: &title)
+    }
 }
diff --git a/Source/LocalizeJson.swift b/Source/LocalizeJson.swift
index 2e70a75..1c82f6b 100644
--- a/Source/LocalizeJson.swift
+++ b/Source/LocalizeJson.swift
@@ -2,92 +2,54 @@
 //  LocalizeJson.swift
 //  Localize
 //
-//  Copyright © 2017 Kekiiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
-import UIKit
+import Foundation
 
-class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
+private typealias JSON = NSDictionary
 
-    /// Create default lang name
-    override init() {
-        super.init()
-        self.fileName = "lang"
-    }
-    
-    // MARK: Read JSON methods
-    
-    /// This metod contains a logic to read return JSON data
-    /// If JSON not is defined, this try use a default
-    /// As long as the default language is the same as the current one.
-    private func readJSON(tableName:String? = nil) -> NSDictionary? {
-        let tableName = tableName ?? self.fileName
-        var lang = self.currentLanguage
-        var json = self.readJSON(named: "\(tableName)-\(lang)")
-        
-        if json != nil {
-            return json
-        }
-        
-        lang = lang.components(separatedBy: "-")[0]
-        json = self.readJSON(named: "\(tableName)-\(lang)")
-        
-        if json == nil && lang != self.defaultLanguage {
-            json = self.readDefaultJSON()
-        }
-        
-        return json
-    }
-    
-    /// Read a JSON with default language value.
-    ///
-    /// - returns: json or nil value.
-    private func readDefaultJSON(tableName:String? = nil) -> NSDictionary? {
-        let tableName = tableName ?? self.fileName
-        return self.readJSON(named: "\(tableName)-\(self.defaultLanguage)")
-    }
-    
+fileprivate extension JSON {
     /// This method has path where file is
     /// If can't find a path return a nil value
     /// If can't serialize data return a nil value
-    private func readJSON(named name:String) -> NSDictionary? {
-        guard let path = self.bundle().path(forResource: name, ofType: "json") else {
-            return nil
-        }
-        guard let data = try? Data(contentsOf: URL(fileURLWithPath: path)) else {
-            print("Localize can't read your file")
+    static func read(bundle: Bundle, named name: String) -> JSON? {
+        guard let path = bundle.path(forResource: name, ofType: "json") else {
             return nil
         }
         do {
-            return try JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.mutableContainers) as? NSDictionary
-        }
-        catch {
-            print("Localize can't parse your file")
-            return nil
+            let data = try Data(contentsOf: URL(fileURLWithPath: path))
+            return try JSONSerialization.jsonObject(
+                with: data,
+                options: JSONSerialization.ReadingOptions.mutableContainers
+            ) as? NSDictionary
+        } catch {
+            print("Localize can't parse your file", error)
         }
+        return nil
     }
-    
+
     /// Try search key in your dictionary using single level
     /// If it doesn't find the key it will use the multilevel
     /// If the key not exis in your JSON return nil value
-    private func localizeFile(key:String, json:NSDictionary) -> String? {
-        if let string = json[key] {
+    func valueFor(key: String) -> String? {
+        if let string = self[key] {
             return string as? String
         }
-        
-        if let string = self.localizeLevel(key: key, json: json) {
+
+        if let string = valueForKeyInLevels(key: key) {
             return string
         }
-        
+
         return nil
     }
-    
+
     /// Try search key in your dictionary using multiples levels
     /// It is necessary that the result be a string
     /// Otherwise it returns nil value
-    private func localizeLevel(key: String, json:AnyObject?) -> String? {
+    private func valueForKeyInLevels(key: String) -> String? {
         let values = key.components(separatedBy: ".")
-        var jsonCopy = json
+        var jsonCopy: AnyObject? = self as AnyObject
         for key in values {
             if let result = jsonCopy?[key] {
                 jsonCopy = result as AnyObject?
@@ -95,56 +57,92 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
                 return nil
             }
         }
+
         return jsonCopy as? String
     }
-    
+}
+
+public class LocalizeJson: LocalizeCommonProtocol {
+
+    /// Create default lang name
+    override init() {
+        super.init()
+        fileName = "lang"
+    }
+
+    /// Show all aviable languages with criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public override var availableLanguages: [String] {
+        var languages: [String] = []
+
+        for localeId in NSLocale.availableLocaleIdentifiers {
+            let name = "\(fileName)-\(localeId)"
+            let path = bundle.path(forResource: name, ofType: "json")
+            if path != nil {
+                languages.append(localeId)
+            }
+        }
+
+        return languages
+    }
+
+    // MARK: Read JSON methods
+
+    /// This metod contains a logic to read return JSON data
+    /// If JSON not is defined, this try use a default
+    /// As long as the default language is the same as the current one.
+    private func readJSON(tableName: String? = nil) -> JSON? {
+        let tableName = tableName ?? fileName
+        var lang = currentLanguage
+        var json = JSON.read(bundle: bundle, named: "\(tableName)-\(lang)")
+
+        if json != nil {
+            return json
+        }
+
+        lang = lang.components(separatedBy: "-")[0]
+        json = JSON.read(bundle: bundle, named: "\(tableName)-\(lang)")
+
+        if json == nil && lang != defaultLanguage {
+            json = readDefaultJSON()
+        }
+
+        return json
+    }
+
+    /// Read a JSON with default language value.
+    ///
+    /// - returns: json or nil value.
+    private func readDefaultJSON(tableName: String? = nil) -> JSON? {
+        let tableName = tableName ?? fileName
+        return JSON.read(bundle: bundle, named: "\(tableName)-\(defaultLanguage)")
+    }
+
     // MARK: Public methods
-    
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public override func localize(key:String, tableName:String? = nil) -> String {
-        guard let json = self.readJSON(tableName: tableName) else {
+    public override func localize(key: String, tableName: String? = nil) -> String {
+        guard let json = readJSON(tableName: tableName) else {
             return key
         }
-        
-        let string = self.localizeFile(key: key, json: json)
-        if string != nil {
-            return string!
+
+        if let string = json.valueFor(key: key) {
+            return string
         }
-        
-        guard let defaultJSON = self.readDefaultJSON(tableName: tableName) else {
+
+        guard let defaultJSON = readDefaultJSON(tableName: tableName) else {
             return key
         }
-        
-        let defaultString = self.localizeFile(key: key, json: defaultJSON)
-        if defaultString != nil {
-            return defaultString!
-        }
-        
-        return key
-    }
-    
-    
-    // MARK: Config methods
-    
-    
-    /// Show all aviable languages with criteria name
-    ///
-    /// - returns: list with storaged languages code
-    public func availableLanguages() -> [String] {
-        var languages : [String] = []
 
-        for localeId in NSLocale.availableLocaleIdentifiers {
-            let name = "\(self.fileName)-\(localeId)"
-            let path = self.bundle().path(forResource: name, ofType: "json")
-            if path != nil {
-                languages.append(localeId)
-            }
+        guard let defaultString = defaultJSON.valueFor(key: key) else {
+            return key
         }
-        return languages
-    }
 
+        return defaultString
+    }
 }
diff --git a/Source/LocalizeProtocol.swift b/Source/LocalizeProtocol.swift
index 059507f..084cca1 100644
--- a/Source/LocalizeProtocol.swift
+++ b/Source/LocalizeProtocol.swift
@@ -2,47 +2,52 @@
 //  LocalizeProtocol.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
-import UIKit
+import Foundation
+
+public protocol LocalizeProtocol {
 
-protocol LocalizeProtocol {
-    
-    /// Use this for testing mode, search resources in different bundles.
-    var testing: Bool {get set}
-    
     /// Default language, if this can't find a key in your current language
     /// Try read key in default language
     var defaultLanguage: String {get set}
-    
-    
-    /// MARK: Localize Methos
-    
-    
+
+    /// Storaged language or default language in device
+    ///
+    /// - returns: storaged language
+    var currentLanguage: String {get}
+
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    var availableLanguages: [String] {get}
+
+    // MARK: Localize Methos
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    func localize(key:String, tableName:String?) -> String
-    
+    func localize(key: String, tableName: String?) -> String
+
     /// Localize a string using your JSON File
     /// That replace all % character in your string with replace value.
     ///
     /// - parameter value: The replacement value
     ///
     /// - returns: localized key or same text
-    func localize(key:String, replace:String, tableName:String?) -> String
-    
+    func localize(key: String, replace: String, tableName: String?) -> String
+
     /// Localize a string using your JSON File
     /// That replace each % character in your string with each replace value.
     ///
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    func localize(key:String, values replace:[Any], tableName:String?) -> String
-    
+    func localize(key: String, values replace: [Any], tableName: String?) -> String
+
     /// Localize string with dictionary values
     /// Get properties in your key with rule :property
     /// If property not exist in this string, not is used.
@@ -50,44 +55,31 @@ protocol LocalizeProtocol {
     /// - parameter value: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    func localize(key:String, dictionary replace:[String:String], tableName:String?) -> String
-    
-    
+    func localize(
+        key: String,
+        dictionary replace: [String: String],
+        tableName: String?) -> String
+
     // MARK: Config methods
-    
-    
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    func language() -> String
-    
+
     /// Update default language, this stores a language key which can be retrieved the next time
-    func update(language: String) -> Void
-    
+    func update(language: String)
+
     /// Update base file name, searched in path.
-    func update(fileName:String)
-    
+    func update(fileName: String)
+
     /// Update the bundle used to load files from.
     func update(bundle: Bundle)
-    
+
     /// Update default language
     func update(defaultLanguage: String)
-    
+
     /// This remove the language key storaged.
-    func resetLanguage() -> Void
-    
-    /// Show all aviable languajes whit criteria name
-    ///
-    /// - returns: list with storaged languages code
-    func availableLanguages() -> [String]
-    
+    func resetLanguage()
+
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
     func displayNameForLanguage(_ language: String) -> String
-    
-    /// Enable testing mode
-    /// Please not use in your code, is only for test schema.
-    func testingMode()
-    
+
 }
diff --git a/Source/LocalizeStatic.swift b/Source/LocalizeStatic.swift
index 6fd330d..bba03a8 100644
--- a/Source/LocalizeStatic.swift
+++ b/Source/LocalizeStatic.swift
@@ -1,43 +1,65 @@
 //
-//  LocalizableStatic.swift
+//  LocalizeStatic.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
-import UIKit
+import Foundation
 
 extension Localize {
-    
+
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public static var availableLanguages: [String] {
+        return Localize.shared.availableLanguages
+    }
+
+    /// Return storaged language or default language in device
+    ///
+    /// - returns: current used language
+    public static var currentLanguage: String {
+        return Localize.shared.currentLanguage
+    }
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, tableName:String? = nil) -> String {
+    public static func localize(key: String, tableName: String? = nil) -> String {
         return Localize.shared.localize(key: key, tableName: tableName)
     }
-    
+
     /// Localize a string using your JSON File
     /// That replace all % character in your string with replace value.
     ///
     /// - parameter value: The replacement value
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, replace:String, tableName:String? = nil) -> String {
+    public static func localize(
+        key: String,
+        replace: String,
+        tableName: String? = nil) -> String {
+
         return Localize.shared.localize(key: key, replace: replace, tableName: tableName)
     }
-    
+
     /// Localize a string using your JSON File
     /// That replace each % character in your string with each replace value.
     ///
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, values replace:[Any], tableName:String? = nil) -> String {
+    public static func localize(
+        key: String,
+        values replace: [Any],
+        tableName: String? = nil) -> String {
+
         return Localize.shared.localize(key: key, values: replace, tableName: tableName)
     }
-    
+
     /// Localize string with dictionary values
     /// Get properties in your key with rule :property
     /// If property not exist in this string, not is used.
@@ -45,27 +67,24 @@ extension Localize {
     /// - parameter value: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, dictionary replace:[String:String], tableName:String? = nil) -> String {
+    public static func localize(
+        key: String,
+        dictionary replace: [String: String],
+        tableName: String? = nil) -> String {
+
         return Localize.shared.localize(key: key, dictionary: replace, tableName: tableName)
     }
-    
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    public static func language() -> String {
-        return Localize.shared.language()
-    }
-    
+
     /// Update default language, this stores a language key which can be retrieved the next time
     public static func update(language: String) {
         return Localize.shared.update(language: language)
     }
-    
+
     /// Update base file name, searched in path.
-    public static func update(fileName:String) {
+    public static func update(fileName: String) {
         return Localize.shared.update(fileName: fileName)
     }
-    
+
     /// Update the bundle used to load files from.
     public static func update(bundle: Bundle) {
         return Localize.shared.update(bundle: bundle)
@@ -75,37 +94,32 @@ extension Localize {
     public static func update(defaultLanguage: String) {
         return Localize.shared.update(defaultLanguage: defaultLanguage)
     }
-    
+
     /// This remove the language key storaged.
     public static func resetLanguage() {
         return Localize.shared.resetLanguage()
     }
-    
-    /// Show all aviable languajes whit criteria name
-    ///
-    /// - returns: list with storaged languages code
-    public static func availableLanguages() -> [String] {
-        return Localize.shared.availableLanguages()
-    }
-    
+
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
     public static func displayNameForLanguage(_ language: String) -> String {
         return Localize.shared.displayNameForLanguage(language)
     }
-    
-    /// Enable testing mode
-    /// Please not use in your code, is only for test schema.
-    public static func testingMode() {
-        Localize.shared.testingMode()
+
+    /// Determines whether a localized string exists for given key
+    ///
+    /// - parameter key: localization key
+    /// - returns: boolean value determining whether a localized string exists for give key
+    public static func localizeExists(forKey key: String, table: String? = nil) -> Bool {
+        return Localize.shared.localizeExists(forKey: key, table: table)
     }
-    
+
     // MARK: Config providers
-    
+
     /// Update provider to localize your app.
     public static func update(provider: LocalizeType) {
         Localize.shared.update(provider: provider)
     }
-    
+
 }
diff --git a/Source/LocalizeString.swift b/Source/LocalizeString.swift
index 04d6d53..c608214 100644
--- a/Source/LocalizeString.swift
+++ b/Source/LocalizeString.swift
@@ -1,54 +1,63 @@
 //
-//  LocalizableString.swift
+//  LocalizeString.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
-import UIKit
+import Foundation
 
 /// String extension used to localize your keys matched
 /// in your JSON File.
 public extension String {
-    
+
+    /// Localize a string using your JSON File
+    /// If the key is not found return the same key
+    /// that prevent replace untagged values
+    ///
+    /// - returns: localized key or same text
+    var localized: String {
+        return Localize.localize(key: self)
+    }
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// that prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public func localize() -> String {
+    func localize() -> String {
         return Localize.localize(key: self)
     }
-    
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// that prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public func localize(tableName:String) -> String {
+    func localize(tableName: String) -> String {
         return Localize.localize(key: self, tableName: tableName)
     }
-    
+
     /// Localize a string using your JSON File
     /// that replace all % character in your string with replace value.
     ///
     /// - parameter String: The replacement value
     ///
     /// - returns: localized key or same text
-    public func localize(value:String, tableName:String? = nil) -> String {
+    func localize(value: String, tableName: String? = nil) -> String {
         return Localize.localize(key: self, replace: value, tableName: tableName)
     }
-    
+
     /// Localize a string using your JSON File
     /// that replace each % character in your string with each replace value.
     ///
     /// - parameter Strings: The replacement values
     ///
     /// - returns: localized key or same text
-    public func localize(values:String..., tableName:String? = nil) -> String {
+    func localize(values: String..., tableName: String? = nil) -> String {
         return Localize.localize(key: self, values: values, tableName: tableName)
     }
-    
+
     /// Localize string with dictionary values
     /// get properties in your key with rule :property
     /// if property not exist in this string, not is used.
@@ -56,8 +65,21 @@ public extension String {
     /// - parameter [String:String]: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    public func localize(dictionary values:[String:String], tableName:String? = nil) -> String {
+    func localize(
+        dictionary values: [String: String],
+        tableName: String? = nil) -> String {
+
         return Localize.localize(key: self, dictionary: values, tableName: tableName)
     }
-    
+
+    /// Pluralize strings with numeric value
+    /// get localized and pluralized key acording with the rules
+    /// and value.
+    ///
+    /// - parameter String: The value could you pluralize
+    ///
+    /// - returns: Localized and Pluralized key according with the value.
+    func pluralize(value: Int, tableName: String? = nil) -> String {
+        return Pluralize.pluralize(key: self, value: value, tableName: tableName)
+    }
 }
diff --git a/Source/LocalizeStrings.swift b/Source/LocalizeStrings.swift
old mode 100644
new mode 100755
index ed4e97d..a94a775
--- a/Source/LocalizeStrings.swift
+++ b/Source/LocalizeStrings.swift
@@ -2,56 +2,100 @@
 //  LocalizeStrings.swift
 //  Localize
 //
-//  Copyright © 2017 Kekiiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
-import UIKit
+import Foundation
+
+public class LocalizeStrings: LocalizeCommonProtocol {
 
-class LocalizeStrings:LocalizeCommonProtocol, LocalizeProtocol {
-    
     /// Create default lang name
     override init() {
         super.init()
-        self.fileName = "Strings"
+        fileName = "Strings"
+    }
+
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public override var availableLanguages: [String] {
+        var availableLanguages = bundle.localizations
+        if let indexOfBase = availableLanguages.firstIndex(of: "Base") {
+            availableLanguages.remove(at: indexOfBase)
+        }
+        return availableLanguages
     }
-    
+
     // MARK: Public methods
-    
-    
+
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public override func localize(key:String, tableName:String? = nil) -> String {
-        let tableName = tableName ?? self.fileName
-        if let path = self.bundle().path(forResource: self.currentLanguage, ofType: "lproj") {
-            let bundle = Bundle(path: path)!
+    public override func localize(key: String, tableName: String? = nil) -> String {
+        let tableName = tableName ?? fileName
+
+        // First, try to find translation in currentLanguage.
+        if let localized = localize(key: key, tableName: tableName, lang: currentLanguage) {
+            return localized
+        }
+
+        // If current language contains a language/region divider, try general language without
+        // a specific region.
+        if currentLanguage.contains("-"),
+            let lang = currentLanguage.split(separator: "-").first,
+            let localized = localize(key: key, tableName: tableName, lang: String(lang)) {
+
+            return localized
+        }
+
+        // Fall back to the defaultLange - "en" by default, but could have been changed.
+        if let localized = localize(key: key, tableName: tableName, lang: defaultLanguage) {
+            return localized
+        }
+
+        // If default language contains a language/region divider, try general language without
+        // a specific region.
+        if defaultLanguage.contains("-"),
+            let lang = defaultLanguage.split(separator: "-").first,
+            let localized = localize(key: key, tableName: tableName, lang: String(lang)) {
+
+            return localized
+        }
+
+        if bundle.path(forResource: tableName, ofType: "strings") != nil {
             let localized = bundle.localizedString(forKey: key, value: nil, table: tableName)
+
             if localized != key {
                 return localized
             }
         }
-        if let path = self.bundle().path(forResource: self.defaultLanguage, ofType: "lproj") {
-            let bundle = Bundle(path: path)!
-            return bundle.localizedString(forKey: key, value: nil, table: tableName)
-        }
+
+        // If we can't find a translation anywhere, return the original key.
         return key
     }
-    
-    
-    // MARK: Config methods
-    
-    
-    /// Show all aviable languajes whit criteria name
+
+    /// Internal helper method:
+    /// Localize a key for the given table and language.
     ///
-    /// - returns: list with storaged languages code
-    public func availableLanguages() -> [String] {
-        var availableLanguages = self.bundle().localizations
-        if let indexOfBase = availableLanguages.index(of: "Base") {
-            availableLanguages.remove(at: indexOfBase)
+    /// - parameter key: The key for a string in the table identified by tableName.
+    /// - parameter tableName: The receiver’s string table to search. If tableName is nil or is an
+    ///   empty string, the method attempts to use the table in Localizable.strings.
+    /// - parameter lang: The locale's folder name.
+    /// - returns: A localized version of the string designated by key in table tableName or NIL,
+    ///   if not found.
+    private func localize(key: String, tableName: String, lang: String) -> String? {
+        if let path = bundle.path(forResource: lang, ofType: "lproj"),
+            let bundle = Bundle(path: path) {
+
+            let localized = bundle.localizedString(forKey: key, value: nil, table: tableName)
+
+            if localized != key {
+                return localized
+            }
         }
-        return availableLanguages
+
+        return nil
     }
-    
 }
diff --git a/Source/LocalizeUI.swift b/Source/LocalizeUI.swift
new file mode 100644
index 0000000..13d68c0
--- /dev/null
+++ b/Source/LocalizeUI.swift
@@ -0,0 +1,58 @@
+//
+//  LocalizeUI.swift
+//  Localize
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import Foundation
+
+class LocalizeUI: NSObject {
+    /// Localize UI component using key and value or result
+    /// It decide wich is the way to localize, user IB Properties
+    /// or values in the ui component.
+    ///
+    /// - returns: localized string and also edit it inside.
+    @discardableResult
+    static func localize(
+        key: inout String?,
+        value: inout String?,
+        updateKey: Bool = true) -> String {
+
+        if let localized = key?.localize() {
+            value = localized
+            return localized
+        }
+        if let localized = value?.localize() {
+            if updateKey { key = value }
+            value = localized
+            return localized
+        }
+
+        return value ?? ""
+    }
+
+    /// Get key for segment controls based on string like to
+    /// navigation.segment: one, two or one, two
+    /// it returns the right access key to localize segment at index
+    ///
+    /// - returns: key to localize
+    static func keyFor(index: Int, localizeKey: String?) -> String? {
+        var localizeKey = localizeKey?.replacingOccurrences(of: " ", with: "")
+        let root = localizeKey?.components(separatedBy: ":")
+        var rootKey: String?
+
+        if root?.count == 2 {
+            rootKey = root?.first
+            localizeKey = root?.last
+        }
+
+        let keys = localizeKey?.components(separatedBy: ",")
+        let key = keys?.count ?? 0 > index ? keys?[index] : nil
+
+        if key == nil || key?.isEmpty ?? true { return nil }
+        if rootKey == nil { return key }
+
+        return "\(rootKey ?? "").\(key ?? "")"
+    }
+}
diff --git a/Source/Pluralize.swift b/Source/Pluralize.swift
new file mode 100644
index 0000000..46f6ff4
--- /dev/null
+++ b/Source/Pluralize.swift
@@ -0,0 +1,50 @@
+//
+//  Pluralize.swift
+//  Localize
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import Foundation
+
+fileprivate extension Int {
+    /// Get plural string value for Int value.
+    var plural: String {
+        switch self {
+        case 0:
+            return "zero"
+        case 1:
+            return "one"
+        case 2:
+            return "two"
+        case 3...99:
+            return "many"
+        case 100...999:
+            return "hundreds"
+        case 1_000...999_999:
+            return "thousand"
+        case 1_000_000...999_999_999:
+            return "millions"
+        default:
+            return "other"
+        }
+    }
+}
+
+/// Pluralize is a class focused in reduce your app logic for localized values
+/// you can pluralize
+public class Pluralize {
+
+    /// Pluralize strings with numeric value
+    /// get localized and pluralized key acording with the rules
+    /// and value.
+    ///
+    /// - parameter String: The value could you pluralize
+    ///
+    /// - returns: Localized and Pluralized key according with the value.
+    static func pluralize(key: String, value: Int, tableName: String? = nil) -> String {
+        let key = "\(key).\(value.plural)"
+
+        return key.localize(value: "\(value)", tableName: tableName)
+    }
+}
diff --git a/Tests/Base.lproj/Storyboard.storyboard b/Tests/Base.lproj/Storyboard.storyboard
new file mode 100644
index 0000000..f9a048e
--- /dev/null
+++ b/Tests/Base.lproj/Storyboard.storyboard
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+    </dependencies>
+    <scenes/>
+</document>
diff --git a/Tests/BaseTest.swift b/Tests/BaseTest.swift
index 0372363..263d3d5 100644
--- a/Tests/BaseTest.swift
+++ b/Tests/BaseTest.swift
@@ -2,64 +2,83 @@
 //  BaseTest.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class BaseTest: XCTestCase {
-    
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "en")
     }
-    
+
+    func testRemoveKeyAndGetDefaultForLang() {
+        UserDefaults.standard.removeObject(forKey: localizeStorageKey)
+        XCTAssertEqual(Localize.currentLanguage, Locale.preferredLanguages.first)
+    }
+
+    func testSameKeyWithTableName() {
+        let localized = "heymamiwhereareyou".localize(values: "", "", tableName: "heymamiwhereareyou")
+        XCTAssertEqual(localized, "heymamiwhereareyou")
+    }
+
+    func testLocalizeInAnyDictionary() {
+        let localized = "heymomhowareyoy".localized
+        XCTAssertEqual(localized, "heymomhowareyoy")
+    }
+
     func testLocalizeKey() {
         let localized = "hello.world".localize()
-        XCTAssertTrue(localized == "Hello world!")
+        XCTAssertEqual(localized, "Hello world!")
     }
-    
+
     func testLocalizeKeyWithValue() {
         let localized = "name".localize(value: "Andres")
-        XCTAssertTrue(localized == "Hello Andres")
+        XCTAssertEqual(localized, "Hello Andres")
     }
-    
+
     func testLocalizeKeyWithValues() {
         let localized = "values".localize(values: "Andres", "Software Developer")
-        XCTAssertTrue(localized == "Hello everyone my name is Andres and I'm Software Developer , see you soon")
+        XCTAssertEqual(localized, "Hello everyone my name is Andres and I'm Software Developer, see you soon")
     }
-    
+
     func testLocalizeKeyWithDictionary() {
         let localized = "username".localize(dictionary: ["username": "andresilvagomez"])
-        XCTAssertTrue(localized == "My username is andresilvagomez")
+        XCTAssertEqual(localized, "My username is andresilvagomez")
     }
-    
+
     func testLocalizeKeyWithManyLevels() {
         let localized = "level.one.two.three".localize()
-        XCTAssertTrue(localized == "This is a multilevel key")
+        XCTAssertEqual(localized, "This is a multilevel key")
     }
-    
+
     func testLocalizeKeyWithSingleLevel() {
         let localized = "the.same.lavel".localize()
-        XCTAssertTrue(localized == "This is a localized in the same level")
+        XCTAssertEqual(localized, "This is a localized in the same level")
     }
-    
+
     func testSearchInOtherFile() {
         let localized = "hello.baby".localize(tableName: "other")
-        XCTAssertTrue(localized == "This is a welcome, new baby is here!")
+        XCTAssertEqual(localized, "This is a welcome, new baby is here!")
     }
-    
+
+    func testCheckIfKeyExist() {
+        XCTAssertTrue(Localize.localizeExists(forKey: "hello.baby", table: "other"))
+        XCTAssertTrue(Localize.localizeExists(forKey: "the.same.lavel"))
+        XCTAssertFalse(Localize.localizeExists(forKey: "hello.baby2"))
+    }
+
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
-        XCTAssertTrue(languages == ["en", "es"])
+        let languages = Localize.availableLanguages
+        XCTAssertEqual(languages.count, 3)
     }
-    
+
     func testCurrentLanguage() {
-        let language = Localize.language()
-        XCTAssertTrue(language == "en")
+        let language = Localize.currentLanguage
+        XCTAssertEqual(language, "en")
     }
-    
 }
diff --git a/Tests/BaseTestInSpanish.swift b/Tests/BaseTestInSpanish.swift
index 1c2e5b1..079e1f2 100644
--- a/Tests/BaseTestInSpanish.swift
+++ b/Tests/BaseTestInSpanish.swift
@@ -2,64 +2,67 @@
 //  BaseTestInSpanish.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class BaseTestInSpanish: XCTestCase {
-    
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "es")
     }
-    
+
+    func testRemoveKeyAndGetDefaultForLang() {
+        UserDefaults.standard.removeObject(forKey: localizeStorageKey)
+        XCTAssertEqual(Localize.currentLanguage, Locale.preferredLanguages.first)
+    }
+
     func testLocalizeKey() {
         let localized = "hello.world".localize()
-        XCTAssertTrue(localized == "Hola mundo!")
+        XCTAssertEqual(localized, "Hola mundo!")
     }
-    
+
     func testLocalizeKeyWithValue() {
         let localized = "name".localize(value: "Andres")
-        XCTAssertTrue(localized == "Hola Andres")
+        XCTAssertEqual(localized, "Hola Andres")
     }
-    
+
     func testLocalizeKeyWithValues() {
         let localized = "values".localize(values: "Andres", "Software Developer")
-        XCTAssertTrue(localized == "Hola a todos mi nombre es Andres y soy Software Developer , nos vemos pronto")
+        XCTAssertEqual(localized, "Hola a todos mi nombre es Andres y soy Software Developer, nos vemos pronto")
     }
-    
+
     func testLocalizeKeyWithDictionary() {
         let localized = "username".localize(dictionary: ["username": "andresilvagomez"])
-        XCTAssertTrue(localized == "Mi nombre de usuario es andresilvagomez")
+        XCTAssertEqual(localized, "Mi nombre de usuario es andresilvagomez")
     }
-    
+
     func testLocalizeKeyWithManyLevels() {
         let localized = "level.one.two.three".localize()
-        XCTAssertTrue(localized == "Esta es una llave multinivel")
+        XCTAssertEqual(localized, "Esta es una llave multinivel")
     }
-    
+
     func testLocalizeKeyWithSingleLevel() {
         let localized = "the.same.lavel".localize()
-        XCTAssertTrue(localized == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertEqual(localized, "Esto es una internazionalizacion en el mismo nivel")
     }
-    
+
     func testDefaultValuesFromOtherLanguage() {
         let localized = "enlish".localize()
-        XCTAssertTrue(localized == "This key only exist in english file.")
+        XCTAssertEqual(localized, "This key only exist in english file.")
     }
-    
+
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
-        XCTAssertTrue(languages == ["en", "es"])
+        let languages = Localize.availableLanguages
+        XCTAssertEqual(languages.count, 3)
     }
-    
+
     func testCurrentLanguage() {
-        let language = Localize.language()
-        XCTAssertTrue(language == "es")
+        let language = Localize.currentLanguage
+        XCTAssertEqual(language, "es")
     }
-    
 }
diff --git a/Tests/JSONBadSources.swift b/Tests/JSONBadSources.swift
new file mode 100644
index 0000000..bcedc0c
--- /dev/null
+++ b/Tests/JSONBadSources.swift
@@ -0,0 +1,64 @@
+//
+//  JSONBadSources.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import Localize
+
+class JSONBadSources: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .json)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "en")
+        Localize.update(defaultLanguage: "rs")
+    }
+
+    func testLocalizeInAnyDictionary() {
+        let localized = "heymomhowareyoy".localized
+        XCTAssertEqual(localized, "heymomhowareyoy")
+    }
+
+    func testLocalizeProperty() {
+        let localized = "hello.world".localized
+        XCTAssertEqual(localized, "Hello world!")
+    }
+
+    func testLocalizeKey() {
+        let localized = "hello.world".localize()
+        XCTAssertEqual(localized, "Hello world!")
+    }
+
+    func testWithTableName() {
+        let localized = "test.in.table".localize(tableName: "langTable")
+        XCTAssertEqual(localized, "Test in table name")
+    }
+
+    func testWithBadTableName() {
+        let localized = "test.in.table".localize(tableName: "langTablesss")
+        XCTAssertEqual(localized, "test.in.table")
+    }
+
+    func testBadValueForKeyInLevels() {
+        let localized = "test.in.table".localized
+        XCTAssertEqual(localized, "test.in.table")
+    }
+
+    func testBadJSONFormat() {
+        let localized = "test.in.table".localize(tableName: "badJSON")
+        XCTAssertEqual(localized, "test.in.table")
+    }
+
+    func testNameForLanguage() {
+        let localized = Localize.displayNameForLanguage("es")
+        XCTAssertEqual(localized, "Spanish")
+    }
+
+    func testRestDefaultLang() {
+        Localize.resetLanguage()
+        XCTAssertTrue(true)
+    }
+}
diff --git a/Tests/JsonChanginFileName.swift b/Tests/JsonChanginFileName.swift
index ad5beec..f556ce4 100644
--- a/Tests/JsonChanginFileName.swift
+++ b/Tests/JsonChanginFileName.swift
@@ -2,30 +2,39 @@
 //  JsonChanginFileName.swift
 //  Localize
 //
-//  Copyright © 2017 Kekiiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class JsonChanginFileName: XCTestCase {
-    
+
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
         Localize.update(language: "es")
         Localize.update(fileName: "lang")
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
     }
-    
+
     func testKeyInOtherLanguage() {
         let localized = "hello.baby".localize(tableName: "other")
-        XCTAssertTrue(localized == "Esto es un saludo, el nuevo bebé está aquí!")
+        XCTAssertEqual(localized, "Esto es un saludo, el nuevo bebé está aquí!")
     }
-    
+
     func testSearchInOtherFile() {
         let localized = "hello".localize(tableName: "other")
-        XCTAssertTrue(localized == "Hola mundo!")
+        XCTAssertEqual(localized, "Hola mundo!")
+    }
+
+    func testNameForLanguage() {
+        let localized = Localize.displayNameForLanguage("es")
+        XCTAssertEqual(localized, "Español")
+    }
+
+    func testNameBadForLanguage() {
+        let localized = Localize.displayNameForLanguage("esus")
+        XCTAssertEqual(localized, "")
     }
-    
 }
diff --git a/Tests/OnlyOneLang.strings b/Tests/OnlyOneLang.strings
new file mode 100644
index 0000000..e396d3e
--- /dev/null
+++ b/Tests/OnlyOneLang.strings
@@ -0,0 +1 @@
+"hello.world.for.all" = "Hello world for all";
diff --git a/Tests/OtherLangTest.swift b/Tests/OtherLangTest.swift
index 814ed3c..0ac264e 100644
--- a/Tests/OtherLangTest.swift
+++ b/Tests/OtherLangTest.swift
@@ -2,29 +2,29 @@
 //  OtherFileTest.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class OtherLangTest: XCTestCase {
-    
+
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "it")
     }
-    
+
     func testLocalizeKey() {
         let localized = "hello".localize()
-        XCTAssertTrue(localized == "hello")
+        XCTAssertEqual(localized, "hello")
     }
-    
+
     func testLocalizeKeyUsingDefaultLang() {
         let localized = "hello.world".localize()
-        XCTAssertTrue(localized == "Hello world!")
+        XCTAssertEqual(localized, "Hello world!")
     }
-    
+
 }
diff --git a/Tests/PluralizeJsonTest.swift b/Tests/PluralizeJsonTest.swift
new file mode 100644
index 0000000..00b64d5
--- /dev/null
+++ b/Tests/PluralizeJsonTest.swift
@@ -0,0 +1,40 @@
+//
+//  PluralizeJsonTest.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import Localize
+
+class PluralizeJsonTest: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .json)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "en")
+    }
+
+    func testPluralize() {
+        XCTAssertEqual("people".pluralize(value: 0), "there are no people")
+        XCTAssertEqual("people".pluralize(value: 1), "only one person")
+        XCTAssertEqual("people".pluralize(value: 2), "two people")
+        XCTAssertEqual("people".pluralize(value: 27), "many people")
+        XCTAssertEqual("people".pluralize(value: 103), "hundreds of people")
+        XCTAssertEqual("people".pluralize(value: 1010), "thousand of people")
+        XCTAssertEqual("people".pluralize(value: 1000000), "millions of people")
+        XCTAssertEqual("people".pluralize(value: -1), "not defined people")
+    }
+
+    func testPluralizeTable() {
+        XCTAssertEqual("other.people".pluralize(value: 0, tableName: "other"), "there are no people")
+        XCTAssertEqual("other.people".pluralize(value: 1, tableName: "other"), "only one person")
+        XCTAssertEqual("other.people".pluralize(value: 2, tableName: "other"), "two people")
+        XCTAssertEqual("other.people".pluralize(value: 27, tableName: "other"), "many people")
+        XCTAssertEqual("other.people".pluralize(value: 103, tableName: "other"), "hundreds of people")
+        XCTAssertEqual("other.people".pluralize(value: 1010, tableName: "other"), "thousand of people")
+        XCTAssertEqual("other.people".pluralize(value: 1000000, tableName: "other"), "millions of people")
+        XCTAssertEqual("other.people".pluralize(value: -1, tableName: "other"), "not defined people")
+    }
+}
diff --git a/Tests/PluralizeStringsTest.swift b/Tests/PluralizeStringsTest.swift
new file mode 100644
index 0000000..5ae273e
--- /dev/null
+++ b/Tests/PluralizeStringsTest.swift
@@ -0,0 +1,42 @@
+//
+//  PluralizeStringsTest.swift
+//  LocalizeTests
+//
+//  Created by Andres Silva Gomez on 4/30/19.
+//  Copyright © 2019 Kekiiwaa. All rights reserved.
+//
+
+import XCTest
+import Localize
+
+class PluralizeStringsTest: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .strings)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "en")
+        Localize.update(fileName: "Strings")
+    }
+
+    func testPluralize() {
+        XCTAssertEqual("people".pluralize(value: 0), "there are no people")
+        XCTAssertEqual("people".pluralize(value: 1), "only one person")
+        XCTAssertEqual("people".pluralize(value: 2), "two people")
+        XCTAssertEqual("people".pluralize(value: 27), "many people")
+        XCTAssertEqual("people".pluralize(value: 103), "hundreds of people")
+        XCTAssertEqual("people".pluralize(value: 1010), "thousand of people")
+        XCTAssertEqual("people".pluralize(value: 1000000), "millions of people")
+        XCTAssertEqual("people".pluralize(value: -1), "not defined people")
+    }
+
+    func testPluralizeTable() {
+        XCTAssertEqual("other.people".pluralize(value: 0, tableName: "Other"), "there are no people")
+        XCTAssertEqual("other.people".pluralize(value: 1, tableName: "Other"), "only one person")
+        XCTAssertEqual("other.people".pluralize(value: 2, tableName: "Other"), "two people")
+        XCTAssertEqual("other.people".pluralize(value: 27, tableName: "Other"), "many people")
+        XCTAssertEqual("other.people".pluralize(value: 103, tableName: "Other"), "hundreds of people")
+        XCTAssertEqual("other.people".pluralize(value: 1010, tableName: "Other"), "thousand of people")
+        XCTAssertEqual("other.people".pluralize(value: 1000000, tableName: "Other"), "millions of people")
+        XCTAssertEqual("other.people".pluralize(value: -1, tableName: "Other"), "not defined people")
+    }
+}
diff --git a/Tests/ReadingOtherFiles.swift b/Tests/ReadingOtherFiles.swift
index baa3ec1..9f2fae8 100644
--- a/Tests/ReadingOtherFiles.swift
+++ b/Tests/ReadingOtherFiles.swift
@@ -2,41 +2,41 @@
 //  ReadingOtherFiles.swift
 //  Localize
 //
-//  Copyright © 2017 Kekkiwaa Inc. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class ReadingOtherFiles: XCTestCase {
-    
+
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
     }
-    
+
     func testOtherEnglish() {
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "en")
         Localize.update(fileName: "other")
         let result = "hello".localize()
-        XCTAssert(result == "Hello world!")
+        XCTAssertEqual(result, "Hello world!")
     }
-    
+
     func testSomeItalian() {
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "it")
         Localize.update(fileName: "some")
         let result = "hello".localize()
-        XCTAssert(result == "Ciao mondo!")
+        XCTAssertEqual(result, "Ciao mondo!")
     }
-    
+
     func testFileGerman() {
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "de")
         Localize.update(fileName: "file")
         let result = "hello".localize()
-        XCTAssert(result == "Hallo Welt!")
+        XCTAssertEqual(result, "Hallo Welt!")
     }
-    
+
 }
diff --git a/Tests/StringBadSources.swift b/Tests/StringBadSources.swift
new file mode 100644
index 0000000..8484b72
--- /dev/null
+++ b/Tests/StringBadSources.swift
@@ -0,0 +1,34 @@
+//
+//  StringBadSources.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import Localize
+
+class StringBadSources: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .strings)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "en")
+        Localize.update(defaultLanguage: "rs")
+    }
+
+    func testLocalizeInAnyDictionary() {
+        let localized = "heymomhowareyoy".localized
+        XCTAssertEqual(localized, "heymomhowareyoy")
+    }
+
+    func testLocalizeProperty() {
+        let localized = "hello.world".localized
+        XCTAssertEqual(localized, "Hello world!")
+    }
+
+    func testLocalizeKey() {
+        let localized = "hello.world".localize()
+        XCTAssertEqual(localized, "Hello world!")
+    }
+}
diff --git a/Tests/StringBaseTest.swift b/Tests/StringBaseTest.swift
old mode 100644
new mode 100755
index eecd8c7..6346e38
--- a/Tests/StringBaseTest.swift
+++ b/Tests/StringBaseTest.swift
@@ -2,54 +2,75 @@
 //  StringBaseTest.swift
 //  Localize
 //
-//  Copyright © 2017 Kekiiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class StringBaseTest: XCTestCase {
-    
     override func setUp() {
         super.setUp()
         Localize.update(provider: .strings)
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "en")
     }
-    
+
+    func testLocalizeInAnyDictionary() {
+        let localized = "heymomhowareyoy".localized
+        XCTAssertEqual(localized, "heymomhowareyoy")
+    }
+
+    func testLocalizeProperty() {
+        let localized = "hello.world".localized
+        XCTAssertEqual(localized, "Hello world!")
+    }
+
     func testLocalizeKey() {
         let localized = "hello.world".localize()
-        XCTAssertTrue(localized == "Hello world!")
+        XCTAssertEqual(localized, "Hello world!")
     }
-    
+
     func testLocalizeKeyWithValue() {
         let localized = "name".localize(value: "Andres")
-        XCTAssertTrue(localized == "Hello Andres")
+        XCTAssertEqual(localized, "Hello Andres")
     }
-    
+
     func testLocalizeKeyWithValues() {
         let localized = "values".localize(values: "Andres", "Software Developer")
-        XCTAssertTrue(localized == "Hello everyone my name is Andres and I'm Software Developer , see you soon")
+        XCTAssertEqual(localized, "Hello everyone my name is Andres and I'm Software Developer, see you soon")
     }
-    
+  
+    func testLocalizeKeyWithThreeValues() {
+      let localized = "three_values".localize(values: "Hello" ,"Andres", "Software Developer")
+      XCTAssertEqual(localized, "Hello everyone my name is Andres and I'm Software Developer, see you soon")
+    }
+  
+    func testLocalizeKeyWithFourValues() {
+      let localized = "four_values".localize(values: "Hello" ,"Andres", "Software Developer", "soon")
+      XCTAssertEqual(localized, "Hello everyone my name is Andres and I'm Software Developer, see you soon")
+    }
+
     func testLocalizeKeyWithDictionary() {
         let localized = "username".localize(dictionary: ["username": "andresilvagomez"])
-        XCTAssertTrue(localized == "My username is andresilvagomez")
+        XCTAssertEqual(localized, "My username is andresilvagomez")
     }
-    
+
     func testLocalizeWithTableName() {
         let localized = "other.key".localize(tableName: "Other")
-        XCTAssertTrue(localized == "This key exist in other file")
+        XCTAssertEqual(localized, "This key exist in other file")
     }
-    
+
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
-        XCTAssertTrue(languages == ["en", "es"])
+        let languages = Localize.availableLanguages
+        let array = ["en", "es", "es-CO", "fr"]
+        for item in array {
+            XCTAssertTrue(languages.contains(item))
+        }
     }
-    
+
     func testCurrentLanguage() {
-        let language = Localize.language()
-        XCTAssertTrue(language == "en")
+        let language = Localize.currentLanguage
+        XCTAssertEqual(language, "en")
     }
-    
 }
diff --git a/Tests/StringBaseTestInSpanish.swift b/Tests/StringBaseTestInSpanish.swift
old mode 100644
new mode 100755
index 4cd6afc..3a234f6
--- a/Tests/StringBaseTestInSpanish.swift
+++ b/Tests/StringBaseTestInSpanish.swift
@@ -2,64 +2,67 @@
 //  StringBaseTestInSpanish.swift
 //  Localize
 //
-//  Copyright © 2017 Kekiiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class StringBaseTestInSpanish: XCTestCase {
-    
+
     override func setUp() {
         super.setUp()
         Localize.update(provider: .strings)
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
         Localize.update(language: "es")
     }
-    
+
     func testLocalizeKey() {
         let localized = "hello.world".localize()
-        XCTAssertTrue(localized == "Hola mundo!")
+        XCTAssertEqual(localized, "Hola mundo!")
     }
-    
+
     func testLocalizeKeyWithValue() {
         let localized = "name".localize(value: "Andres")
-        XCTAssertTrue(localized == "Hola Andres")
+        XCTAssertEqual(localized, "Hola Andres")
     }
-    
+
     func testLocalizeKeyWithValues() {
         let localized = "values".localize(values: "Andres", "Software Developer")
-        XCTAssertTrue(localized == "Hola a todos mi nombre es Andres y soy Software Developer , nos vemos pronto")
+        XCTAssertEqual(localized, "Hola a todos mi nombre es Andres y soy Software Developer, nos vemos pronto")
     }
-    
+
     func testLocalizeKeyWithDictionary() {
         let localized = "username".localize(dictionary: ["username": "andresilvagomez"])
-        XCTAssertTrue(localized == "Mi nombre de usuario es andresilvagomez")
+        XCTAssertEqual(localized, "Mi nombre de usuario es andresilvagomez")
     }
-    
+
     func testLocalizeKeyWithManyLevels() {
         let localized = "level.one.two.three".localize()
-        XCTAssertTrue(localized == "Esta es una llave multinivel")
+        XCTAssertEqual(localized, "Esta es una llave multinivel")
     }
-    
+
     func testLocalizeKeyAviableInDefaultLanguage() {
         let localized = "enlish".localize()
-        XCTAssertTrue(localized == "This key only exist in english file.")
+        XCTAssertEqual(localized, "This key only exist in english file.")
     }
-    
+
     func testLocalizeWithTableName() {
         let localized = "other.key".localize(tableName: "Other")
-        XCTAssertTrue(localized == "Esta llave existe en otro archivo")
+        XCTAssertEqual(localized, "Esta llave existe en otro archivo")
     }
-    
+
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
-        XCTAssertTrue(languages == ["en", "es"])
+        let languages = Localize.availableLanguages
+        let array = ["en", "es", "es-CO", "fr"]
+        for item in array {
+            XCTAssertTrue(languages.contains(item))
+        }
     }
-    
+
     func testCurrentLanguage() {
-        let language = Localize.language()
-        XCTAssertTrue(language == "es")
+        let language = Localize.currentLanguage
+        XCTAssertEqual(language, "es")
     }
-    
+
 }
diff --git a/Tests/StringFallbackTest.swift b/Tests/StringFallbackTest.swift
new file mode 100644
index 0000000..ef1e2cb
--- /dev/null
+++ b/Tests/StringFallbackTest.swift
@@ -0,0 +1,31 @@
+//
+//  StringFallbackTest.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import Localize
+
+class StringFallbackTest: XCTestCase {
+
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .strings)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "es-CO")
+    }
+
+    func testKeyMainLanguage() {
+        let localized = "only.spanish".localize()
+        XCTAssertEqual(localized, "Solo Español")
+    }
+
+    func testKeyOtherLanguage() {
+        Localize.update(language: "es")
+        let localized = "only.spanish".localize()
+        XCTAssertEqual(localized, "Solo Español")
+    }
+
+}
diff --git a/Tests/StringSingleTest.swift b/Tests/StringSingleTest.swift
new file mode 100644
index 0000000..d68c073
--- /dev/null
+++ b/Tests/StringSingleTest.swift
@@ -0,0 +1,28 @@
+//
+//  StringSingleTest.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import Localize
+
+class StringSingleTest: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .strings)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(fileName: "OnlyOneLang")
+    }
+
+    func testLocalizeInSingleStringFile() {
+        let localized = "hello.world.for.all".localized
+        XCTAssertEqual(localized, "Hello world for all")
+    }
+
+    func testLocalizeInSingleStringFileNil() {
+        let localized = "hello.world.for.allll".localized
+        XCTAssertEqual(localized, "hello.world.for.allll")
+    }
+}
diff --git a/Tests/StringsChanginDefaultFileName.swift b/Tests/StringsChanginDefaultFileName.swift
index 9508e9c..1ca61c7 100644
--- a/Tests/StringsChanginDefaultFileName.swift
+++ b/Tests/StringsChanginDefaultFileName.swift
@@ -2,30 +2,30 @@
 //  StringsChanginDefaultFileName.swift
 //  Localize
 //
-//  Copyright © 2017 Kekiiwaa. All rights reserved.
+//  Copyright © 2019 @andresilvagomez.
 //
 
 import XCTest
 import Localize
 
 class StringsChanginDefaultFileName: XCTestCase {
-    
+
     override func setUp() {
         super.setUp()
         Localize.update(provider: .strings)
         Localize.update(language: "en")
         Localize.update(fileName: "Other")
-        Localize.testingMode()
+        Localize.update(bundle: Bundle(for: type(of: self)))
     }
-    
+
     func testKeyInOtherLanguage() {
         let localized = "hello.baby".localize()
-        XCTAssertTrue(localized == "This is a welcome, new baby is here!")
+        XCTAssertEqual(localized, "This is a welcome, new baby is here!")
     }
-    
+
     func testSearchInOtherFile() {
         let localized = "hello.world".localize(tableName: "Strings")
-        XCTAssertTrue(localized == "Hello world!")
+        XCTAssertEqual(localized, "Hello world!")
     }
-    
+
 }
diff --git a/Tests/UIViewComponents.swift b/Tests/UIViewComponents.swift
new file mode 100644
index 0000000..14f0b0e
--- /dev/null
+++ b/Tests/UIViewComponents.swift
@@ -0,0 +1,267 @@
+//
+//  UITesting.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import UIKit
+import Localize
+
+class UIViewComponents: XCTestCase {
+
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .json)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "en")
+    }
+
+    // MARK: - UIBarButtonItem
+    func testButtonItemWithLocalizeKey() {
+        let button = UIBarButtonItem(title: "", style: .plain, target: self, action: nil)
+        button.localizeKey = "the.same.lavel"
+        button.awakeFromNib()
+
+        XCTAssertEqual(button.title, "This is a localized in the same level")
+    }
+
+    func testButtonItemWithTextKey() {
+        let button = UIBarButtonItem(title: "the.same.lavel", style: .plain, target: self, action: nil)
+        button.awakeFromNib()
+
+        XCTAssertEqual(button.title, "This is a localized in the same level")
+    }
+
+    func testButtonItemWithoutKeys() {
+        let button = UIBarButtonItem(barButtonSystemItem: .add, target: nil, action: nil)
+        button.awakeFromNib()
+
+        XCTAssertEqual(button.title, nil)
+    }
+
+    // MARK: - UIButton
+    func testButtonWithLocalizeKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localizeKey = "the.same.lavel"
+        button.awakeFromNib()
+
+        XCTAssertEqual(button.titleLabel?.text, "This is a localized in the same level")
+    }
+
+    func testButtonWithTextKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.titleLabel?.text = "the.same.lavel"
+        button.awakeFromNib()
+
+        XCTAssertEqual(button.titleLabel?.text, "This is a localized in the same level")
+    }
+
+    func testButtonWithoutKeys() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.awakeFromNib()
+
+        XCTAssertEqual(button.titleLabel?.text, "")
+    }
+
+    // MARK: - UILabel
+    func testLabelWithLocalizeKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localizeKey = "the.same.lavel"
+        label.awakeFromNib()
+
+        XCTAssertEqual(label.text, "This is a localized in the same level")
+    }
+
+    func testLabelWithTextKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.text = "the.same.lavel"
+        label.awakeFromNib()
+
+        XCTAssertEqual(label.text, "This is a localized in the same level")
+    }
+
+    func testLabelWithoutKeys() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.awakeFromNib()
+
+        XCTAssertEqual(label.text, nil)
+    }
+
+    // MARK: - UINavigationItem
+    func testNavigationItemWithLocalizeKey() {
+        let item = UINavigationItem(title: "")
+        item.localizeTitle = "the.same.lavel"
+        item.localizePrompt = "the.same.lavel"
+        item.awakeFromNib()
+
+        XCTAssertEqual(item.title, "This is a localized in the same level")
+        XCTAssertEqual(item.prompt, "This is a localized in the same level")
+    }
+
+    func testNavigationItemWithTextKey() {
+        let item = UINavigationItem(title: "the.same.lavel")
+        item.prompt = "the.same.lavel"
+        item.awakeFromNib()
+
+        XCTAssertEqual(item.title, "This is a localized in the same level")
+        XCTAssertEqual(item.prompt, "This is a localized in the same level")
+    }
+
+    func testNavigationItemWithoutKeys() {
+        let item = UINavigationItem(title: "")
+        item.awakeFromNib()
+
+        XCTAssertEqual(item.title, "")
+        XCTAssertEqual(item.prompt, nil)
+    }
+
+    // MARK: - UISearchBar
+    func testSearchBarWithLocalizeKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localizePlaceholder = "the.same.lavel"
+        bar.localizePrompt = "the.same.lavel"
+        bar.awakeFromNib()
+
+        XCTAssertEqual(bar.placeholder, "This is a localized in the same level")
+        XCTAssertEqual(bar.prompt, "This is a localized in the same level")
+    }
+
+    func testSearchBarWithTextKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.placeholder = "the.same.lavel"
+        bar.prompt = "the.same.lavel"
+        bar.awakeFromNib()
+
+        XCTAssertEqual(bar.placeholder, "This is a localized in the same level")
+        XCTAssertEqual(bar.prompt, "This is a localized in the same level")
+    }
+
+    func testSearchBarWithoutKeys() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.awakeFromNib()
+
+        XCTAssertEqual(bar.placeholder, nil)
+        XCTAssertEqual(bar.prompt, nil)
+    }
+
+    // MARK: - UITabBarItem
+    func testTabBarItemWithLocalizeKey() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localizeKey = "the.same.lavel"
+        bar.awakeFromNib()
+
+        XCTAssertEqual(bar.title, "This is a localized in the same level")
+    }
+
+    func testTabBarItemWithTextKey() {
+        let bar = UITabBarItem(title: "the.same.lavel", image: nil, tag: 0)
+        bar.awakeFromNib()
+
+        XCTAssertEqual(bar.title, "This is a localized in the same level")
+    }
+
+    func testTabBarItemWithoutKeys() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.awakeFromNib()
+
+        XCTAssertEqual(bar.title, "")
+    }
+
+    // MARK: - UITextField
+    func testTextFieldWithLocalizeKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localizeText = "the.same.lavel"
+        textField.localizePlaceholder = "the.same.lavel"
+        textField.awakeFromNib()
+
+        XCTAssertEqual(textField.text, "This is a localized in the same level")
+        XCTAssertEqual(textField.placeholder, "This is a localized in the same level")
+    }
+
+    func testTextFieldWithTextKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.text = "the.same.lavel"
+        textField.placeholder = "the.same.lavel"
+        textField.awakeFromNib()
+
+        XCTAssertEqual(textField.text, "This is a localized in the same level")
+        XCTAssertEqual(textField.placeholder, "This is a localized in the same level")
+    }
+
+    func testTextFieldWithoutKeys() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.awakeFromNib()
+
+        XCTAssertEqual(textField.text, "")
+        XCTAssertEqual(textField.placeholder, nil)
+    }
+
+    // MARK: - UITextView
+    func testTextViewWithLocalizeKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localizeKey = "the.same.lavel"
+        textView.awakeFromNib()
+
+        XCTAssertEqual(textView.text, "This is a localized in the same level")
+    }
+
+    func testTextViewWithTextKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.text = "the.same.lavel"
+        textView.awakeFromNib()
+
+        XCTAssertEqual(textView.text, "This is a localized in the same level")
+    }
+
+    func testTextViewWithoutKeys() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.awakeFromNib()
+
+        XCTAssertEqual(textView.text, "")
+    }
+
+    // MARK: - UISegmentedControl
+    func testSegmentedControlWithLocalizeKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "one, two"
+        segment.awakeFromNib()
+
+        XCTAssertEqual(segment.titleForSegment(at: 0), "First")
+        XCTAssertEqual(segment.titleForSegment(at: 1), "Second")
+    }
+
+    func testSegmentedControlWithLocalizeKeyBased() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "segment.base: one, two"
+        segment.awakeFromNib()
+
+        XCTAssertEqual(segment.titleForSegment(at: 0), "First")
+        XCTAssertEqual(segment.titleForSegment(at: 1), "Second")
+    }
+
+    func testSegmentedControlWithTextKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "segment.base.one", at: 0, animated: false)
+        segment.insertSegment(withTitle: "segment.base.two", at: 1, animated: false)
+        segment.awakeFromNib()
+
+        XCTAssertEqual(segment.titleForSegment(at: 0), "First")
+        XCTAssertEqual(segment.titleForSegment(at: 1), "Second")
+    }
+
+    func testSegmentedControlWithoutKeys() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.awakeFromNib()
+
+        XCTAssertEqual(segment.titleForSegment(at: 0), "")
+        XCTAssertEqual(segment.titleForSegment(at: 1), "")
+    }
+}
diff --git a/Tests/UIViewComponentsES.swift b/Tests/UIViewComponentsES.swift
new file mode 100644
index 0000000..7ed1568
--- /dev/null
+++ b/Tests/UIViewComponentsES.swift
@@ -0,0 +1,267 @@
+//
+//  UIViewComponentsES.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import UIKit
+import Localize
+
+class UIViewComponentsES: XCTestCase {
+
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .json)
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "es")
+    }
+
+    // MARK: - UIBarButtonItem
+    func testButtonItemWithLocalizeKey() {
+        let button = UIBarButtonItem(title: "", style: .plain, target: self, action: nil)
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+
+        XCTAssertTrue(button.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testButtonItemWithTextKey() {
+        let button = UIBarButtonItem(title: "the.same.lavel", style: .plain, target: self, action: nil)
+        button.localize()
+
+        XCTAssertTrue(button.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testButtonItemWithoutKeys() {
+        let button = UIBarButtonItem(barButtonSystemItem: .add, target: nil, action: nil)
+        button.localize()
+
+        XCTAssertTrue(button.title == nil)
+    }
+
+    // MARK: - UIButton
+    func testButtonWithLocalizeKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+
+        XCTAssertTrue(button.titleLabel?.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testButtonWithTextKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.titleLabel?.text = "the.same.lavel"
+        button.localize()
+
+        XCTAssertTrue(button.titleLabel?.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testButtonWithoutKeys() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localize()
+
+        XCTAssertTrue(button.titleLabel?.text == "")
+    }
+
+    // MARK: - UILabel
+    func testLabelWithLocalizeKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localizeKey = "the.same.lavel"
+        label.localize()
+
+        XCTAssertTrue(label.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testLabelWithTextKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.text = "the.same.lavel"
+        label.localize()
+
+        XCTAssertTrue(label.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testLabelWithoutKeys() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localize()
+
+        XCTAssertTrue(label.text == nil)
+    }
+
+    // MARK: - UINavigationItem
+    func testNavigationItemWithLocalizeKey() {
+        let item = UINavigationItem(title: "")
+        item.localizeTitle = "the.same.lavel"
+        item.localizePrompt = "the.same.lavel"
+        item.localize()
+
+        XCTAssertTrue(item.title == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(item.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testNavigationItemWithTextKey() {
+        let item = UINavigationItem(title: "the.same.lavel")
+        item.prompt = "the.same.lavel"
+        item.localize()
+
+        XCTAssertTrue(item.title == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(item.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testNavigationItemWithoutKeys() {
+        let item = UINavigationItem(title: "")
+        item.localize()
+
+        XCTAssertTrue(item.title == "")
+        XCTAssertTrue(item.prompt == nil)
+    }
+
+    // MARK: - UISearchBar
+    func testSearchBarWithLocalizeKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localizePlaceholder = "the.same.lavel"
+        bar.localizePrompt = "the.same.lavel"
+        bar.localize()
+
+        XCTAssertTrue(bar.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(bar.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testSearchBarWithTextKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.placeholder = "the.same.lavel"
+        bar.prompt = "the.same.lavel"
+        bar.localize()
+
+        XCTAssertTrue(bar.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(bar.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testSearchBarWithoutKeys() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localize()
+
+        XCTAssertTrue(bar.placeholder == nil)
+        XCTAssertTrue(bar.prompt == nil)
+    }
+
+    // MARK: - UITabBarItem
+    func testTabBarItemWithLocalizeKey() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localizeKey = "the.same.lavel"
+        bar.localize()
+
+        XCTAssertTrue(bar.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testTabBarItemWithTextKey() {
+        let bar = UITabBarItem(title: "the.same.lavel", image: nil, tag: 0)
+        bar.localize()
+
+        XCTAssertTrue(bar.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testTabBarItemWithoutKeys() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localize()
+
+        XCTAssertTrue(bar.title == "")
+    }
+
+    // MARK: - UITextField
+    func testTextFieldWithLocalizeKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localizeText = "the.same.lavel"
+        textField.localizePlaceholder = "the.same.lavel"
+        textField.localize()
+
+        XCTAssertTrue(textField.text == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(textField.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testTextFieldWithTextKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.text = "the.same.lavel"
+        textField.placeholder = "the.same.lavel"
+        textField.localize()
+
+        XCTAssertTrue(textField.text == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(textField.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testTextFieldWithoutKeys() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localize()
+
+        XCTAssertTrue(textField.text == "")
+        XCTAssertTrue(textField.placeholder == nil)
+    }
+
+    // MARK: - UITextView
+    func testTextViewWithLocalizeKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localizeKey = "the.same.lavel"
+        textView.localize()
+
+        XCTAssertTrue(textView.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testTextViewWithTextKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.text = "the.same.lavel"
+        textView.localize()
+
+        XCTAssertTrue(textView.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+
+    func testTextViewWithoutKeys() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localize()
+
+        XCTAssertTrue(textView.text == "")
+    }
+
+    // MARK: - UISegmentedControl
+    func testSegmentedControlWithLocalizeKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "one, two"
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "Primero")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Segundo")
+    }
+
+    func testSegmentedControlWithLocalizeKeyBased() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "segment.base: one, two"
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "Primero")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Segundo")
+    }
+
+    func testSegmentedControlWithTextKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "segment.base.one", at: 0, animated: false)
+        segment.insertSegment(withTitle: "segment.base.two", at: 1, animated: false)
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "Primero")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Segundo")
+    }
+
+    func testSegmentedControlWithoutKeys() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+}
diff --git a/Tests/UIViewComponentsWithDisabledAutoLocalize.swift b/Tests/UIViewComponentsWithDisabledAutoLocalize.swift
new file mode 100644
index 0000000..76ac3d7
--- /dev/null
+++ b/Tests/UIViewComponentsWithDisabledAutoLocalize.swift
@@ -0,0 +1,299 @@
+//
+//  UIViewComponentsWithDisabledAutoLocalize.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import UIKit
+import Localize
+
+class UIViewComponentsWithDisabledAutoLocalize: XCTestCase {
+
+    override func setUp() {
+        super.setUp()
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "en")
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    // MARK: - UIBarButtonItem
+    func testButtonItemWithLocalizeKey() {
+        let button = UIBarButtonItem(title: "", style: .plain, target: self, action: nil)
+        button.localizeKey = "the.same.lavel"
+        button.autoLocalize = false
+        button.awakeFromNib()
+
+        XCTAssertTrue(button.title == "")
+    }
+
+    func testButtonItemWithTextKey() {
+        let button = UIBarButtonItem(title: "the.same.lavel", style: .plain, target: self, action: nil)
+        button.autoLocalize = false
+        button.awakeFromNib()
+
+        XCTAssertTrue(button.title == "the.same.lavel")
+    }
+
+    func testButtonItemWithoutKeys() {
+        let button = UIBarButtonItem(barButtonSystemItem: .add, target: nil, action: nil)
+        button.autoLocalize = false
+        button.awakeFromNib()
+
+        XCTAssertTrue(button.title == nil)
+    }
+
+    // MARK: - UIButton
+    func testButtonWithLocalizeKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localizeKey = "the.same.lavel"
+        button.autoLocalize = false
+        button.awakeFromNib()
+
+        XCTAssertTrue(button.titleLabel?.text == nil)
+    }
+
+    func testButtonWithTextKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.titleLabel?.text = "the.same.lavel"
+        button.autoLocalize = false
+        button.awakeFromNib()
+
+        XCTAssertTrue(button.titleLabel?.text == "the.same.lavel")
+    }
+
+    func testButtonWithoutKeys() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.autoLocalize = false
+        button.awakeFromNib()
+
+        XCTAssertTrue(button.titleLabel?.text == nil)
+    }
+
+    // MARK: - UILabel
+    func testLabelWithLocalizeKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localizeKey = "the.same.lavel"
+        label.autoLocalize = false
+        label.awakeFromNib()
+
+        XCTAssertTrue(label.text == nil)
+    }
+
+    func testLabelWithTextKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.text = "the.same.lavel"
+        label.autoLocalize = false
+        label.awakeFromNib()
+
+        XCTAssertTrue(label.text == "the.same.lavel")
+    }
+
+    func testLabelWithoutKeys() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.autoLocalize = false
+        label.awakeFromNib()
+
+        XCTAssertTrue(label.text == nil)
+    }
+
+    // MARK: - UINavigationItem
+    func testNavigationItemWithLocalizeKey() {
+        let item = UINavigationItem(title: "")
+        item.localizeTitle = "the.same.lavel"
+        item.localizePrompt = "the.same.lavel"
+        item.autoLocalize = false
+        item.awakeFromNib()
+
+        XCTAssertTrue(item.title == "")
+        XCTAssertTrue(item.prompt == nil)
+    }
+
+    func testNavigationItemWithTextKey() {
+        let item = UINavigationItem(title: "the.same.lavel")
+        item.prompt = "the.same.lavel"
+        item.autoLocalize = false
+        item.awakeFromNib()
+
+        XCTAssertTrue(item.title == "the.same.lavel")
+        XCTAssertTrue(item.prompt == "the.same.lavel")
+    }
+
+    func testNavigationItemWithoutKeys() {
+        let item = UINavigationItem(title: "")
+        item.autoLocalize = false
+        item.awakeFromNib()
+
+        XCTAssertTrue(item.title == "")
+        XCTAssertTrue(item.prompt == nil)
+    }
+
+    // MARK: - UISearchBar
+    func testSearchBarWithLocalizeKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localizePlaceholder = "the.same.lavel"
+        bar.localizePrompt = "the.same.lavel"
+        bar.autoLocalize = false
+        bar.awakeFromNib()
+
+        XCTAssertTrue(bar.placeholder == nil)
+        XCTAssertTrue(bar.prompt == nil)
+    }
+
+    func testSearchBarWithTextKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.placeholder = "the.same.lavel"
+        bar.prompt = "the.same.lavel"
+        bar.autoLocalize = false
+        bar.awakeFromNib()
+
+        XCTAssertTrue(bar.placeholder == "the.same.lavel")
+        XCTAssertTrue(bar.prompt == "the.same.lavel")
+    }
+
+    func testSearchBarWithoutKeys() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.autoLocalize = false
+        bar.awakeFromNib()
+
+        XCTAssertTrue(bar.placeholder == nil)
+        XCTAssertTrue(bar.prompt == nil)
+    }
+
+    // MARK: - UITabBarItem
+    func testTabBarItemWithLocalizeKey() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localizeKey = "the.same.lavel"
+        bar.autoLocalize = false
+        bar.awakeFromNib()
+
+        XCTAssertTrue(bar.title == "")
+    }
+
+    func testTabBarItemWithTextKey() {
+        let bar = UITabBarItem(title: "the.same.lavel", image: nil, tag: 0)
+        bar.autoLocalize = false
+        bar.awakeFromNib()
+
+        XCTAssertTrue(bar.title == "the.same.lavel")
+    }
+
+    func testTabBarItemWithoutKeys() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.autoLocalize = false
+        bar.awakeFromNib()
+
+        XCTAssertTrue(bar.title == "")
+    }
+
+    // MARK: - UITextField
+    func testTextFieldWithLocalizeKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localizeText = "the.same.lavel"
+        textField.localizePlaceholder = "the.same.lavel"
+        textField.autoLocalize = false
+        textField.awakeFromNib()
+
+        XCTAssertTrue(textField.text == "")
+        XCTAssertTrue(textField.placeholder == nil)
+    }
+
+    func testTextFieldWithTextKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.text = "the.same.lavel"
+        textField.placeholder = "the.same.lavel"
+        textField.autoLocalize = false
+        textField.awakeFromNib()
+
+        XCTAssertTrue(textField.text == "the.same.lavel")
+        XCTAssertTrue(textField.placeholder == "the.same.lavel")
+    }
+
+    func testTextFieldWithoutKeys() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.autoLocalize = false
+        textField.awakeFromNib()
+
+        XCTAssertTrue(textField.text == "")
+        XCTAssertTrue(textField.placeholder == nil)
+    }
+
+    // MARK: - UITextView
+    func testTextViewWithLocalizeKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localizeKey = "the.same.lavel"
+        textView.autoLocalize = false
+        textView.awakeFromNib()
+
+        XCTAssertTrue(textView.text == "")
+    }
+
+    func testTextViewWithTextKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.text = "the.same.lavel"
+        textView.autoLocalize = false
+        textView.awakeFromNib()
+
+        XCTAssertTrue(textView.text == "the.same.lavel")
+    }
+
+    func testTextViewWithoutKeys() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.autoLocalize = false
+        textView.awakeFromNib()
+
+        XCTAssertTrue(textView.text == "")
+    }
+
+    // MARK: - UISegmentedControl
+    func testSegmentedControlWithLocalizeKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "one, two"
+        segment.autoLocalize = false
+        segment.awakeFromNib()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+
+    func testSegmentedControlWithLocalizeKeyBased() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "segment.base: one, two"
+        segment.autoLocalize = false
+        segment.awakeFromNib()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+
+    func testSegmentedControlWithTextKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "segment.base.one", at: 0, animated: false)
+        segment.insertSegment(withTitle: "segment.base.two", at: 1, animated: false)
+        segment.autoLocalize = false
+        segment.awakeFromNib()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "segment.base.one")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "segment.base.two")
+    }
+
+    func testSegmentedControlWithoutKeys() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.autoLocalize = false
+        segment.awakeFromNib()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+}
diff --git a/Tests/UIViewComponentsWithString.swift b/Tests/UIViewComponentsWithString.swift
new file mode 100644
index 0000000..9e3cf54
--- /dev/null
+++ b/Tests/UIViewComponentsWithString.swift
@@ -0,0 +1,270 @@
+//
+//  UIViewComponentsWithString.swift
+//  LocalizeTests
+//
+//  Copyright © 2019 @andresilvagomez.
+//
+
+import XCTest
+import UIKit
+import Localize
+
+class UIViewComponentsWithString: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        Localize.update(bundle: Bundle(for: type(of: self)))
+        Localize.update(language: "en")
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    // MARK: - UIBarButtonItem
+    func testButtonItemWithLocalizeKey() {
+        let button = UIBarButtonItem(title: "", style: .plain, target: self, action: nil)
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+
+        XCTAssertTrue(button.title == "This is a localized in the same level")
+    }
+
+    func testButtonItemWithTextKey() {
+        let button = UIBarButtonItem(title: "the.same.lavel", style: .plain, target: self, action: nil)
+        button.localize()
+
+        XCTAssertTrue(button.title == "This is a localized in the same level")
+    }
+
+    func testButtonItemWithoutKeys() {
+        let button = UIBarButtonItem(barButtonSystemItem: .add, target: nil, action: nil)
+        button.localize()
+
+        XCTAssertTrue(button.title == nil)
+    }
+
+    // MARK: - UIButton
+    func testButtonWithLocalizeKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+
+        XCTAssertTrue(button.titleLabel?.text == "This is a localized in the same level")
+    }
+
+    func testButtonWithTextKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.titleLabel?.text = "the.same.lavel"
+        button.localize()
+
+        XCTAssertTrue(button.titleLabel?.text == "This is a localized in the same level")
+    }
+
+    func testButtonWithoutKeys() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localize()
+
+        XCTAssertTrue(button.titleLabel?.text == "")
+    }
+
+    // MARK: - UILabel
+    func testLabelWithLocalizeKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localizeKey = "the.same.lavel"
+        label.localize()
+
+        XCTAssertTrue(label.text == "This is a localized in the same level")
+    }
+
+    func testLabelWithTextKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.text = "the.same.lavel"
+        label.localize()
+
+        XCTAssertTrue(label.text == "This is a localized in the same level")
+    }
+
+    func testLabelWithoutKeys() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localize()
+
+        XCTAssertTrue(label.text == nil)
+    }
+
+    // MARK: - UINavigationItem
+    func testNavigationItemWithLocalizeKey() {
+        let item = UINavigationItem(title: "")
+        item.localizeTitle = "the.same.lavel"
+        item.localizePrompt = "the.same.lavel"
+        item.localize()
+
+        XCTAssertTrue(item.title == "This is a localized in the same level")
+        XCTAssertTrue(item.prompt == "This is a localized in the same level")
+    }
+
+    func testNavigationItemWithTextKey() {
+        let item = UINavigationItem(title: "the.same.lavel")
+        item.prompt = "the.same.lavel"
+        item.localize()
+
+        XCTAssertTrue(item.title == "This is a localized in the same level")
+        XCTAssertTrue(item.prompt == "This is a localized in the same level")
+    }
+
+    func testNavigationItemWithoutKeys() {
+        let item = UINavigationItem(title: "")
+        item.localize()
+
+        XCTAssertTrue(item.title == "")
+        XCTAssertTrue(item.prompt == nil)
+    }
+
+    // MARK: - UISearchBar
+    func testSearchBarWithLocalizeKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localizePlaceholder = "the.same.lavel"
+        bar.localizePrompt = "the.same.lavel"
+        bar.localize()
+
+        XCTAssertTrue(bar.placeholder == "This is a localized in the same level")
+        XCTAssertTrue(bar.prompt == "This is a localized in the same level")
+    }
+
+    func testSearchBarWithTextKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.placeholder = "the.same.lavel"
+        bar.prompt = "the.same.lavel"
+        bar.localize()
+
+        XCTAssertTrue(bar.placeholder == "This is a localized in the same level")
+        XCTAssertTrue(bar.prompt == "This is a localized in the same level")
+    }
+
+    func testSearchBarWithoutKeys() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localize()
+
+        XCTAssertTrue(bar.placeholder == nil)
+        XCTAssertTrue(bar.prompt == nil)
+    }
+
+    // MARK: - UITabBarItem
+    func testTabBarItemWithLocalizeKey() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localizeKey = "the.same.lavel"
+        bar.localize()
+
+        XCTAssertTrue(bar.title == "This is a localized in the same level")
+    }
+
+    func testTabBarItemWithTextKey() {
+        let bar = UITabBarItem(title: "the.same.lavel", image: nil, tag: 0)
+        bar.localize()
+
+        XCTAssertTrue(bar.title == "This is a localized in the same level")
+    }
+
+    func testTabBarItemWithoutKeys() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localize()
+
+        XCTAssertTrue(bar.title == "")
+    }
+
+    // MARK: - UITextField
+    func testTextFieldWithLocalizeKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localizeText = "the.same.lavel"
+        textField.localizePlaceholder = "the.same.lavel"
+        textField.localize()
+
+        XCTAssertTrue(textField.text == "This is a localized in the same level")
+        XCTAssertTrue(textField.placeholder == "This is a localized in the same level")
+    }
+
+    func testTextFieldWithTextKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.text = "the.same.lavel"
+        textField.placeholder = "the.same.lavel"
+        textField.localize()
+
+        XCTAssertTrue(textField.text == "This is a localized in the same level")
+        XCTAssertTrue(textField.placeholder == "This is a localized in the same level")
+    }
+
+    func testTextFieldWithoutKeys() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localize()
+
+        XCTAssertTrue(textField.text == "")
+        XCTAssertTrue(textField.placeholder == nil)
+    }
+
+    // MARK: - UITextView
+    func testTextViewWithLocalizeKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localizeKey = "the.same.lavel"
+        textView.localize()
+
+        XCTAssertTrue(textView.text == "This is a localized in the same level")
+    }
+
+    func testTextViewWithTextKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.text = "the.same.lavel"
+        textView.localize()
+
+        XCTAssertTrue(textView.text == "This is a localized in the same level")
+    }
+
+    func testTextViewWithoutKeys() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localize()
+
+        XCTAssertTrue(textView.text == "")
+    }
+
+    // MARK: - UISegmentedControl
+    func testSegmentedControlWithLocalizeKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "one, two"
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+
+    func testSegmentedControlWithLocalizeKeyBased() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "segment.base: one, two"
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+
+    func testSegmentedControlWithTextKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "segment.base.one", at: 0, animated: false)
+        segment.insertSegment(withTitle: "segment.base.two", at: 1, animated: false)
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+
+    func testSegmentedControlWithoutKeys() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localize()
+
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+}
diff --git a/Tests/badJSON-en.json b/Tests/badJSON-en.json
new file mode 100644
index 0000000..327d637
--- /dev/null
+++ b/Tests/badJSON-en.json
@@ -0,0 +1,3 @@
+{
+    "heyi'makey" = "I'm the value."
+}
diff --git a/Tests/en.lproj/Other.strings b/Tests/en.lproj/Other.strings
index 2823ac6..32c4cb4 100644
--- a/Tests/en.lproj/Other.strings
+++ b/Tests/en.lproj/Other.strings
@@ -2,9 +2,25 @@
   Other.strings
   Localize
 
-  Copyright © 2017 Kekiiwaa. All rights reserved.
+  Copyright © 2019 @andresilvagomez.
 */
 
 "other.key" = "This key exist in other file";
 
 "hello.baby" = "This is a welcome, new baby is here!";
+
+"other.people.zero" = "there are no people";
+
+"other.people.one" = "only one person";
+
+"other.people.two" = "two people";
+
+"other.people.many" = "many people";
+
+"other.people.hundreds" = "hundreds of people";
+
+"other.people.thousand" = "thousand of people";
+
+"other.people.millions" = "millions of people";
+
+"other.people.other" = "not defined people";
diff --git a/Tests/en.lproj/Strings.strings b/Tests/en.lproj/Strings.strings
old mode 100644
new mode 100755
index 1c8855f..039ac97
--- a/Tests/en.lproj/Strings.strings
+++ b/Tests/en.lproj/Strings.strings
@@ -2,7 +2,7 @@
   Strings.strings
   Localize
 
-  Copyright © 2017 Kekiiwaa. All rights reserved.
+  Copyright © 2019 @andresilvagomez.
 */
 
 "hello.world" = "Hello world!";
@@ -11,6 +11,10 @@
 
 "values" = "Hello everyone my name is % and I'm %, see you soon";
 
+"three_values" = "% everyone my name is % and I'm %, see you soon";
+
+"four_values" = "% everyone my name is % and I'm %, see you %";
+
 "username" = "My username is :username";
 
 "level.one.two.three" = "This is a multilevel key";
@@ -18,3 +22,30 @@
 "the.same.lavel" = "This is a localized in the same level";
 
 "enlish" = "This key only exist in english file.";
+
+"segment.base.one" = "First";
+
+"segment.base.two" = "Second";
+
+"one" = "First";
+
+"two" = "Second";
+
+"only.spanish" = "Only Spanish";
+
+"people.zero" = "there are no people";
+
+"people.one" = "only one person";
+
+"people.two" = "two people";
+
+"people.many" = "many people";
+
+"people.hundreds" = "hundreds of people";
+
+"people.thousand" = "thousand of people";
+
+"people.millions" = "millions of people";
+
+"people.other" = "not defined people";
+
diff --git a/Tests/es-CO.lproj/Other.strings b/Tests/es-CO.lproj/Other.strings
new file mode 100644
index 0000000..d8c54fd
--- /dev/null
+++ b/Tests/es-CO.lproj/Other.strings
@@ -0,0 +1,10 @@
+/* 
+  Other.strings
+  Localize
+
+  Copyright © 2019 @andresilvagomez.
+*/
+
+"other.key" = "This key exist in other file";
+
+"hello.baby" = "This is a welcome, new baby is here!";
diff --git a/Tests/es-CO.lproj/Strings.strings b/Tests/es-CO.lproj/Strings.strings
new file mode 100755
index 0000000..41bd81b
--- /dev/null
+++ b/Tests/es-CO.lproj/Strings.strings
@@ -0,0 +1,20 @@
+/* 
+  Strings.strings
+  Localize
+
+  Copyright © 2019 @andresilvagomez.
+*/
+
+"hello.world" = "Hola mundo!";
+
+"name" = "Hola %";
+
+"values" = "Hola a todos mi nombre es % y soy %, nos vemos pronto";
+
+"username" = "Mi nombre de usuario es :username";
+
+"level.one.two.three" = "Esta es una llave multinivel";
+
+"the.same.lavel" = "Esto es una internazionalizacion en el mismo nivel";
+
+"only.colombia" = "Solo Colombia";
diff --git a/Tests/es.lproj/Other.strings b/Tests/es.lproj/Other.strings
index c00e909..115c7ed 100644
--- a/Tests/es.lproj/Other.strings
+++ b/Tests/es.lproj/Other.strings
@@ -2,7 +2,7 @@
   Other.strings
   Localize
 
-  Copyright © 2017 Kekiiwaa. All rights reserved.
+  Copyright © 2019 @andresilvagomez.
 */
 
 "other.key" = "Esta llave existe en otro archivo";
diff --git a/Tests/es.lproj/Storyboard.storyboard b/Tests/es.lproj/Storyboard.storyboard
new file mode 100644
index 0000000..f9a048e
--- /dev/null
+++ b/Tests/es.lproj/Storyboard.storyboard
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+    </dependencies>
+    <scenes/>
+</document>
diff --git a/Tests/es.lproj/Strings.strings b/Tests/es.lproj/Strings.strings
old mode 100644
new mode 100755
index 8b10a03..b026197
--- a/Tests/es.lproj/Strings.strings
+++ b/Tests/es.lproj/Strings.strings
@@ -2,7 +2,7 @@
   Strings.strings
   Localize
 
-  Copyright © 2017 Kekiiwaa. All rights reserved.
+  Copyright © 2019 @andresilvagomez.
 */
 
 "hello.world" = "Hola mundo!";
@@ -16,3 +16,5 @@
 "level.one.two.three" = "Esta es una llave multinivel";
 
 "the.same.lavel" = "Esto es una internazionalizacion en el mismo nivel";
+
+"only.spanish" = "Solo Español";
diff --git a/Tests/fr.lproj/Other.strings b/Tests/fr.lproj/Other.strings
new file mode 100644
index 0000000..d8c54fd
--- /dev/null
+++ b/Tests/fr.lproj/Other.strings
@@ -0,0 +1,10 @@
+/* 
+  Other.strings
+  Localize
+
+  Copyright © 2019 @andresilvagomez.
+*/
+
+"other.key" = "This key exist in other file";
+
+"hello.baby" = "This is a welcome, new baby is here!";
diff --git a/Tests/fr.lproj/Storyboard.strings b/Tests/fr.lproj/Storyboard.strings
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/Tests/fr.lproj/Storyboard.strings
@@ -0,0 +1 @@
+
diff --git a/Tests/fr.lproj/Strings.strings b/Tests/fr.lproj/Strings.strings
new file mode 100644
index 0000000..7b44f78
--- /dev/null
+++ b/Tests/fr.lproj/Strings.strings
@@ -0,0 +1,28 @@
+/* 
+  Strings.strings
+  Localize
+
+  Copyright © 2019 @andresilvagomez.
+*/
+
+"hello.world" = "Hello world!";
+
+"name" = "Hello %";
+
+"values" = "Hello everyone my name is % and I'm %, see you soon";
+
+"username" = "My username is :username";
+
+"level.one.two.three" = "This is a multilevel key";
+
+"the.same.lavel" = "This is a localized in the same level";
+
+"enlish" = "This key only exist in english file.";
+
+"segment.base.one" = "First";
+
+"segment.base.two" = "Second";
+
+"one" = "First";
+
+"two" = "Second";
diff --git a/Tests/lang-en.json b/Tests/lang-en.json
index 7b4653c..85086e6 100644
--- a/Tests/lang-en.json
+++ b/Tests/lang-en.json
@@ -13,5 +13,23 @@
         }
     },
     "the.same.lavel" : "This is a localized in the same level",
-    "enlish" : "This key only exist in english file."
+    "enlish" : "This key only exist in english file.",
+    "segment": {
+        "base": {
+            "one": "First",
+            "two": "Second"
+        }
+    },
+    "one": "First",
+    "two": "Second",
+    "people": {
+        "zero": "there are no people",
+        "one": "only one person",
+        "two": "two people",
+        "many": "many people",
+        "hundreds": "hundreds of people",
+        "thousand": "thousand of people",
+        "millions": "millions of people",
+        "other": "not defined people"
+    }
 }
diff --git a/Tests/lang-es.json b/Tests/lang-es.json
index bd2c99f..f1e9921 100644
--- a/Tests/lang-es.json
+++ b/Tests/lang-es.json
@@ -12,5 +12,13 @@
             }
         }
     },
-    "the.same.lavel" : "Esto es una internazionalizacion en el mismo nivel"
+    "the.same.lavel" : "Esto es una internazionalizacion en el mismo nivel",
+    "segment": {
+        "base": {
+            "one": "Primero",
+            "two": "Segundo"
+        }
+    },
+    "one": "Primero",
+    "two": "Segundo"
 }
diff --git a/Tests/lang-fr.json b/Tests/lang-fr.json
new file mode 100644
index 0000000..f4d69c9
--- /dev/null
+++ b/Tests/lang-fr.json
@@ -0,0 +1,25 @@
+{
+    "name" : "Hello %",
+    "hello" : {
+        "world" : "Hello world!"
+    },
+    "values" : "Hello everyone my name is % and I'm %, see you soon",
+    "username" : "My username is :username",
+    "level" : {
+        "one" : {
+            "two" : {
+                "three" : "This is a multilevel key"
+            }
+        }
+    },
+    "the.same.lavel" : "This is a localized in the same level",
+    "enlish" : "This key only exist in english file.",
+    "segment": {
+        "base": {
+            "one": "First",
+            "two": "Second"
+        }
+    },
+    "one": "First",
+    "two": "Second"
+}
diff --git a/Tests/langTable-en.json b/Tests/langTable-en.json
new file mode 100644
index 0000000..f9c5349
--- /dev/null
+++ b/Tests/langTable-en.json
@@ -0,0 +1,3 @@
+{
+    "test.in.table": "Test in table name"
+}
diff --git a/Tests/other-en.json b/Tests/other-en.json
index e1a2505..daec9d2 100644
--- a/Tests/other-en.json
+++ b/Tests/other-en.json
@@ -1,4 +1,16 @@
 {
     "hello" : "Hello world!",
-    "hello.baby" : "This is a welcome, new baby is here!"
+    "hello.baby" : "This is a welcome, new baby is here!",
+    "other": {
+        "people": {
+            "zero": "there are no people",
+            "one": "only one person",
+            "two": "two people",
+            "many": "many people",
+            "hundreds": "hundreds of people",
+            "thousand": "thousand of people",
+            "millions": "millions of people",
+            "other": "not defined people"
+        }
+    }
 }
diff --git a/issue-template.md b/issue-template.md
new file mode 100644
index 0000000..a98efb8
--- /dev/null
+++ b/issue-template.md
@@ -0,0 +1,29 @@
+# Issue
+
+ℹ Please provide a quick description for this issue.
+
+## Localize Environment
+
+- **Localize version:**
+- **Xcode version:**
+- **Swift version:**
+- **Platform(s) running Localize:**
+- **macOS version running Xcode:**
+
+## Localize Config
+
+```swift
+/// Please put here your config
+```
+
+## What did you do?
+
+ℹ Please replace this with what you did.
+
+## What did you expect to happen?
+
+ℹ Please replace this with what you expected to happen.  
+
+## What happened instead?
+
+ℹ Please replace this with of what happened instead.
diff --git a/pull_request_template.md b/pull_request_template.md
new file mode 100644
index 0000000..97b9150
--- /dev/null
+++ b/pull_request_template.md
@@ -0,0 +1,22 @@
+# PR Description
+
+ℹ Please provide a quick description for this pull request.
+
+## Security Questions
+
+- [ ] You tested your code?
+- [ ] You keep the code coverage?
+- [ ] You tested your code?
+- [ ] You documented it change if is necessary?
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.