     //==========================================================================================================
     
     public class func alert(title: String) -> UIAlertController {
-        return alert(title, message: "")
+        return alert(title: title, message: "")
+    }
+	
+    public class func alert(title: String, message: String) -> UIAlertController {
+        return alert(title: title, message: message, acceptMessage: "OK", acceptBlock: { 
+			// Do nothing
+		})
     }
     
-    public class func alert(title: String, message: String) -> UIAlertController {
-        return alert(title, message: message, acceptMessage: "OK") { () -> () in
-            // Do nothing
-        }
-    }
-    
-    public class func alert(title: String, message: String, acceptMessage: String, acceptBlock: () -> ()) -> UIAlertController {
-        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.Alert)
-        let acceptButton = UIAlertAction(title: acceptMessage, style: .Default, handler: { (action: UIAlertAction) in
+    public class func alert(title: String, message: String, acceptMessage: String, acceptBlock: @escaping () -> ()) -> UIAlertController {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.alert)
+        let acceptButton = UIAlertAction(title: acceptMessage, style: .default, handler: { (action: UIAlertAction) in
             acceptBlock()
         })
         alert.addAction(acceptButton)
         
-        instance.topMostController()?.presentViewController(alert, animated: true, completion: nil)
+        instance.topMostController()?.present(alert, animated: true, completion: nil)
         return alert
     }
     
     public class func alert(title: String, message: String, buttons:[String], tapBlock:((UIAlertAction,Int) -> Void)?) -> UIAlertController{
-        let alert = UIAlertController(title: title, message: message, preferredStyle: .Alert, buttons: buttons, tapBlock: tapBlock)
-        instance.topMostController()?.presentViewController(alert, animated: true, completion: nil)
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert, buttons: buttons, tapBlock: tapBlock)
+        instance.topMostController()?.present(alert, animated: true, completion: nil)
         return alert
     }
     
     public class func actionSheet(title: String, message: String, sourceView: UIView, actions: [UIAlertAction]) -> UIAlertController {
-        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.ActionSheet)
+        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.actionSheet)
         for action in actions {
             alert.addAction(action)
         }
         alert.popoverPresentationController?.sourceView = sourceView
         alert.popoverPresentationController?.sourceRect = sourceView.bounds
-        instance.topMostController()?.presentViewController(alert, animated: true, completion: nil)
+        instance.topMostController()?.present(alert, animated: true, completion: nil)
         return alert
     }
     
     public class func actionSheet(title: String, message: String, sourceView: UIView, buttons:[String], tapBlock:((UIAlertAction,Int) -> Void)?) -> UIAlertController{
-        let alert = UIAlertController(title: title, message: message, preferredStyle: .ActionSheet, buttons: buttons, tapBlock: tapBlock)
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .actionSheet, buttons: buttons, tapBlock: tapBlock)
         alert.popoverPresentationController?.sourceView = sourceView
         alert.popoverPresentationController?.sourceRect = sourceView.bounds
-        instance.topMostController()?.presentViewController(alert, animated: true, completion: nil)
+        instance.topMostController()?.present(alert, animated: true, completion: nil)
         return alert
     }
     

    
    private func topMostController() -> UIViewController? {
        
        var presentedVC = UIApplication.sharedApplication().keyWindow?.rootViewController
        while let pVC = presentedVC?.presentedViewController
        {
            presentedVC = pVC

        self.init(title: title, message: message, preferredStyle:preferredStyle)
        var buttonIndex = 0
        for buttonTitle in buttons {
            let action = UIAlertAction(title: buttonTitle, preferredStyle: .default, buttonIndex: buttonIndex, tapBlock: tapBlock)
            buttonIndex += 1
            self.addAction(action)
        }
