diff --git a/PasscodeLock/PasscodeLockPresenter.swift b/PasscodeLock/PasscodeLockPresenter.swift
index cb7018a2..3710c484 100644
--- a/PasscodeLock/PasscodeLockPresenter.swift
+++ b/PasscodeLock/PasscodeLockPresenter.swift
@@ -58,7 +58,7 @@ open class PasscodeLockPresenter {
         
         let window = UIWindow(frame: UIScreen.main.bounds)
         
-        window.windowLevel = 0
+        window.windowLevel = UIWindowLevelNormal
         window.makeKeyAndVisible()
         
         return window
@@ -122,8 +122,9 @@ open class PasscodeLockPresenter {
             
         } else {
             
-            passcodeLockWindow.windowLevel = 0
+            passcodeLockWindow.windowLevel = UIWindowLevelNormal
             passcodeLockWindow.rootViewController = nil
+			passcodeLockWindow.isHidden = true
         }
     }
     
@@ -141,8 +142,9 @@ open class PasscodeLockPresenter {
             },
             completion: { [weak self] _ in
                 
-                self?.passcodeLockWindow.windowLevel = 0
+                self?.passcodeLockWindow.windowLevel = UIWindowLevelNormal
                 self?.passcodeLockWindow.rootViewController = nil
+				self?.passcodeLockWindow.isHidden = true
                 self?.passcodeLockWindow.alpha = 1
             }
         )
diff --git a/SMFPasscodeLock.podspec b/SMFPasscodeLock.podspec
index 803339c9..c9f5c05e 100755
--- a/SMFPasscodeLock.podspec
+++ b/SMFPasscodeLock.podspec
@@ -8,11 +8,11 @@
 
 Pod::Spec.new do |s|
 	s.name = 'SMFPasscodeLock'
-	s.version = '2.0.1'
+	s.version = '2.1.0'
 	s.license = { :type => "MIT", :file => 'LICENSE.txt' }
 	s.summary = 'SMF Fork of PasscodeLock: An iOS passcode lock with Touch ID authentication written in Swift.'
 	s.homepage = 'https://github.com/smartmobilefactory/SwiftPasscodeLock'
-	s.source = { :git => 'https://github.com/smartmobilefactory/SwiftPasscodeLock.git', :tag => "versions/#{s.version}" }
+	s.source = { :git => 'https://github.com/smartmobilefactory/SwiftPasscodeLock.git', :tag => "releases/#{s.version}" }
 	s.authors = [{ 'Ramiro Ramirez' => '' }, { 'Yanko Dimitrov' => '' }, { 'Hans Seiffert' => '' }]
 
 	s.ios.deployment_target = '8.0'