             viewController = self.window.rootViewController!
         }
 
-        let isIOS7 = floor(NSFoundationVersionNumber) <= floor(NSFoundationVersionNumber_iOS_7_1)
+        var popover = self.popoverPresentationController
+        popover?.delegate = self
+        popover?.sourceView = sourceView
+        popover?.sourceRect = sourceRect
 
-        if isIOS7 {
-            self.ios7Popover = UIPopoverController(contentViewController: self)
-            self.ios7Popover!.presentPopoverFromRect(sourceRect, inView: sourceView, permittedArrowDirections: UIPopoverArrowDirection.Any, animated: true)
-        }
-        else {
-            var popover = self.popoverPresentationController
-            popover?.delegate = self
-            popover?.sourceView = sourceView
-            popover?.sourceRect = sourceRect
-
-            viewController!.presentViewController(self, animated: true, completion: { () -> Void in
-                // nothing here
-            })
-        }
+        viewController!.presentViewController(self, animated: true, completion: { () -> Void in
+            // nothing here
+        })
     }
 
     /**

import Foundation
import UIKit

public class BMPickerModal: UIViewController, UIPopoverPresentationControllerDelegate, UIPickerViewDataSource, UIPickerViewDelegate {

    public enum BMPickerModalMode {
        case DatePicker
        case Picker
    }

    /// Closure to be executed when new date is selected
    public var selectionClosure: ((AnyObject) -> Void)?


    private let window: UIWindow = UIApplication.sharedApplication().windows[0] as! UIWindow
    private let popoverSize: CGSize = CGSizeMake(460, 261)

    // MARK: View Life Cycle

