diff --git a/Example/Latch/Images.xcassets/Contents.json b/Example/Latch/Images.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/Example/Latch/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Example/Latch/Images.xcassets/Latch.imageset/Contents.json b/Example/Latch/Images.xcassets/Latch.imageset/Contents.json
index f92c2a8..b89d9e0 100644
--- a/Example/Latch/Images.xcassets/Latch.imageset/Contents.json
+++ b/Example/Latch/Images.xcassets/Latch.imageset/Contents.json
@@ -2,8 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "Latch.png"
+      "filename" : "Latch.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Latch@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Latch@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Example/Latch/Images.xcassets/Latch.imageset/Latch.png b/Example/Latch/Images.xcassets/Latch.imageset/Latch.png
index 2e300ed..ef0d445 100644
Binary files a/Example/Latch/Images.xcassets/Latch.imageset/Latch.png and b/Example/Latch/Images.xcassets/Latch.imageset/Latch.png differ
diff --git a/Example/Latch/Images.xcassets/Latch.imageset/Latch@2x.png b/Example/Latch/Images.xcassets/Latch.imageset/Latch@2x.png
new file mode 100644
index 0000000..822a3f1
Binary files /dev/null and b/Example/Latch/Images.xcassets/Latch.imageset/Latch@2x.png differ
diff --git a/Example/Latch/Images.xcassets/Latch.imageset/Latch@3x.png b/Example/Latch/Images.xcassets/Latch.imageset/Latch@3x.png
new file mode 100644
index 0000000..89399a9
Binary files /dev/null and b/Example/Latch/Images.xcassets/Latch.imageset/Latch@3x.png differ
diff --git a/Example/Latch/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/Latch/Images.xcassets/LaunchImage.launchimage/Contents.json
index e37b649..5c993ec 100644
--- a/Example/Latch/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/Example/Latch/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,14 +3,17 @@
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
+      "extent" : "full-screen",
+      "minimum-system-version" : "8.0",
+      "subtype" : "736h",
+      "scale" : "3x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
-      "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
+      "extent" : "full-screen",
+      "minimum-system-version" : "8.0",
+      "subtype" : "667h",
       "scale" : "2x"
     }
   ],
diff --git a/Example/Latch/Info.plist b/Example/Latch/Info.plist
index 1c88361..d63fb73 100644
--- a/Example/Latch/Info.plist
+++ b/Example/Latch/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.vallelungabrian.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,6 +22,8 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>Main</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
diff --git a/Example/Latch/Latch/Main.storyboard b/Example/Latch/Latch/Main.storyboard
index 2d0c385..15caeb6 100644
--- a/Example/Latch/Latch/Main.storyboard
+++ b/Example/Latch/Latch/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="FfQ-LZ-6Vc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="FfQ-LZ-6Vc">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -18,7 +18,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ogN-Mn-JJw">
-                                <rect key="frame" x="259" y="209" width="83" height="36"/>
+                                <rect key="frame" x="257.5" y="209" width="86" height="36"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <state key="normal" title="Authorize">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -28,7 +28,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v9z-9c-U2w">
-                                <rect key="frame" x="212" y="278" width="176" height="36"/>
+                                <rect key="frame" x="211" y="278" width="178" height="36"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <state key="normal" title="Authorize Passcode">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -38,7 +38,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ohb-xo-VW2">
-                                <rect key="frame" x="217" y="354" width="166" height="36"/>
+                                <rect key="frame" x="215" y="354" width="170" height="36"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <state key="normal" title="Authorize Touch ID">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -48,7 +48,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EeG-pc-fH1">
-                                <rect key="frame" x="219" y="147" width="162" height="36"/>
+                                <rect key="frame" x="218.5" y="147" width="163" height="36"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <state key="normal" title="Change Passcode">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/Example/Latch/ViewController.swift b/Example/Latch/ViewController.swift
index cd0c0e9..76d7f5d 100644
--- a/Example/Latch/ViewController.swift
+++ b/Example/Latch/ViewController.swift
@@ -7,64 +7,63 @@
 //
 
 import UIKit
-import Latch
 
 class ViewController: UIViewController, LatchDelegate {
     
-    // MARK: Private Instance Variables
-    var latch: Latch!
+  // MARK: Private Instance Variables
+  var latch: Latch!
     
-    // MARK: UIViewController Overrides
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        self.latch = Latch(defaultPasscode: "0000")
-        self.latch.delegate = self
-      self.latch.enablePasscodeChange = true
-        self.latch.parentController = self
-    }
+  // MARK: UIViewController Overrides
+  override func viewDidLoad() {
+    super.viewDidLoad()
     
-    // MARK: IBAction
-    @IBAction func authorize(sender: UIButton) {
-        self.latch.enableTouch = true
-        self.latch.enablePasscode = true
-        self.latch.authorize()
-    }
+    self.latch = Latch(defaultPasscode: "0000")
+    self.latch.delegate = self
+    self.latch.enablePasscodeChange = true
+    self.latch.parentController = self
+  }
     
-    @IBAction func authorizePasscode(sender: UIButton) {
-        self.latch.enableTouch = false
-        self.latch.enablePasscode = true
-        self.latch.authorize()
-    }
-    
-    @IBAction func authorizeTouch(sender: UIButton) {
-        self.latch.enableTouch = true
-        self.latch.enablePasscode = false
-        self.latch.authorize()
-    }
-    
-    @IBAction func changePasscode(sender: UIButton) {
-        self.latch.updatePasscode()
-    }
-    
-    @IBAction func removePasscode(sender: UIButton) {
-        self.latch.removePasscode()
-    }
-    
-    // MARK: LatchDelegate Methods
-    func latchCanceled() {
-        println("canceled")
-    }
-    func latchGranted() {
-        println("access granged")
-    }
-    
-    func latchSet() {
-        println("passcode set")
-    }
-    
-    func latchDenied(reason: LatchError) {
-        println(reason)
-    }
+  // MARK: IBAction
+  @IBAction func authorize(sender: UIButton) {
+    self.latch.enableTouch = true
+    self.latch.enablePasscode = true
+    self.latch.authorize()
+  }
+  
+  @IBAction func authorizePasscode(sender: UIButton) {
+    self.latch.enableTouch = false
+    self.latch.enablePasscode = true
+    self.latch.authorize()
+  }
+  
+  @IBAction func authorizeTouch(sender: UIButton) {
+    self.latch.enableTouch = true
+    self.latch.enablePasscode = false
+    self.latch.authorize()
+  }
+
+  @IBAction func changePasscode(sender: UIButton) {
+      self.latch.updatePasscode()
+  }
+  
+  @IBAction func removePasscode(sender: UIButton) {
+      self.latch.removePasscode()
+  }
+  
+  // MARK: LatchDelegate Methods
+  func latchCanceled() {
+      print("canceled")
+  }
+  func latchGranted() {
+      print("access granged")
+  }
+  
+  func latchSet() {
+      print("passcode set")
+  }
+  
+  func latchDenied(reason: LatchError) {
+      print(reason)
+  }
 }
 
diff --git a/Example/LatchTests/Info.plist b/Example/LatchTests/Info.plist
index 1a1e19a..ba72822 100644
--- a/Example/LatchTests/Info.plist
+++ b/Example/LatchTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.vallelungabrian.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Example/iOS Example.xcodeproj/project.pbxproj b/Example/iOS Example.xcodeproj/project.pbxproj
index f6f6398..9e0c29c 100644
--- a/Example/iOS Example.xcodeproj/project.pbxproj	
+++ b/Example/iOS Example.xcodeproj/project.pbxproj	
@@ -10,80 +10,42 @@
 		D3936F3519FC235200D903CB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3936F3419FC235200D903CB /* AppDelegate.swift */; };
 		D3936F3719FC235200D903CB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3936F3619FC235200D903CB /* ViewController.swift */; };
 		D3936F3C19FC235200D903CB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D3936F3B19FC235200D903CB /* Images.xcassets */; };
-		D3936F4B19FC235200D903CB /* LatchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3936F4A19FC235200D903CB /* LatchTests.swift */; };
 		D3936F6019FC32DD00D903CB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D3936F5F19FC32DD00D903CB /* Main.storyboard */; };
-		F22A07081A70D4E000484CFA /* Latch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F22A07051A70D4D900484CFA /* Latch.framework */; };
-		F22A07091A70D4E000484CFA /* Latch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F22A07051A70D4D900484CFA /* Latch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		F2BD2E6B1AB01AE900035417 /* Latch.png in Resources */ = {isa = PBXBuildFile; fileRef = F2BD2E631AB01AE900035417 /* Latch.png */; };
+		F2BD2E6C1AB01AE900035417 /* Latch.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2BD2E641AB01AE900035417 /* Latch.swift */; };
+		F2BD2E6D1AB01AE900035417 /* LTPasscode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2BD2E651AB01AE900035417 /* LTPasscode.swift */; };
+		F2BD2E6E1AB01AE900035417 /* LTPasscode.xib in Resources */ = {isa = PBXBuildFile; fileRef = F2BD2E661AB01AE900035417 /* LTPasscode.xib */; };
+		F2BD2E6F1AB01AE900035417 /* LTPasscodeBubble.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2BD2E671AB01AE900035417 /* LTPasscodeBubble.swift */; };
+		F2BD2E701AB01AE900035417 /* LTPasscodeKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2BD2E681AB01AE900035417 /* LTPasscodeKey.swift */; };
+		F2BD2E711AB01AE900035417 /* LTStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2BD2E691AB01AE900035417 /* LTStorage.swift */; };
+		F2BD2E721AB01AE900035417 /* LTTouchID.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2BD2E6A1AB01AE900035417 /* LTTouchID.swift */; };
+		F2BD2E751AB0352800035417 /* Latch.strings in Resources */ = {isa = PBXBuildFile; fileRef = F2BD2E771AB0352800035417 /* Latch.strings */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		D3936F4519FC235200D903CB /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D3936F2719FC235200D903CB /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D3936F2E19FC235200D903CB;
-			remoteInfo = Latch;
-		};
-		F22A07041A70D4D900484CFA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F22A06FF1A70D4D900484CFA /* Latch.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = F22A06B31A70D0E900484CFA;
-			remoteInfo = Latch;
-		};
-		F22A07061A70D4D900484CFA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F22A06FF1A70D4D900484CFA /* Latch.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = F22A06BE1A70D0E900484CFA;
-			remoteInfo = LatchTests;
-		};
-		F22A070A1A70D4E000484CFA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F22A06FF1A70D4D900484CFA /* Latch.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = F22A06B21A70D0E900484CFA;
-			remoteInfo = Latch;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		F22A06FE1A70D4AA00484CFA /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				F22A07091A70D4E000484CFA /* Latch.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
-		D3936F2F19FC235200D903CB /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		D3936F2F19FC235200D903CB /* Latch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Latch.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D3936F3319FC235200D903CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D3936F3419FC235200D903CB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		D3936F3619FC235200D903CB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		D3936F3B19FC235200D903CB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
-		D3936F4419FC235200D903CB /* iOS ExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "iOS ExampleTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D3936F4919FC235200D903CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D3936F4A19FC235200D903CB /* LatchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LatchTests.swift; sourceTree = "<group>"; };
 		D3936F5F19FC32DD00D903CB /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Latch/Main.storyboard; sourceTree = "<group>"; };
-		F22A06FF1A70D4D900484CFA /* Latch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Latch.xcodeproj; path = ../Latch/Latch.xcodeproj; sourceTree = "<group>"; };
+		F2BD2E631AB01AE900035417 /* Latch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Latch.png; sourceTree = "<group>"; };
+		F2BD2E641AB01AE900035417 /* Latch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Latch.swift; sourceTree = "<group>"; };
+		F2BD2E651AB01AE900035417 /* LTPasscode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LTPasscode.swift; sourceTree = "<group>"; };
+		F2BD2E661AB01AE900035417 /* LTPasscode.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LTPasscode.xib; sourceTree = "<group>"; };
+		F2BD2E671AB01AE900035417 /* LTPasscodeBubble.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LTPasscodeBubble.swift; sourceTree = "<group>"; };
+		F2BD2E681AB01AE900035417 /* LTPasscodeKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LTPasscodeKey.swift; sourceTree = "<group>"; };
+		F2BD2E691AB01AE900035417 /* LTStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LTStorage.swift; sourceTree = "<group>"; };
+		F2BD2E6A1AB01AE900035417 /* LTTouchID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LTTouchID.swift; sourceTree = "<group>"; };
+		F2BD2E761AB0352800035417 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Latch.strings; sourceTree = "<group>"; };
+		F2BD2E781AB0352F00035417 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Latch.strings; sourceTree = "<group>"; };
+		F2BD2E791AB0354E00035417 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Latch.strings"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		D3936F2C19FC235200D903CB /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F22A07081A70D4E000484CFA /* Latch.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D3936F4119FC235200D903CB /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -99,15 +61,13 @@
 				D3936F3119FC235200D903CB /* Latch */,
 				D3936F4719FC235200D903CB /* LatchTests */,
 				D3936F3019FC235200D903CB /* Products */,
-				F22A06FF1A70D4D900484CFA /* Latch.xcodeproj */,
 			);
 			sourceTree = "<group>";
 		};
 		D3936F3019FC235200D903CB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				D3936F2F19FC235200D903CB /* iOS Example.app */,
-				D3936F4419FC235200D903CB /* iOS ExampleTests.xctest */,
+				D3936F2F19FC235200D903CB /* Latch.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -115,6 +75,7 @@
 		D3936F3119FC235200D903CB /* Latch */ = {
 			isa = PBXGroup;
 			children = (
+				F2BD2E621AB01AE900035417 /* Framework */,
 				D3936F3419FC235200D903CB /* AppDelegate.swift */,
 				D3936F3619FC235200D903CB /* ViewController.swift */,
 				D3936F5F19FC32DD00D903CB /* Main.storyboard */,
@@ -149,71 +110,56 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		F22A07001A70D4D900484CFA /* Products */ = {
+		F2BD2E621AB01AE900035417 /* Framework */ = {
 			isa = PBXGroup;
 			children = (
-				F22A07051A70D4D900484CFA /* Latch.framework */,
-				F22A07071A70D4D900484CFA /* LatchTests.xctest */,
+				F2BD2E631AB01AE900035417 /* Latch.png */,
+				F2BD2E771AB0352800035417 /* Latch.strings */,
+				F2BD2E641AB01AE900035417 /* Latch.swift */,
+				F2BD2E651AB01AE900035417 /* LTPasscode.swift */,
+				F2BD2E661AB01AE900035417 /* LTPasscode.xib */,
+				F2BD2E671AB01AE900035417 /* LTPasscodeBubble.swift */,
+				F2BD2E681AB01AE900035417 /* LTPasscodeKey.swift */,
+				F2BD2E691AB01AE900035417 /* LTStorage.swift */,
+				F2BD2E6A1AB01AE900035417 /* LTTouchID.swift */,
 			);
-			name = Products;
+			name = Framework;
+			path = ../../Framework;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		D3936F2E19FC235200D903CB /* iOS Example */ = {
+		D3936F2E19FC235200D903CB /* Latch_iOS7 */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D3936F4E19FC235200D903CB /* Build configuration list for PBXNativeTarget "iOS Example" */;
+			buildConfigurationList = D3936F4E19FC235200D903CB /* Build configuration list for PBXNativeTarget "Latch_iOS7" */;
 			buildPhases = (
 				D3936F2B19FC235200D903CB /* Sources */,
 				D3936F2C19FC235200D903CB /* Frameworks */,
 				D3936F2D19FC235200D903CB /* Resources */,
-				F22A06FE1A70D4AA00484CFA /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				F22A070B1A70D4E000484CFA /* PBXTargetDependency */,
 			);
-			name = "iOS Example";
+			name = Latch_iOS7;
 			productName = Latch;
-			productReference = D3936F2F19FC235200D903CB /* iOS Example.app */;
+			productReference = D3936F2F19FC235200D903CB /* Latch.app */;
 			productType = "com.apple.product-type.application";
 		};
-		D3936F4319FC235200D903CB /* iOS ExampleTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D3936F5119FC235200D903CB /* Build configuration list for PBXNativeTarget "iOS ExampleTests" */;
-			buildPhases = (
-				D3936F4019FC235200D903CB /* Sources */,
-				D3936F4119FC235200D903CB /* Frameworks */,
-				D3936F4219FC235200D903CB /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D3936F4619FC235200D903CB /* PBXTargetDependency */,
-			);
-			name = "iOS ExampleTests";
-			productName = LatchTests;
-			productReference = D3936F4419FC235200D903CB /* iOS ExampleTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		D3936F2719FC235200D903CB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Brian Vallelunga";
 				TargetAttributes = {
 					D3936F2E19FC235200D903CB = {
 						CreatedOnToolsVersion = 6.1;
-						DevelopmentTeam = R5K2X99B7E;
-					};
-					D3936F4319FC235200D903CB = {
-						CreatedOnToolsVersion = 6.1;
-						TestTargetID = D3936F2E19FC235200D903CB;
+						DevelopmentTeam = 42M2D7SKCJ;
 					};
 				};
 			};
@@ -224,58 +170,31 @@
 			knownRegions = (
 				en,
 				Base,
+				"zh-Hant",
 			);
 			mainGroup = D3936F2619FC235200D903CB;
 			productRefGroup = D3936F3019FC235200D903CB /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = F22A07001A70D4D900484CFA /* Products */;
-					ProjectRef = F22A06FF1A70D4D900484CFA /* Latch.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
-				D3936F2E19FC235200D903CB /* iOS Example */,
-				D3936F4319FC235200D903CB /* iOS ExampleTests */,
+				D3936F2E19FC235200D903CB /* Latch_iOS7 */,
 			);
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		F22A07051A70D4D900484CFA /* Latch.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Latch.framework;
-			remoteRef = F22A07041A70D4D900484CFA /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		F22A07071A70D4D900484CFA /* LatchTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = LatchTests.xctest;
-			remoteRef = F22A07061A70D4D900484CFA /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		D3936F2D19FC235200D903CB /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F2BD2E6B1AB01AE900035417 /* Latch.png in Resources */,
+				F2BD2E6E1AB01AE900035417 /* LTPasscode.xib in Resources */,
 				D3936F3C19FC235200D903CB /* Images.xcassets in Resources */,
+				F2BD2E751AB0352800035417 /* Latch.strings in Resources */,
 				D3936F6019FC32DD00D903CB /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D3936F4219FC235200D903CB /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -284,32 +203,30 @@
 			buildActionMask = 2147483647;
 			files = (
 				D3936F3719FC235200D903CB /* ViewController.swift in Sources */,
+				F2BD2E6F1AB01AE900035417 /* LTPasscodeBubble.swift in Sources */,
+				F2BD2E721AB01AE900035417 /* LTTouchID.swift in Sources */,
+				F2BD2E6D1AB01AE900035417 /* LTPasscode.swift in Sources */,
 				D3936F3519FC235200D903CB /* AppDelegate.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D3936F4019FC235200D903CB /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D3936F4B19FC235200D903CB /* LatchTests.swift in Sources */,
+				F2BD2E6C1AB01AE900035417 /* Latch.swift in Sources */,
+				F2BD2E701AB01AE900035417 /* LTPasscodeKey.swift in Sources */,
+				F2BD2E711AB01AE900035417 /* LTStorage.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		D3936F4619FC235200D903CB /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D3936F2E19FC235200D903CB /* iOS Example */;
-			targetProxy = D3936F4519FC235200D903CB /* PBXContainerItemProxy */;
-		};
-		F22A070B1A70D4E000484CFA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Latch;
-			targetProxy = F22A070A1A70D4E000484CFA /* PBXContainerItemProxy */;
+/* Begin PBXVariantGroup section */
+		F2BD2E771AB0352800035417 /* Latch.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				F2BD2E761AB0352800035417 /* Base */,
+				F2BD2E781AB0352F00035417 /* en */,
+				F2BD2E791AB0354E00035417 /* zh-Hant */,
+			);
+			name = Latch.strings;
+			sourceTree = "<group>";
 		};
-/* End PBXTargetDependency section */
+/* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
 		D3936F4C19FC235200D903CB /* Debug */ = {
@@ -332,6 +249,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -397,13 +315,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = Latch/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vallelungabrian.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = Latch;
 				PROVISIONING_PROFILE = "";
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -413,51 +331,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = Latch/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				TARGETED_DEVICE_FAMILY = 1;
-			};
-			name = Release;
-		};
-		D3936F5219FC235200D903CB /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = LatchTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "iOS ExampleTests";
-				PROVISIONING_PROFILE = "";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOS Example.app/iOS Example";
-			};
-			name = Debug;
-		};
-		D3936F5319FC235200D903CB /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = LatchTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "iOS ExampleTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vallelungabrian.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = Latch;
 				PROVISIONING_PROFILE = "";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOS Example.app/iOS Example";
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -473,7 +353,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D3936F4E19FC235200D903CB /* Build configuration list for PBXNativeTarget "iOS Example" */ = {
+		D3936F4E19FC235200D903CB /* Build configuration list for PBXNativeTarget "Latch_iOS7" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D3936F4F19FC235200D903CB /* Debug */,
@@ -482,15 +362,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D3936F5119FC235200D903CB /* Build configuration list for PBXNativeTarget "iOS ExampleTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D3936F5219FC235200D903CB /* Debug */,
-				D3936F5319FC235200D903CB /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */
 	};
 	rootObject = D3936F2719FC235200D903CB /* Project object */;
diff --git a/Framework/Base.lproj/Latch.strings b/Framework/Base.lproj/Latch.strings
new file mode 100644
index 0000000..4784b33
--- /dev/null
+++ b/Framework/Base.lproj/Latch.strings
@@ -0,0 +1,7 @@
+/* 
+  Latch.strings
+  iOS Example
+
+  Created by HuangRetso on 3/11/15.
+  Copyright (c) 2015 Brian Vallelunga. All rights reserved.
+*/
diff --git a/Framework/LTPasscode.swift b/Framework/LTPasscode.swift
index 7d1adda..d9e9947 100644
--- a/Framework/LTPasscode.swift
+++ b/Framework/LTPasscode.swift
@@ -15,7 +15,7 @@ public enum LTPasscodeStatusBar {
 }
 
 public struct LTPasscodeTheme {
-    var logo: UIImage = UIImage(named: "Latch", inBundle: FrameworkBundle, compatibleWithTraitCollection: nil)!
+  var logo: UIImage = UIImage(named: "Latch", inBundle:NSBundle(forClass: Latch.self), compatibleWithTraitCollection:nil)!
     var logoTint: UIColor! = UIColor(red:0.12, green:0.67, blue:0.95, alpha:1)
     var logoErrorTint: UIColor = UIColor.redColor()
    
@@ -48,84 +48,99 @@ protocol LTPasscodeDelegate {
     func passcodeCanceled()
 }
 
-let FrameworkBundle = NSBundle(path: NSBundle.mainBundle().privateFrameworksPath!.stringByAppendingPathComponent("Latch.framework"))
-
 class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
     
-    // MARK: Instance Enum
-    enum State {
-        case Check, Set, Inactive, UpdateCheck, UpdateSet
-    }
+  // MARK: Instance Enum
+  enum State {
+      case Check, Set, Inactive, UpdateCheck, UpdateSet
+  }
     
-    // MARK: Instance Variables
-    var delegate: LTPasscodeDelegate!
-    var parentController: UIViewController!
-    var theme: LTPasscodeTheme!
+  // MARK: Instance Variables
+  var delegate: LTPasscodeDelegate!
+  var parentController: UIViewController!
+  var theme: LTPasscodeTheme!
   var enablePasscodeChange: Bool = false
+  var changeInstructions: String!
+  var instructions: String!
+  
+  // MARK: Private Instance Variables
+  private var storage: LTStorage! = LTStorage()
+  private var state: State = .Inactive
+  private var passcode: [String] = []
+  private var previousPasscode: String = ""
+  private var keys: [LTPasscodeKey] = [
+    LTPasscodeKey(number: 1, alpha: "", row: 0, column: 0),
+    LTPasscodeKey(number: 2, alpha: "ABC", row: 0, column: 1),
+    LTPasscodeKey(number: 3, alpha: "DEF", row: 0, column: 2),
+    LTPasscodeKey(number: 4, alpha: "GHI", row: 1, column: 0),
+    LTPasscodeKey(number: 5, alpha: "JKL", row: 1, column: 1),
+    LTPasscodeKey(number: 6, alpha: "MNO", row: 1, column: 2),
+    LTPasscodeKey(number: 7, alpha: "PQRS", row: 2, column: 0),
+    LTPasscodeKey(number: 8, alpha: "TUV", row: 2, column: 1),
+    LTPasscodeKey(number: 9, alpha: "WXYZ", row: 2, column: 2),
+    LTPasscodeKey(number: 0, alpha: nil, row: 3, column: 1),
+    LTPasscodeKey(number: -2, alpha: nil, row: 3, column: 0),
+    LTPasscodeKey(number: -1, alpha: nil, row: 3, column: 2)
+  ]
+  private var bubbles: [LTPasscodeBubble] = [
+    LTPasscodeBubble(number: 0),
+    LTPasscodeBubble(number: 1),
+    LTPasscodeBubble(number: 2),
+    LTPasscodeBubble(number: 3)
+  ]
     
-    // MARK: Private Instance Variables
-    private var storage: LTStorage! = LTStorage()
-    private var state: State = .Inactive
-    private var passcode: [String] = []
-    private var previousPasscode: String = ""
-  private var changeInstructions: String!
-    private var instructions: String!
-    private var keys: [LTPasscodeKey] = [
-      LTPasscodeKey(number: 1, alpha: "", row: 0, column: 0),
-      LTPasscodeKey(number: 2, alpha: "ABC", row: 0, column: 1),
-      LTPasscodeKey(number: 3, alpha: "DEF", row: 0, column: 2),
-      LTPasscodeKey(number: 4, alpha: "GHI", row: 1, column: 0),
-      LTPasscodeKey(number: 5, alpha: "JKL", row: 1, column: 1),
-      LTPasscodeKey(number: 6, alpha: "MNO", row: 1, column: 2),
-      LTPasscodeKey(number: 7, alpha: "PQRS", row: 2, column: 0),
-      LTPasscodeKey(number: 8, alpha: "TUV", row: 2, column: 1),
-      LTPasscodeKey(number: 9, alpha: "WXYZ", row: 2, column: 2),
-      LTPasscodeKey(number: 0, alpha: nil, row: 3, column: 1),
-      LTPasscodeKey(number: -2, alpha: nil, row: 3, column: 0),
-      LTPasscodeKey(number: -1, alpha: nil, row: 3, column: 2)
-    ]
-    private var bubbles: [LTPasscodeBubble] = [
-        LTPasscodeBubble(number: 0),
-        LTPasscodeBubble(number: 1),
-        LTPasscodeBubble(number: 2),
-        LTPasscodeBubble(number: 3)
-    ]
-    
-    // MARK: IBOutlets
-    @IBOutlet weak var logoView: UIImageView!
-    @IBOutlet weak var instructionsLabel: UILabel!
-    @IBOutlet weak var keysView: UIView!
-    @IBOutlet weak var bubblesView: UIView!
-    
+  // MARK: IBOutlets
+  @IBOutlet weak private var logoImageViewHeightLayoutConstraint: NSLayoutConstraint!
+  @IBOutlet weak var logoView: UIImageView!
+  @IBOutlet weak private var instructionsLabel: UILabel!
+  @IBOutlet weak var keysView: UIView!
+  @IBOutlet weak var bubblesView: UIView!
+  
     // MARK: Initializer
-  convenience init(instructions: String, changeInstructions: String) {
-    self.init(nibName: "LTPasscode", bundle: FrameworkBundle)
-    self.instructions = instructions
-    self.changeInstructions = changeInstructions
+  convenience init() {
+    self.init(nibName: "LTPasscode", bundle: NSBundle(forClass: Latch.self))
     self.updateStyle()
+    if UIScreen.mainScreen().bounds.size.height < 568 {
+      self.logoImageViewHeightLayoutConstraint.constant = 0
+    } else {
+      self.logoImageViewHeightLayoutConstraint.constant = 50
+    }
   }
     
-    // MARK: UIViewController Overrides
-    override func viewDidLoad() {
-        super.viewDidLoad()
-    }
+  // MARK: - Life Cycle
+  override func viewDidLoad() {
+    super.viewDidLoad()
+  }
+
+  override func viewWillAppear(animated: Bool) {
+    super.viewWillAppear(animated)
     
-    override func viewWillAppear(animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        // Update Instructions Label
-        self.instructionsLabel.text = self.instructions
-    }
+    // Update Instructions Label
+    self.instructionsLabel.text = self.instructions
+  }
+
+  override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
     
-    override func viewDidAppear(animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        // Create Bubbles
-        self.configureBubbles()
-        
-        // Create Keys
-        self.configureKeys()
+    // Create Bubbles
+    self.configureBubbles()
+    
+    // Create Keys
+    self.configureKeys()
+  }
+  
+  // MARK: - Rotation
+  override func shouldAutorotate() -> Bool {
+    return UIDevice.currentDevice().userInterfaceIdiom == UIUserInterfaceIdiom.Pad
+  }
+  
+  override func preferredInterfaceOrientationForPresentation() -> UIInterfaceOrientation {
+    if UIDevice.currentDevice().userInterfaceIdiom == UIUserInterfaceIdiom.Pad {
+      return UIApplication.sharedApplication().statusBarOrientation
+    } else {
+      return UIInterfaceOrientation.Portrait
     }
+  }
   
     // MARK: Instance Methods
   func setDefaultPasscode(passcodeString: String) {
@@ -191,33 +206,43 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
     }
     
     internal func configureKeys() {
-        for key in self.keys {
-            key.delegate = self
-            key.parentView = self.keysView
-            
-            key.border = self.theme.keyPadBorder
-            key.background = self.theme.keyPadBackground
-            
-            key.borderTouch = self.theme.keyPadTouchBorder
-            key.backgroundTouch = self.theme.keyPadTouchBackground
-          
-          if key.number == -1 {
-            if self.state == .Set {
-              key.numberLabel.text = NSLocalizedString("Cancel", bundle: FrameworkBundle!, comment: "")
-            } else {
-              key.numberLabel.text = NSLocalizedString("Delete", bundle: FrameworkBundle!, comment: "")
-            }
-          } else if key.number == -2 {
-            if self.state == .Check && self.enablePasscodeChange && self.storage.readPasscode() != nil {
-              key.numberLabel.text = NSLocalizedString("Change Passcode", bundle: FrameworkBundle!, comment: "")
+      for key in self.keys {
+        key.enabled = true
+        key.delegate = self
+        key.parentView = self.keysView
+        
+        key.border = self.theme.keyPadBorder
+        key.background = self.theme.keyPadBackground
+        
+        key.borderTouch = self.theme.keyPadTouchBorder
+        key.backgroundTouch = self.theme.keyPadTouchBackground
+        
+        if key.number == -1 {
+          if self.state == .Set {
+            key.numberLabel.text = NSLocalizedString("Cancel", tableName: "Latch",  bundle: NSBundle(forClass: Latch.self), comment: "")
+          } else {
+            key.numberLabel.text = NSLocalizedString("Delete", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
+          }
+        } else if key.number == -2 {
+          switch self.state {
+          case .Check:
+            if self.storage.readPasscode() != nil {
+              key.numberLabel.text = NSLocalizedString("Change Passcode", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
             } else {
-              key.numberLabel.text = NSLocalizedString("Cancel", bundle: FrameworkBundle!, comment: "")
+              key.numberLabel.text = ""
+              key.enabled = false
             }
+          case .UpdateCheck, .UpdateSet:
+            key.numberLabel.text = NSLocalizedString("Cancel", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
+          default:
+            key.numberLabel.text = ""
+            key.enabled = false
           }
-            
-            key.configureKey()
-            self.keysView.addSubview(key)
         }
+          
+        key.configureKey()
+        self.keysView.addSubview(key)
+      }
     }
     
     internal func updateStyle() {
@@ -249,7 +274,7 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
             bubble.updateStyle()
         }
         
-        var animation = CAKeyframeAnimation(keyPath: "transform.translation.x")
+        let animation = CAKeyframeAnimation(keyPath: "transform.translation.x")
         animation.autoreverses = true
         animation.repeatCount = 2
         animation.duration = 0.07
@@ -289,7 +314,7 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
               
               }, completion: { finished in
                 
-                self.instructionsLabel.text = NSLocalizedString("Enter your new passcode", bundle: FrameworkBundle!, comment: "")
+                self.instructionsLabel.text = NSLocalizedString("Enter your new passcode", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
                 self.instructionsLabel.frame.origin.x = screenWidth
                 self.bubblesView.frame.origin.x = screenWidth
                 for bubble in self.bubbles {
@@ -318,10 +343,8 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
             passcodeString += character
         }
         
-        self.passcode.removeAll(keepCapacity: false)
-        
         if self.previousPasscode.isEmpty {
-            self.previousPasscode = passcodeString
+          self.previousPasscode = passcodeString
           
           let originalInstructionsLabelFrame = self.instructionsLabel.frame
           let originalBubbleFrame = self.bubblesView.frame
@@ -333,8 +356,11 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
             self.bubblesView.frame.origin.x = -screenWidth
             
             }, completion: { finished in
-              
-              self.instructionsLabel.text = NSLocalizedString("Confirm Passcode", bundle: FrameworkBundle!, comment: "")
+              if self.state == .UpdateSet {
+                self.instructionsLabel.text = NSLocalizedString("Re-enter your new passcode", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
+              } else {
+                self.instructionsLabel.text = NSLocalizedString("Confirm Passcode", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
+              }
               self.instructionsLabel.frame.origin.x = screenWidth
               self.bubblesView.frame.origin.x = screenWidth
               for bubble in self.bubbles {
@@ -345,7 +371,9 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
               UIView.animateWithDuration(0.5, delay: 0, options: UIViewAnimationOptions.CurveEaseIn, animations: {
                 self.instructionsLabel.frame = originalInstructionsLabelFrame
                 self.bubblesView.frame = originalBubbleFrame
-                }, completion: nil)
+                }, completion: { [unowned self] _ in
+                  self.passcode.removeAll(keepCapacity: false)
+              })
               
           })
           
@@ -374,6 +402,7 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
         self.configureKeys()
         return
       }
+      
         if number < 0 && self.passcode.count == 0 && self.state == .Set {
             self.dismiss()
             self.delegate.passcodeCanceled()
@@ -385,8 +414,8 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
         } else if self.passcode.count > 0 {
             self.passcode.removeLast()
         }
-        
-        for (index, bubble) in enumerate(self.bubbles) {
+
+        for (index, bubble) in self.bubbles.enumerate() {
             if index <= self.passcode.count - 1 {
                 bubble.state = .Active
             } else {
@@ -395,7 +424,7 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
             
             bubble.updateStyle()
         }
-        
+
         if self.passcode.count == 4 {
             if self.state == .Check || self.state == .UpdateCheck {
                 self.checkPasscode()
@@ -406,9 +435,9 @@ class LTPasscode: UIViewController, LTPasscodeKeyDelegate {
         
         if self.state == .Set {
             if self.passcode.count == 0 {
-                self.keys.last?.numberLabel.text = NSLocalizedString("Cancel", bundle: FrameworkBundle!, comment: "")
+                self.keys.last?.numberLabel.text = NSLocalizedString("Cancel", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
             } else {
-                self.keys.last?.numberLabel.text = NSLocalizedString("Delete", bundle: FrameworkBundle!, comment: "")
+                self.keys.last?.numberLabel.text = NSLocalizedString("Delete", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "")
             }
         }
     }
diff --git a/Framework/LTPasscode.xib b/Framework/LTPasscode.xib
index dba590b..33fbcc3 100644
--- a/Framework/LTPasscode.xib
+++ b/Framework/LTPasscode.xib
@@ -1,73 +1,80 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C99d" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14C1510" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LTPasscode" customModule="iOS_Example" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LTPasscode" customModule="avvideo" customModuleProvider="target">
             <connections>
                 <outlet property="bubblesView" destination="r9E-mL-G06" id="cFy-ee-Dny"/>
                 <outlet property="instructionsLabel" destination="Qu9-4s-sa1" id="QV1-oQ-bBi"/>
                 <outlet property="keysView" destination="Ukd-gg-591" id="T7K-w4-46j"/>
+                <outlet property="logoImageViewHeightLayoutConstraint" destination="3NS-hv-eef" id="Lqk-3P-Ad1"/>
                 <outlet property="logoView" destination="KEX-fo-6gr" id="qbq-Pb-vRn"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+        <view clearsContextBeforeDrawing="NO" contentMode="center" id="i5M-Pr-FkT">
             <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KEX-fo-6gr">
-                    <rect key="frame" x="275" y="65" width="50" height="50"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rCJ-hk-3px" userLabel="Content View">
+                    <rect key="frame" x="184" y="70" width="231" height="460"/>
+                    <subviews>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KEX-fo-6gr" userLabel="Logo Image View">
+                            <rect key="frame" x="0.0" y="0.0" width="231" height="50"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="50" id="3NS-hv-eef"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter Password" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qu9-4s-sa1">
+                            <rect key="frame" x="0.0" y="62" width="231" height="35"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="35" id="6gF-s0-4oy"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r9E-mL-G06" userLabel="Bubbles View">
+                            <rect key="frame" x="0.0" y="109" width="231" height="12"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="12" id="ArO-ql-KQG"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukd-gg-591" userLabel="Keyboard View">
+                            <rect key="frame" x="0.0" y="146" width="231" height="314"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="231" id="3o2-Y3-erk"/>
+                                <constraint firstAttribute="height" constant="314" id="Ufh-4X-eIo"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="50" id="pjR-gA-ZcO"/>
-                        <constraint firstAttribute="height" constant="50" id="wxv-Sz-XLr"/>
-                    </constraints>
-                </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter Password" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qu9-4s-sa1">
-                    <rect key="frame" x="10" y="120" width="580" height="35"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="35" id="GG4-57-Tr8"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukd-gg-591">
-                    <rect key="frame" x="10" y="217" width="580" height="375"/>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r9E-mL-G06">
-                    <rect key="frame" x="210" y="167" width="180" height="25"/>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="25" id="Aws-uE-WZH"/>
-                        <constraint firstAttribute="width" constant="180" id="XcK-uH-0rV"/>
+                        <constraint firstItem="r9E-mL-G06" firstAttribute="leading" secondItem="rCJ-hk-3px" secondAttribute="leading" id="1SM-Ec-wpl"/>
+                        <constraint firstItem="KEX-fo-6gr" firstAttribute="top" secondItem="rCJ-hk-3px" secondAttribute="top" id="5qx-DA-cWb"/>
+                        <constraint firstAttribute="trailing" secondItem="Ukd-gg-591" secondAttribute="trailing" id="BXc-XT-ujZ"/>
+                        <constraint firstAttribute="bottom" secondItem="Ukd-gg-591" secondAttribute="bottom" id="ED6-TP-xJr"/>
+                        <constraint firstItem="Ukd-gg-591" firstAttribute="leading" secondItem="rCJ-hk-3px" secondAttribute="leading" id="EEs-Sk-oDO"/>
+                        <constraint firstAttribute="trailing" secondItem="r9E-mL-G06" secondAttribute="trailing" id="Jd2-gv-Bcr"/>
+                        <constraint firstAttribute="trailing" secondItem="KEX-fo-6gr" secondAttribute="trailing" id="Jpt-By-vat"/>
+                        <constraint firstItem="Qu9-4s-sa1" firstAttribute="top" secondItem="KEX-fo-6gr" secondAttribute="bottom" constant="12" id="Maz-QE-WZl"/>
+                        <constraint firstItem="Qu9-4s-sa1" firstAttribute="leading" secondItem="rCJ-hk-3px" secondAttribute="leading" id="Tt6-SN-aQP"/>
+                        <constraint firstItem="r9E-mL-G06" firstAttribute="top" secondItem="Qu9-4s-sa1" secondAttribute="bottom" constant="12" id="W1o-1L-vJz"/>
+                        <constraint firstAttribute="trailing" secondItem="Qu9-4s-sa1" secondAttribute="trailing" id="bc9-JY-HiW"/>
+                        <constraint firstItem="KEX-fo-6gr" firstAttribute="leading" secondItem="rCJ-hk-3px" secondAttribute="leading" id="gvT-ye-gLu"/>
+                        <constraint firstItem="Ukd-gg-591" firstAttribute="top" secondItem="r9E-mL-G06" secondAttribute="bottom" constant="25" id="ywN-3y-oXD"/>
                     </constraints>
                 </view>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="Ukd-gg-591" secondAttribute="trailing" constant="10" id="2Ac-WX-pIp"/>
-                <constraint firstAttribute="centerX" secondItem="r9E-mL-G06" secondAttribute="centerX" id="2Mi-1x-uIG"/>
-                <constraint firstItem="Ukd-gg-591" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="10" id="6iF-hZ-4hp"/>
-                <constraint firstItem="r9E-mL-G06" firstAttribute="top" secondItem="Qu9-4s-sa1" secondAttribute="bottom" constant="12" id="9A1-PP-hCw"/>
-                <constraint firstAttribute="centerX" secondItem="KEX-fo-6gr" secondAttribute="centerX" id="F6i-og-Unr"/>
-                <constraint firstItem="Ukd-gg-591" firstAttribute="top" secondItem="Qu9-4s-sa1" secondAttribute="bottom" constant="50" id="MCt-o6-IPq"/>
-                <constraint firstItem="Ukd-gg-591" firstAttribute="top" secondItem="r9E-mL-G06" secondAttribute="bottom" constant="25" id="NG5-tw-Jce"/>
-                <constraint firstAttribute="bottom" secondItem="Ukd-gg-591" secondAttribute="bottom" constant="8" id="UlK-b2-Adj"/>
-                <constraint firstItem="Qu9-4s-sa1" firstAttribute="top" secondItem="KEX-fo-6gr" secondAttribute="bottom" constant="5" id="cJ7-w5-rdi"/>
-                <constraint firstItem="Qu9-4s-sa1" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="10" id="joP-da-3XR"/>
-                <constraint firstItem="KEX-fo-6gr" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="65" id="sQo-NR-Vro"/>
-                <constraint firstAttribute="trailing" secondItem="Qu9-4s-sa1" secondAttribute="trailing" constant="10" id="wsn-bb-D7c"/>
+                <constraint firstAttribute="centerY" secondItem="rCJ-hk-3px" secondAttribute="centerY" id="3bm-iZ-fBj"/>
+                <constraint firstAttribute="centerX" secondItem="rCJ-hk-3px" secondAttribute="centerX" id="HDR-cW-Lxa"/>
             </constraints>
-            <variation key="default">
-                <mask key="constraints">
-                    <exclude reference="MCt-o6-IPq"/>
-                </mask>
-            </variation>
         </view>
     </objects>
 </document>
diff --git a/Framework/LTPasscodeBubble.swift b/Framework/LTPasscodeBubble.swift
index 4fbfb6b..6f6febe 100644
--- a/Framework/LTPasscodeBubble.swift
+++ b/Framework/LTPasscodeBubble.swift
@@ -35,12 +35,12 @@ class LTPasscodeBubble: UIView {
     // MARK: Instance Methods
     func configureBubble() {
         // Create Frame
-        var bubbleWidth: CGFloat = 12
-        var bubbleHeight: CGFloat = 12
-        var bubblePadding: CGFloat = 8
+        let bubbleWidth: CGFloat = 12
+        let bubbleHeight: CGFloat = 12
+        let bubblePadding: CGFloat = 8
         
-        var bubbleCenterX = self.parentView.frame.width/2
-        var bubbleX = bubbleCenterX + ((bubbleWidth + bubblePadding) * (self.number - 2))
+        let bubbleCenterX = self.parentView.frame.width/2 + bubblePadding/2
+        let bubbleX = bubbleCenterX + ((bubbleWidth + bubblePadding) * (self.number - 2))
         
         self.frame = CGRectMake(bubbleX, 0, bubbleWidth, bubbleHeight)
         
diff --git a/Framework/LTPasscodeKey.swift b/Framework/LTPasscodeKey.swift
index aaec690..6fdcb4d 100644
--- a/Framework/LTPasscodeKey.swift
+++ b/Framework/LTPasscodeKey.swift
@@ -46,8 +46,8 @@ class LTPasscodeKey: UIButton {
             self.numberLabel.numberOfLines = 2
             
             if alpha != nil {
-                var attributedText = NSMutableAttributedString(string: "\(number)")
-                var alphaText = NSMutableAttributedString(string: "\n\(alpha)")
+                let attributedText = NSMutableAttributedString(string: "\(number)")
+                let alphaText = NSMutableAttributedString(string: "\n\(alpha)")
                 alphaText.addAttribute(NSFontAttributeName, value: UIFont(name: "HelveticaNeue-Thin", size: 12)!, range: NSMakeRange(0, alphaText.length))
                 attributedText.appendAttributedString(alphaText)
                 
@@ -63,12 +63,12 @@ class LTPasscodeKey: UIButton {
         self.addSubview(self.numberLabel)
         
         // Attach Event Listner
-        self.addTarget(self, action: Selector("holdHandle:"), forControlEvents: UIControlEvents.TouchDown)
-        self.addTarget(self, action: Selector("tapHandle:"), forControlEvents: UIControlEvents.TouchUpInside)
+        self.addTarget(self, action: Selector("holdHandle"), forControlEvents: UIControlEvents.TouchDown)
+        self.addTarget(self, action: Selector("tapHandle"), forControlEvents: UIControlEvents.TouchUpInside)
     }
     
     // MARK: Gesture Handler
-    @IBAction func holdHandle(gesture: UIPanGestureRecognizer) {
+    func holdHandle() {
         if self.number >= 0 {
             self.backgroundColor = self.backgroundTouch
             self.layer.borderColor = self.borderTouch.CGColor
@@ -78,10 +78,10 @@ class LTPasscodeKey: UIButton {
         }
     }
     
-    @IBAction func tapHandle(gesture: UIPanGestureRecognizer) {
+    func tapHandle() {
         self.delegate!.keyPressed(self.number)
         
-        UIView.animateWithDuration(0.4, delay: 0.05, options: UIViewAnimationOptions.CurveEaseOut, animations: { () -> Void in
+        UIView.animateWithDuration(0.1, delay: 0, options: UIViewAnimationOptions.CurveEaseOut, animations: { () -> Void in
             if self.number >= 0 {
                 self.backgroundColor = self.background
                 self.layer.borderColor = self.border.CGColor
@@ -95,13 +95,13 @@ class LTPasscodeKey: UIButton {
     // MARK: Instance Methods
     func configureKey() {
         // Create Frame
-        var keyWidth: CGFloat = 65
-        var keyHeight: CGFloat = 65
-        var keyPadding: CGFloat = 18
+        let keyWidth: CGFloat = 64
+        let keyHeight: CGFloat = 64
+        let keyPadding: CGFloat = 18
         
-        var keyCenterX = self.parentView.frame.width/2 - (keyWidth/2)
-        var keyX = keyCenterX + ((keyWidth + keyPadding) * (self.column - 1))
-        var keyY = (keyHeight + keyPadding) * self.row
+        let keyCenterX = self.parentView.frame.width/2 - (keyWidth/2)
+        let keyX = keyCenterX + ((keyWidth + keyPadding) * (self.column - 1))
+        let keyY = (keyHeight + keyPadding) * self.row
 
         self.frame = CGRectMake(keyX, keyY, keyWidth, keyHeight)
         
diff --git a/Framework/LTStorage.swift b/Framework/LTStorage.swift
index 766400b..39d57ec 100644
--- a/Framework/LTStorage.swift
+++ b/Framework/LTStorage.swift
@@ -17,7 +17,7 @@ class LTStorage {
     // MARK: Initializer Method
     init() {
         let paths = NSSearchPathForDirectoriesInDomains(.DocumentDirectory, .UserDomainMask, true) as NSArray
-        let documentsDirectory = paths.objectAtIndex(0)as NSString
+        let documentsDirectory = paths.objectAtIndex(0)as! NSString
         self.path = documentsDirectory.stringByAppendingPathComponent("Latch.plist")
         
         let fileManager = NSFileManager.defaultManager()
@@ -26,7 +26,11 @@ class LTStorage {
         if !fileManager.fileExistsAtPath(path)  {
             // If it doesn't, copy it from the default file in the Resources folder
             let bundle = NSBundle.mainBundle().pathForResource("Info", ofType: "plist")
-            fileManager.copyItemAtPath(bundle!, toPath: self.path, error:nil)
+          do {
+            try fileManager.copyItemAtPath(bundle!, toPath: self.path)
+          } catch {
+            fatalError("\(error)")
+          }
         }
         
         self.data = NSMutableArray(contentsOfFile: path)
diff --git a/Framework/LTTouchID.swift b/Framework/LTTouchID.swift
index 06f3e04..43817b1 100644
--- a/Framework/LTTouchID.swift
+++ b/Framework/LTTouchID.swift
@@ -30,7 +30,7 @@ class LTTouchID {
     
     // MARK: Instance Methods
     func authorize() {
-        var context = LAContext()
+        let context = LAContext()
         var error : NSError?
         
         // Test if TouchID fingerprint authentication is available on the device and a fingerprint has been enrolled.
diff --git a/Framework/Latch.swift b/Framework/Latch.swift
index ef15694..856c178 100644
--- a/Framework/Latch.swift
+++ b/Framework/Latch.swift
@@ -16,7 +16,7 @@ public protocol LatchDelegate {
     func latchCanceled()
 }
 
-public enum LatchError: Printable {
+public enum LatchError: CustomStringConvertible {
     case TouchIDAuthFailed, TouchIDSystemCancel, TouchIDPasscodeNotSet,
     TouchIDNotAvailable, TouchIDNotEnrolled, NoAuthMethodsAvailable,
     TouchIDNotAvailablePasscodeDisabled, TouchIDCancelledPasscodeDisabled,
@@ -48,34 +48,44 @@ public enum LatchError: Printable {
 
 public class Latch: LTTouchIDDelegate, LTPasscodeDelegate {
     
-    // MARK: Instance Variables
-    public var delegate: LatchDelegate!
-    public var parentController: UIViewController!
-    public var touchReason: String = "We need to make sure it's you!"
-    public var passcodeInstruction: String = NSLocalizedString("Enter Passcode", bundle: FrameworkBundle!, comment: "")
-  public var changePasscodeInstruction: String = NSLocalizedString("Enter your old passcode", bundle: FrameworkBundle!, comment: "")
-    public var enableTouch: Bool = true
-    public var enablePasscode: Bool = true
+  // MARK: Instance Variables
+  public var delegate: LatchDelegate!
+  public var parentController: UIViewController!
+  public var touchReason: String = "We need to make sure it's you!"
+  public var passcodeInstruction: String = NSLocalizedString("Enter Passcode", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "") {
+    didSet {
+      self.passcode.instructions = self.passcodeInstruction
+    }
+  }
+  public var changePasscodeInstruction: String = NSLocalizedString("Enter your old passcode", tableName: "Latch", bundle: NSBundle(forClass: Latch.self), comment: "") {
+    didSet {
+      self.passcode.changeInstructions = self.changePasscodeInstruction
+    }
+  }
+  public var enableTouch: Bool = true
+  public var enablePasscode: Bool = true
   public var enablePasscodeChange: Bool = false
-    public var passcodeTheme: LTPasscodeTheme = LTPasscodeTheme()
+  public var passcodeTheme: LTPasscodeTheme = LTPasscodeTheme()
   
     
-    // MARK: Private Instance Variables
-    private var touchID: LTTouchID!
-    private var passcode: LTPasscode!
-    private var storage: LTStorage! = LTStorage()
+  // MARK: Private Instance Variables
+  private var touchID: LTTouchID!
+  private var passcode: LTPasscode!
+  private var storage: LTStorage! = LTStorage()
     
-    // MARK: Initializer
+  // MARK: Initializer
   public init(defaultPasscode: String? = nil) {
     // Initialize TouchID Module
     self.touchID = LTTouchID(reason: self.touchReason)
     self.touchID.delegate = self
     
     // Initialize Passcode Module
-    self.passcode = LTPasscode(instructions: self.passcodeInstruction, changeInstructions: self.changePasscodeInstruction)
+    self.passcode = LTPasscode()
     if let passcodeString = defaultPasscode {
       self.passcode.setDefaultPasscode(passcodeString)
     }
+    self.passcode.changeInstructions = self.changePasscodeInstruction
+    self.passcode.instructions = self.passcodeInstruction
     self.passcode.delegate = self
     self.passcode.theme = self.passcodeTheme
   }
diff --git a/Framework/en.lproj/Latch.strings b/Framework/en.lproj/Latch.strings
new file mode 100644
index 0000000..4784b33
--- /dev/null
+++ b/Framework/en.lproj/Latch.strings
@@ -0,0 +1,7 @@
+/* 
+  Latch.strings
+  iOS Example
+
+  Created by HuangRetso on 3/11/15.
+  Copyright (c) 2015 Brian Vallelunga. All rights reserved.
+*/
diff --git a/Framework/zh-Hant.lproj/Latch.strings b/Framework/zh-Hant.lproj/Latch.strings
new file mode 100644
index 0000000..8abe4cf
--- /dev/null
+++ b/Framework/zh-Hant.lproj/Latch.strings
@@ -0,0 +1,16 @@
+/* 
+  Latch.strings
+  iOS Example
+
+  Created by HuangRetso on 3/11/15.
+  Copyright (c) 2015 Brian Vallelunga. All rights reserved.
+*/
+
+"Change Passcode" = "變更";
+"Enter your old passcode" = "輸入舊密碼";
+"Enter your new passcode" = "輸入新密碼";
+"Re-enter your new passcode" = "重新輸入新密碼";
+"Enter Passcode" = "輸入解鎖密碼";
+"Confirm Passcode" = "重新輸入密碼";
+"Cancel" = "取消";
+"Delete" = "刪除";
\ No newline at end of file
diff --git a/Latch.podspec b/Latch.podspec
index 19dc4b3..2d0ff99 100644
--- a/Latch.podspec
+++ b/Latch.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Latch"
-  s.version      = "0.0.3"
+  s.version      = "0.0.8"
   s.summary      = "Easily use Passcode and Touch ID authentication!"
 
   s.description  = <<-DESC
@@ -23,6 +23,6 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "8.0"
   s.source       = { :git => "https://github.com/SooJuicy/Latch.git", :tag => s.version }
   s.source_files  = "Framework/*.swift"
-  s.resources = "Framework/*.png", "Framework/*.{xib}"
+  s.resources = "Framework/*.png", "Framework/*.{xib}", "Framework/*.lproj"
   s.requires_arc = true
 end
diff --git a/Latch/Latch.xcodeproj/project.pbxproj b/Latch/Latch.xcodeproj/project.pbxproj
index 6d590fa..212b079 100644
--- a/Latch/Latch.xcodeproj/project.pbxproj
+++ b/Latch/Latch.xcodeproj/project.pbxproj
@@ -198,6 +198,7 @@
 		F22A06AA1A70D0E900484CFA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = "Brian Vallelunga";
 				TargetAttributes = {
diff --git a/README.md b/README.md
index 887517e..de58f41 100644
--- a/README.md
+++ b/README.md
@@ -15,25 +15,37 @@ Latch
 
 [![Latch](https://github.com/bvallelunga/latch/raw/master/screenshot.png)](https://www.youtube.com/watch?v=HjNdyExQf8A)
 
-Install
-========
+Installation
+------------
 
-1) Copy `Framework` folder into your project
+### For iOS 7
 
-2) Change `Latch.LTPasscode.xib` to `<module>.LTPasscode.xib`
+Copy `Framework` folder into your project
+
+### CocoaPods (iOS 8 and later)
+
+Add the following lines to your Podfile
+```
+pod 'Latch', :git => "https://github.com/SooJuicy/Latch.git"
+```
 
 Configure ([Example](https://github.com/JuicyApp/Latch/blob/master/Example/Latch/ViewController.swift))
-===========
+------------
 
 1) Create Latch in View Controller 
 ``` swift
 self.latch = Latch()
+self.latch = Latch(defaultPasscode: "0000") // Set default as given string
 self.latch.delegate = self // Make sure to add LatchDelegate to Class
 self.latch.parentController = self
 ```
 
 2) Add Delegate Methods
 ``` swift
+func latchCanceled() {
+    println("canceled")
+}
+
 func latchGranted() {
     println("access granged")
 }
@@ -51,6 +63,7 @@ func latchDenied(reason: LatchError) {
 ``` swift
 self.latch.touchReason = "We need to make sure it's you!"
 self.latch.passcodeInstruction = "Enter Passcode"
+self.latch.changePasscodeInstruction = "Enter your old passcode"
 ```
 
 4) Customize Theme (Optional)
@@ -60,8 +73,9 @@ self.latch.passcodeTheme.logoTint = nil
 self.latch.passcodeTheme.instructions = UIColor(red:0.96, green:0.33, blue:0.24, alpha:1)
 
 //Passcode theme options
+
 struct LTPasscodeTheme {
-    var logo: UIImage = UIImage(named: "Latch")!
+    var logo: UIImage = UIImage(contentsOfFile: LTBundle.pathForResource("Latch", ofType: "png")!)!
     var logoTint: UIColor! = UIColor(red:0.12, green:0.67, blue:0.95, alpha:1)
     var logoErrorTint: UIColor = UIColor.redColor()
    
@@ -92,10 +106,11 @@ struct LTPasscodeTheme {
 ``` swift
 self.latch.enableTouch = true // True by default 
 self.latch.enablePasscode = true // True by default 
+self.latch.enablePasscodeChange = true // False by default
 ```
 
 Usage
-========
+------------
 
 **Set Passcode**: `self.latch.updatePasscode()`