diff --git a/Example/media/fullActionSheet.gif b/Example/media/fullActionSheet.gif
deleted file mode 100755
index c470828..0000000
Binary files a/Example/media/fullActionSheet.gif and /dev/null differ
diff --git a/Example/xcode projects/MSActionSheet.xcodeproj/project.pbxproj b/Example/xcode projects/MSActionSheet.xcodeproj/project.pbxproj
index bb2a929..4a153eb 100755
--- a/Example/xcode projects/MSActionSheet.xcodeproj/project.pbxproj	
+++ b/Example/xcode projects/MSActionSheet.xcodeproj/project.pbxproj	
@@ -10,7 +10,6 @@
 		E13C608E1E982AB600FE6DB9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E13C608D1E982AB600FE6DB9 /* AppDelegate.swift */; };
 		E13C60901E982AB600FE6DB9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E13C608F1E982AB600FE6DB9 /* ViewController.swift */; };
 		E13C60931E982AB600FE6DB9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E13C60911E982AB600FE6DB9 /* Main.storyboard */; };
-		E13C60961E982AB600FE6DB9 /* MSActionSheet.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E13C60941E982AB600FE6DB9 /* MSActionSheet.xcdatamodeld */; };
 		E13C609B1E982AB600FE6DB9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E13C60991E982AB600FE6DB9 /* LaunchScreen.storyboard */; };
 		E1CD4FFE1E98CDEA006FB0CE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E1CD4FFC1E98CDEA006FB0CE /* Assets.xcassets */; };
 		E1CD4FFF1E98CDEA006FB0CE /* MSActionSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1CD4FFD1E98CDEA006FB0CE /* MSActionSheet.swift */; };
@@ -21,7 +20,6 @@
 		E13C608D1E982AB600FE6DB9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		E13C608F1E982AB600FE6DB9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		E13C60921E982AB600FE6DB9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		E13C60951E982AB600FE6DB9 /* MSActionSheet.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MSActionSheet.xcdatamodel; sourceTree = "<group>"; };
 		E13C609A1E982AB600FE6DB9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		E13C609C1E982AB600FE6DB9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E1CD4FFC1E98CDEA006FB0CE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -65,7 +63,6 @@
 				E13C60911E982AB600FE6DB9 /* Main.storyboard */,
 				E13C60991E982AB600FE6DB9 /* LaunchScreen.storyboard */,
 				E13C609C1E982AB600FE6DB9 /* Info.plist */,
-				E13C60941E982AB600FE6DB9 /* MSActionSheet.xcdatamodeld */,
 			);
 			path = MSActionSheet;
 			sourceTree = "<group>";
@@ -97,12 +94,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Maor Shams";
 				TargetAttributes = {
 					E13C60891E982AB600FE6DB9 = {
 						CreatedOnToolsVersion = 8.3;
-						DevelopmentTeam = LE75NS246X;
+						DevelopmentTeam = FPKJ9P7BGC;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -146,7 +144,6 @@
 				E13C60901E982AB600FE6DB9 /* ViewController.swift in Sources */,
 				E1CD4FFF1E98CDEA006FB0CE /* MSActionSheet.swift in Sources */,
 				E13C608E1E982AB600FE6DB9 /* AppDelegate.swift in Sources */,
-				E13C60961E982AB600FE6DB9 /* MSActionSheet.xcdatamodeld in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -182,7 +179,9 @@
 				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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -190,7 +189,11 @@
 				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_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;
@@ -233,7 +236,9 @@
 				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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -241,7 +246,11 @@
 				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_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;
@@ -271,12 +280,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = LE75NS246X;
+				DEVELOPMENT_TEAM = FPKJ9P7BGC;
 				INFOPLIST_FILE = MSActionSheet/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = maor.MSActionSheet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -284,12 +295,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = LE75NS246X;
+				DEVELOPMENT_TEAM = FPKJ9P7BGC;
 				INFOPLIST_FILE = MSActionSheet/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = maor.MSActionSheet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -315,19 +328,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCVersionGroup section */
-		E13C60941E982AB600FE6DB9 /* MSActionSheet.xcdatamodeld */ = {
-			isa = XCVersionGroup;
-			children = (
-				E13C60951E982AB600FE6DB9 /* MSActionSheet.xcdatamodel */,
-			);
-			currentVersion = E13C60951E982AB600FE6DB9 /* MSActionSheet.xcdatamodel */;
-			path = MSActionSheet.xcdatamodeld;
-			sourceTree = "<group>";
-			versionGroupType = wrapper.xcdatamodel;
-		};
-/* End XCVersionGroup section */
 	};
 	rootObject = E13C60821E982AB600FE6DB9 /* Project object */;
 }
diff --git a/Example/xcode projects/MSActionSheet.xcodeproj/project.xcworkspace/xcuserdata/maor_shamsian.xcuserdatad/UserInterfaceState.xcuserstate b/Example/xcode projects/MSActionSheet.xcodeproj/project.xcworkspace/xcuserdata/maor_shamsian.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..238d52b
Binary files /dev/null and b/Example/xcode projects/MSActionSheet.xcodeproj/project.xcworkspace/xcuserdata/maor_shamsian.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Example/xcode projects/MSActionSheet.xcodeproj/xcuserdata/maor_shamsian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Example/xcode projects/MSActionSheet.xcodeproj/xcuserdata/maor_shamsian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..4175c70
--- /dev/null
+++ b/Example/xcode projects/MSActionSheet.xcodeproj/xcuserdata/maor_shamsian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "MSActionSheet/ViewController.swift"
+            timestampString = "531165326.469337"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "16"
+            endingLineNumber = "16"
+            landmarkName = "selectImageAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>
diff --git a/Example/xcode projects/MSActionSheet.xcodeproj/xcuserdata/maor_shamsian.xcuserdatad/xcschemes/xcschememanagement.plist b/Example/xcode projects/MSActionSheet.xcodeproj/xcuserdata/maor_shamsian.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..999fe58
--- /dev/null
+++ b/Example/xcode projects/MSActionSheet.xcodeproj/xcuserdata/maor_shamsian.xcuserdatad/xcschemes/xcschememanagement.plist	
@@ -0,0 +1,14 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>MSActionSheet.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Example/xcode projects/MSActionSheet/AppDelegate.swift b/Example/xcode projects/MSActionSheet/AppDelegate.swift
index 55f4d90..1f29775 100755
--- a/Example/xcode projects/MSActionSheet/AppDelegate.swift	
+++ b/Example/xcode projects/MSActionSheet/AppDelegate.swift	
@@ -41,53 +41,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
         // Saves changes in the application's managed object context before the application terminates.
-        self.saveContext()
-    }
-
-    // MARK: - Core Data stack
-
-    lazy var persistentContainer: NSPersistentContainer = {
-        /*
-         The persistent container for the application. This implementation
-         creates and returns a container, having loaded the store for the
-         application to it. This property is optional since there are legitimate
-         error conditions that could cause the creation of the store to fail.
-        */
-        let container = NSPersistentContainer(name: "MSActionSheet")
-        container.loadPersistentStores(completionHandler: { (storeDescription, error) in
-            if let error = error as NSError? {
-                // Replace this implementation with code to handle the error appropriately.
-                // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-                 
-                /*
-                 Typical reasons for an error here include:
-                 * The parent directory does not exist, cannot be created, or disallows writing.
-                 * The persistent store is not accessible, due to permissions or data protection when the device is locked.
-                 * The device is out of space.
-                 * The store could not be migrated to the current model version.
-                 Check the error message to determine what the actual problem was.
-                 */
-                fatalError("Unresolved error \(error), \(error.userInfo)")
-            }
-        })
-        return container
-    }()
-
-    // MARK: - Core Data Saving support
-
-    func saveContext () {
-        let context = persistentContainer.viewContext
-        if context.hasChanges {
-            do {
-                try context.save()
-            } catch {
-                // Replace this implementation with code to handle the error appropriately.
-                // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-                let nserror = error as NSError
-                fatalError("Unresolved error \(nserror), \(nserror.userInfo)")
-            }
-        }
     }
 
+    
 }
 
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/xcode projects/MSActionSheet/Assets.xcassets/AppIcon.appiconset/Contents.json
index b8236c6..19882d5 100755
--- a/Example/xcode projects/MSActionSheet/Assets.xcassets/AppIcon.appiconset/Contents.json	
+++ b/Example/xcode projects/MSActionSheet/Assets.xcassets/AppIcon.appiconset/Contents.json	
@@ -39,6 +39,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Compact Camera_000000_32.png b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Compact Camera_000000_32.png
new file mode 100644
index 0000000..6cedcc5
Binary files /dev/null and b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Compact Camera_000000_32.png differ
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Compact Camera_000000_50.png b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Compact Camera_000000_50.png
new file mode 100644
index 0000000..57748ed
Binary files /dev/null and b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Compact Camera_000000_50.png differ
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Contents.json b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Contents.json
new file mode 100644
index 0000000..cc8ddb2
--- /dev/null
+++ b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_camera.imageset/Contents.json	
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Compact Camera_000000_32.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Compact Camera_000000_50.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Contents.json b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Contents.json
new file mode 100644
index 0000000..e2f8b98
--- /dev/null
+++ b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Contents.json	
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Xlarge Icons_000000_32.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Xlarge Icons_000000_50.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Xlarge Icons_000000_32.png b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Xlarge Icons_000000_32.png
new file mode 100644
index 0000000..3cf0e26
Binary files /dev/null and b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Xlarge Icons_000000_32.png differ
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Xlarge Icons_000000_50.png b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Xlarge Icons_000000_50.png
new file mode 100644
index 0000000..e6e7659
Binary files /dev/null and b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_gallery.imageset/Xlarge Icons_000000_50.png differ
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Contents.json b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Contents.json
new file mode 100644
index 0000000..f18eb25
--- /dev/null
+++ b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Contents.json	
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Selfie_000000_32.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Selfie_000000_50.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Selfie_000000_32.png b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Selfie_000000_32.png
new file mode 100644
index 0000000..ebe341f
Binary files /dev/null and b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Selfie_000000_32.png differ
diff --git a/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Selfie_000000_50.png b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Selfie_000000_50.png
new file mode 100644
index 0000000..bce93ec
Binary files /dev/null and b/Example/xcode projects/MSActionSheet/Assets.xcassets/msactionsheet_selfie.imageset/Selfie_000000_50.png differ
diff --git a/Example/xcode projects/MSActionSheet/Base.lproj/Main.storyboard b/Example/xcode projects/MSActionSheet/Base.lproj/Main.storyboard
index b69164a..0677fc2 100755
--- a/Example/xcode projects/MSActionSheet/Base.lproj/Main.storyboard	
+++ b/Example/xcode projects/MSActionSheet/Base.lproj/Main.storyboard	
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16A313a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -22,13 +24,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qta-wc-joH">
-                                <rect key="frame" x="12.5" y="158" width="350" height="350"/>
+                                <rect key="frame" x="57" y="202" width="262.5" height="262.5"/>
+                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="350" id="L2u-CY-bMd"/>
-                                    <constraint firstAttribute="height" constant="350" id="MDr-aV-bus"/>
+                                    <constraint firstAttribute="width" secondItem="Qta-wc-joH" secondAttribute="height" multiplier="1:1" id="8jt-Kt-fYE"/>
                                 </constraints>
                                 <state key="normal" title="Select picture">
-                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleColor" red="0.0" green="0.58980089430000004" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="selectImageAction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="vg6-yZ-1M4"/>
@@ -37,8 +39,9 @@
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="Qta-wc-joH" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="34h-1P-GkN"/>
-                            <constraint firstItem="Qta-wc-joH" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="5wB-8p-E2b"/>
+                            <constraint firstItem="Qta-wc-joH" firstAttribute="width" secondItem="8bC-Xf-vdC" secondAttribute="width" multiplier="0.7" id="Pt1-Dm-h7R"/>
+                            <constraint firstItem="Qta-wc-joH" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="UAQ-Qn-App"/>
+                            <constraint firstItem="Qta-wc-joH" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="uwg-BJ-VK5"/>
                         </constraints>
                     </view>
                 </viewController>
diff --git a/Example/xcode projects/MSActionSheet/MSActionSheet.swift b/Example/xcode projects/MSActionSheet/MSActionSheet.swift
index e791719..8ea065e 100755
--- a/Example/xcode projects/MSActionSheet/MSActionSheet.swift	
+++ b/Example/xcode projects/MSActionSheet/MSActionSheet.swift	
@@ -1,222 +1,244 @@
 //
 //  MSActionSheet.swift
-//  Version 1.2
+//  Version 1.3
 //  Created by Maor Shams on 07/04/2017.
 //  Copyright © 2017 Maor Shams. All rights reserved.
 //
 import UIKit
 import MobileCoreServices
 
-class MSActionSheet: UIAlertController,  UIImagePickerControllerDelegate, UINavigationControllerDelegate  {
+class MSActionSheet: UIAlertController {
     
-    fileprivate static var sheet : UIAlertController?
-    static let instance = MSActionSheet()
-    
-    var clientVC : UIViewController?
+    // preferredStyle is a read-only property, so you have to override it
+    override var preferredStyle: UIAlertControllerStyle {
+        return .actionSheet
+    }
     
-    // Button names
-    fileprivate var library = "Photo Library"
-    fileprivate var frontCamera = "Front Camera"
-    fileprivate var rearCamera = "Rear Camera"
-    fileprivate var cancel = "Cancel"
+    init() {
+        super.init(nibName: nil, bundle: nil)
+        initialize()
+    }
     
-    /// Create Full ActionSheet
-    /// - parameters:
-    ///   - vc: The view controller to show the ActionSheet at
-    ///   - handler: The function that  will execute after the user took the image, also you get the optional UIImage
-    func showFullActionSheet(on vc : UIViewController,handler : @escaping (_ : UIImage?) -> Void) {
-        let sheet = create().addLibrary().addFrontCamera().addRearCamera().addCancelButton()
-        sheet.show(on: vc){ (image : UIImage?) in
-              handler(image)
-        }
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        initialize()
     }
     
+    convenience init(viewController : UIViewController, sourceView : UIView, title: String? = nil, message: String? = nil) {
+        self.init()
+        initialize(viewController: viewController,sourceView: sourceView, title: title, message: message)
+    }
     
-    /// Create new ActionSheet
-    /// - parameters:
-    ///   - title: (_optional_) - A title for the ActionSheet, by default does not contain title
-    ///   - message: (_optional_) - A message for the ActionSheet, by default does not contain title
-    func create(title: String = "", message: String = "") -> MSActionSheet {
-        if title.isEmpty && message.isEmpty{
-            MSActionSheet.sheet = UIAlertController()
-        }else{
-            MSActionSheet.sheet = UIAlertController(title: title, message: message, preferredStyle: .actionSheet)
+    // Configuration for actionsheet
+    private func initialize(viewController : UIViewController? = nil,
+                            sourceView : UIView? = nil,
+                            title: String? = nil,
+                            message: String? = nil) {
+        
+        if let title = title, let message = message {
+            self.title = title
+            self.message = message
         }
-        return self
+        
+        let rootVC = UIApplication.shared.keyWindow?.rootViewController
+        currentvViewController = (viewController == nil) ? rootVC : viewController
+        self.sourceView = sourceView
     }
     
-    /// Presents Library button in ActionSheet
+    private var currentvViewController : UIViewController?
+    private var onFinishPicking : ((_ : UIImage?) -> Void)?
+    private var sourceView : UIView?
+    
+    
+    /// Create Full ActionSheet include library, front camera, rear camera, cancel button and default images.
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Photo Library"
-    ///   - destructive : (_optional_) - Apply destructive style for this action
-    ///   - image: (_optional_) - Custom image for button, by default the image is "msactionsheet_library" from assets
-    func addLibrary(title : String = "Photo Library",destructive style : Bool = false ,  image : UIImage? = nil) -> MSActionSheet{
-        library = title
-        let libraryAction = UIAlertAction(title: library, style : isDestructive(style), handler: handler)
-        
-        if let img : UIImage = image{ // client select different image
-            libraryAction.image = img
-        }else{
-            if let img = UIImage(named: "msactionsheet_library") { //the image exists..
-                libraryAction.image = img
-            }
-        }
-        MSActionSheet.sheet?.addAction(libraryAction)
-        return self
+    ///   - completion: Execute after the user took the image, returns optional UIImage, returns nil if the user did not select
+    func showFullActionSheet(completion : @escaping (_ : UIImage?) -> Void) {
+             add(.library, defaultImage : true)
+            .add(.frontCamera, defaultImage : true)
+            .add(.rearCamera, defaultImage : true)
+            .add(.cancel)
+            .show(completion: completion)
     }
     
-    /// Presents Front Camera button in ActionSheet
+    /// Add new alert action to the action sheet.
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Front Camera"
-    ///   - destructive : (_optional_) - Apply destructive style for this action
-    ///   - image: (_optional_) - Custom image for button, by default the image is "msactionsheet_frontCam" from assets
-    func addFrontCamera(title : String = "Front Camera",destructive style : Bool = false, image : UIImage? = nil) -> MSActionSheet{
-        guard UIImagePickerController.isCameraDeviceAvailable(.front) else {
-            return self
-        }
+    ///   - type: - The type of the alert action
+    ///   - title: (_optional_) - The title of the alert action, by default the values from MSActionsSheet.ActionType
+    ///   - style: (_optional_) - The style of the alert action, by default the value is .default. If the type of the action sheet is .cancel, and the style is nil, the style will set as .cancel
+    ///   - image: (_optional_) - The image of the alert action, by default nil (no image)
+    ///   - defaultImage: (_optional_) - The default image based on the type from MSActionsSheet.ActionType
+    
+    func add(_ type : ActionType,
+             title : String? = nil,
+             style : UIAlertActionStyle? = nil,
+             image : UIImage? = nil,
+             defaultImage : Bool = false) -> MSActionSheet{
         
-        frontCamera = title
-        let frontCamAction = UIAlertAction(title: frontCamera, style: isDestructive(style), handler: handler)
+        let newTitle : String = (title == nil) ? type.title : title!
+        let newImage : UIImage? = defaultImage == true ? type.image : image
+        let newStyle : UIAlertActionStyle = (type == .cancel && style == nil) ? .cancel : style == nil ? .default : style!
         
-        if let img : UIImage = image{ // client select different image
-            frontCamAction.image = img
-        }else{
-            if let img = UIImage(named: "msactionsheet_frontCam") { //the image exists..
-                frontCamAction.image = img
-            }
-        }
-        MSActionSheet.sheet?.addAction(frontCamAction)
-        return self
+        let action = MSActionSheetAction(actionTitle: newTitle,
+                                         style: newStyle,
+                                         image: newImage,
+                                         actionType: type,
+                                         handler: actionSheetAction)
         
+        return self.add(action: action)
     }
     
-    /// Presents Rear Camera button in ActionSheet
+    /// Add new custom action to the action sheet.
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Rear Camera"
-    ///   - destructive : (_optional_) - Apply destructive style for this action
-    ///   - image: (_optional_) - Custom image for button, by default the image is "msactionsheet_rearCam" from assets
-    func addRearCamera(title : String = "Rear Camera", destructive style : Bool = false , image : UIImage? = nil) -> MSActionSheet{
-        guard UIImagePickerController.isCameraDeviceAvailable(.rear) else {
-            return self
-        }
-        
-        self.rearCamera = title
-        let rearCamAction = UIAlertAction(title: rearCamera, style: isDestructive(style), handler: handler)
+    ///   - title: (_optional_) - A title for the action
+    ///   - isDestructive: (_optional_) - set destructive style, false by default
+    ///   - image: (_optional_) - Custom image for the action, No image by default
+    ///   - handler: when the user click on the button
+    func addCustom(title : String,
+                         isDestructive : Bool = false,
+                         image : UIImage? = nil,
+                         handler : @escaping ()->Void) -> MSActionSheet{
         
-        if let img : UIImage = image{ // client select different image
-            rearCamAction.image = img
-        }else{
-            if let img = UIImage(named: "msactionsheet_rearCam") { //the image exists..
-                rearCamAction.image = img
-            }
+        let customButtonAction = MSActionSheetAction(actionTitle: title, style: self.isDestructive(isDestructive), image: image) { _ in
+            handler()
         }
-        MSActionSheet.sheet?.addAction(rearCamAction)
-        return self
+        return self.add(action: customButtonAction)
     }
     
     
-    /// Presents Cancel button in ActionSheet
+    /// Set color for ActionSheet
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Cancel"
-    func addCancelButton(title : String = "Cancel") -> MSActionSheet{
-        cancel = title
-        MSActionSheet.sheet?.addAction(UIAlertAction(title: cancel, style: .cancel, handler: nil))
+    ///   - color: The tint color of the actionsheet
+    func setTint(color : UIColor) -> MSActionSheet{
+        self.view.tintColor = color
         return self
     }
     
     
-    /// Presents the builded ActionSheet on passed view controller.
+    /// Presents the ActionSheet on the view controller.
     /// (Make sure this is the last method called!)
     /// - parameters:
-    ///   - vc: The view controller to show the ActionSheet at
-    func show(on vc : UIViewController, onFinishPicking  handler: @escaping (_ : UIImage?) -> Swift.Void){
-        self.handler = handler
-        clientVC = vc
-        vc.present(MSActionSheet.sheet!, animated: true, completion: nil)
+    ///   - completion: (_optional UIImage_) The selected image, nil if the user did not select
+    func show(completion: @escaping (UIImage?) -> Void){
+        self.onFinishPicking = completion
+        
+        if UIDevice.current.userInterfaceIdiom == .pad, let source = sourceView{
+            self.popoverPresentationController?.sourceView = source
+            self.popoverPresentationController?.sourceRect = source.bounds
+        }
+        
+        currentvViewController?.present(self, animated: true, completion: nil)
     }
     
     
-    fileprivate func handler(_ action : UIAlertAction){
+    private func actionSheetAction(_ action : UIAlertAction){
+        
+        guard let action = action as? MSActionSheetAction else {
+            return
+        }
         
         let picker = UIImagePickerController()
         picker.delegate = self
         picker.allowsEditing = true
         picker.mediaTypes = [kUTTypeImage as String]
         
-        switch action.title ?? "" {
-        case library:
+        switch action.type! {
+        case ActionType.library:
             picker.sourceType = .photoLibrary
-        case rearCamera:
+        case ActionType.rearCamera:
             picker.sourceType = .camera
             picker.cameraDevice = .rear
             picker.showsCameraControls = true
-        case frontCamera:
+        case ActionType.frontCamera:
             picker.sourceType = .camera
             picker.cameraDevice = .front
             picker.showsCameraControls = true
         default: return
         }
         
-        clientVC?.present(picker, animated: true, completion: nil)
+        if UIDevice.current.userInterfaceIdiom == .pad, let source = sourceView{
+            self.popoverPresentationController?.sourceView = source
+            self.popoverPresentationController?.sourceRect = source.bounds
+        }
+        
+        currentvViewController?.present(picker, animated: true, completion: nil)
+        
     }
     
-    fileprivate var img : UIImage?
+    private func add(action: MSActionSheetAction) -> MSActionSheet{
+        self.addAction(action)
+        return self
+    }
     
-    /// Get the selected image by the user
-    /// (Make sure this method called inside the onFinishPicking()  method or inside showFullActionSheet() handler)
-    func getImage() -> UIImage?{
-        return img ?? nil
+    private func isDestructive(_ destructive : Bool) -> UIAlertActionStyle {
+        return destructive ? .destructive : .default
     }
     
+}
+extension MSActionSheet: UIImagePickerControllerDelegate, UINavigationControllerDelegate{
+    
     // get info about selected image when finish picking
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
         // dismiss picker
-        picker.dismiss(animated: true, completion: nil)
-        
-        
-        // get image
-        if let image = info[UIImagePickerControllerEditedImage] as? UIImage{
-            img = image
-            handler!(image)
+        picker.dismiss(animated: true) { [weak self] in
+            // get image
+            if let image = info[UIImagePickerControllerEditedImage] as? UIImage{
+                self?.onFinishPicking?(image)
+            }
         }
-        
-        reset()
     }
     
-    fileprivate var handler : ((_ : UIImage?) -> Void)?
-    
-  /*  /// Event will execute after the user took the image
-    /// - parameters:
-    ///   - handler: The function that  will execute after the user took the image
-    func onFinishPicking(handler : @escaping (_ : UIImage?) -> Swift.Void){
-        self.handler = handler
-    }*/
-    
-    /// Set color for ActionSheet
-    /// - parameters:
-    ///   - color: The color for actionsheet
-    func tintColor(color : UIColor) -> MSActionSheet{
-        MSActionSheet.sheet?.view.tintColor = color
-        return self
+    func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
+        picker.dismiss(animated: true) { [weak self] in
+            self?.onFinishPicking?(nil)
+        }
     }
+}
+
+
+extension MSActionSheet{
     
-    
-    fileprivate func isDestructive(_ destructive : Bool) -> UIAlertActionStyle {
-        return destructive ? .destructive : .default
+    enum ActionType {
+        case library
+        case frontCamera
+        case rearCamera
+        case cancel
+        
+        var title : String{
+            switch self {
+            case .library     : return "Photo Library"
+            case .frontCamera : return "Front Camera"
+            case .rearCamera  : return "Rear Camera"
+            case .cancel      : return "Cancel"
+            }
+        }
+        
+        var image : UIImage?{
+            switch self {
+            case .library     : return #imageLiteral(resourceName: "msactionsheet_library")
+            case .frontCamera : return #imageLiteral(resourceName: "msactionsheet_frontcam")
+            case .rearCamera  : return #imageLiteral(resourceName: "msactionsheet_rearcam")
+            case .cancel      : return nil
+            }
+        }
+        
     }
     
-    fileprivate func reset(){
-        handler = nil
-        img = nil
-        clientVC = nil
-        MSActionSheet.sheet = nil
-    }
 }
 
-extension UIAlertAction{
-    @NSManaged var image : UIImage?
-    convenience init(title: String?,style: UIAlertActionStyle,image : UIImage?, handler: ((UIAlertAction) -> Void)? = nil ){
-        self.init(title: title, style: style, handler: handler)
-        self.image = image
+class MSActionSheetAction : UIAlertAction{
+    
+    var type : MSActionSheet.ActionType?
+    
+    convenience init(actionTitle: String,
+                     style: UIAlertActionStyle,
+                     image : UIImage? = nil,
+                     actionType : MSActionSheet.ActionType? = nil,
+                     handler: @escaping ((UIAlertAction) -> Void) ){
+        
+        self.init(title: actionTitle, style: style, handler: handler)
+        
+        self.setValue(image, forKey: "image")
+        self.type = actionType
     }
 }
diff --git a/Example/xcode projects/MSActionSheet/ViewController.swift b/Example/xcode projects/MSActionSheet/ViewController.swift
index f75b0bb..6415f00 100755
--- a/Example/xcode projects/MSActionSheet/ViewController.swift	
+++ b/Example/xcode projects/MSActionSheet/ViewController.swift	
@@ -12,20 +12,57 @@ class ViewController: UIViewController {
     
     @IBAction func selectImageAction(_ sender: UIButton) {
         
-        MSActionSheet.instance.showFullActionSheet(on: self){ (image) in
-            sender.setImage(image, for: .normal)
+        // Example 1 - Show full actionsheet, include library, front camera, rear camera
+        
+        MSActionSheet(viewController: self, sourceView: sender).showFullActionSheet {
+            sender.setImage($0, for: .normal)
         }
         
+        //  Example 2 - Create custom actionsheet with default params
         
-       /*
-        let sheet = MSActionSheet.instance
-        sheet.create()
-            .addCancelButton()
-            .addLibrary()
-            .addFrontCamera()
-            .addRearCamera().show(on: self) { (image) in
-                sender.setImage(image, for: .normal)
-        }
+        /*
+         
+         MSActionSheet(viewController: self, sourceView: sender)
+         .add(.cancel)
+         .add(.library)
+         .add(.rearCamera)
+         .add(.frontCamera).show {
+         sender.setImage($0, for: .normal)
+         }
+         
+         */
+        
+        //  Example 3 - Create custom actionsheet with custom params
+        
+        /*
+         
+         MSActionSheet(viewController: self, sourceView: sender)
+         .add(.frontCamera, title: "Selfie camera", image: #imageLiteral(resourceName: "msactionsheet_selfie"))
+         .add(.rearCamera, defaultImage: true)
+         .setTint(color: .purple)
+         .add(.cancel, style: .destructive)
+         .show {
+         sender.setImage($0, for: .normal)
+         }
+         
+         */
+        
+        
+        //  Example 4 - Create custom actionsheet with custom actions
+        
+        /*
+         
+         MSActionSheet(viewController: self, sourceView: sender)
+         .add(.library, defaultImage: true)
+         .addCustom(title: "Print", isDestructive: false, image: #imageLiteral(resourceName: "print_photo")) {
+         print("Printing the photo")
+         }.addCustom(title: "Share", isDestructive: true, image: #imageLiteral(resourceName: "share_photo")) {
+         print("Sharing the photo")
+         }.add(.cancel)
+         .show {
+         sender.setImage($0, for: .normal)
+         }
+         
          */
         
     }
diff --git a/MSActionSheet/MSActionSheet.swift b/MSActionSheet/MSActionSheet.swift
index f98d363..8f40602 100755
--- a/MSActionSheet/MSActionSheet.swift
+++ b/MSActionSheet/MSActionSheet.swift
@@ -1,222 +1,245 @@
 //
 //  MSActionSheet.swift
-//  Version 1.2
+//  Version 1.3
 //  Created by Maor Shams on 07/04/2017.
 //  Copyright © 2017 Maor Shams. All rights reserved.
 //
 import UIKit
 import MobileCoreServices
 
-class MSActionSheet: UIAlertController,  UIImagePickerControllerDelegate, UINavigationControllerDelegate  {
+class MSActionSheet: UIAlertController {
     
-    fileprivate static var sheet : UIAlertController?
-    static let instance = MSActionSheet()
-    
-    var clientVC : UIViewController?
+    // preferredStyle is a read-only property, so you have to override it
+    override var preferredStyle: UIAlertControllerStyle {
+        return .actionSheet
+    }
     
-    // Button names
-    fileprivate var library = "Photo Library"
-    fileprivate var frontCamera = "Front Camera"
-    fileprivate var rearCamera = "Rear Camera"
-    fileprivate var cancel = "Cancel"
+    init() {
+        super.init(nibName: nil, bundle: nil)
+        initialize()
+    }
     
-    /// Create Full ActionSheet
-    /// - parameters:
-    ///   - vc: The view controller to show the ActionSheet at
-    ///   - handler: The function that  will execute after the user took the image, also you get the optional UIImage
-    func showFullActionSheet(on vc : UIViewController,handler : @escaping (_ : UIImage?) -> Void) {
-        let sheet = create().addLibrary().addFrontCamera().addRearCamera().addCancelButton()
-        sheet.show(on: vc){ (image : UIImage?) in
-            handler(image)
-        }
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        initialize()
     }
     
+    convenience init(viewController : UIViewController, sourceView : UIView, title: String? = nil, message: String? = nil) {
+        self.init()
+        initialize(viewController: viewController,sourceView: sourceView, title: title, message: message)
+    }
     
-    /// Create new ActionSheet
-    /// - parameters:
-    ///   - title: (_optional_) - A title for the ActionSheet, by default does not contain title
-    ///   - message: (_optional_) - A message for the ActionSheet, by default does not contain title
-    func create(title: String = "", message: String = "") -> MSActionSheet {
-        if title.isEmpty && message.isEmpty{
-            MSActionSheet.sheet = UIAlertController()
-        }else{
-            MSActionSheet.sheet = UIAlertController(title: title, message: message, preferredStyle: .actionSheet)
+    // Configuration for actionsheet
+    private func initialize(viewController : UIViewController? = nil,
+                            sourceView : UIView? = nil,
+                            title: String? = nil,
+                            message: String? = nil) {
+        
+        if let title = title, let message = message {
+            self.title = title
+            self.message = message
         }
-        return self
+        
+        let rootVC = UIApplication.shared.keyWindow?.rootViewController
+        currentvViewController = (viewController == nil) ? rootVC : viewController
+        self.sourceView = sourceView
     }
     
-    /// Presents Library button in ActionSheet
+    private var currentvViewController : UIViewController?
+    private var onFinishPicking : ((_ : UIImage?) -> Void)?
+    private var sourceView : UIView?
+    
+    
+    /// Create Full ActionSheet include library, front camera, rear camera, cancel button and default images.
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Photo Library"
-    ///   - destructive : (_optional_) - Apply destructive style for this action
-    ///   - image: (_optional_) - Custom image for button, by default the image is "msactionsheet_library" from assets
-    func addLibrary(title : String = "Photo Library",destructive style : Bool = false ,  image : UIImage? = nil) -> MSActionSheet{
-        library = title
-        let libraryAction = UIAlertAction(title: library, style : isDestructive(style), handler: handler)
-        
-        if let img : UIImage = image{ // client select different image
-            libraryAction.image = img
-        }else{
-            if let img = UIImage(named: "msactionsheet_library") { //the image exists..
-                libraryAction.image = img
-            }
-        }
-        MSActionSheet.sheet?.addAction(libraryAction)
-        return self
+    ///   - completion: Execute after the user took the image, returns optional UIImage, returns nil if the user did not select
+    func showFullActionSheet(completion : @escaping (_ : UIImage?) -> Void) {
+        add(.library, defaultImage : true)
+            .add(.frontCamera, defaultImage : true)
+            .add(.rearCamera, defaultImage : true)
+            .add(.cancel)
+            .show(completion: completion)
     }
     
-    /// Presents Front Camera button in ActionSheet
+    /// Add new alert action to the action sheet.
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Front Camera"
-    ///   - destructive : (_optional_) - Apply destructive style for this action
-    ///   - image: (_optional_) - Custom image for button, by default the image is "msactionsheet_frontCam" from assets
-    func addFrontCamera(title : String = "Front Camera",destructive style : Bool = false, image : UIImage? = nil) -> MSActionSheet{
-        guard UIImagePickerController.isCameraDeviceAvailable(.front) else {
-            return self
-        }
+    ///   - type: - The type of the alert action
+    ///   - title: (_optional_) - The title of the alert action, by default the values from MSActionsSheet.ActionType
+    ///   - style: (_optional_) - The style of the alert action, by default the value is .default. If the type of the action sheet is .cancel, and the style is nil, the style will set as .cancel
+    ///   - image: (_optional_) - The image of the alert action, by default nil (no image)
+    ///   - defaultImage: (_optional_) - The default image based on the type from MSActionsSheet.ActionType
+    
+    func add(_ type : ActionType,
+             title : String? = nil,
+             style : UIAlertActionStyle? = nil,
+             image : UIImage? = nil,
+             defaultImage : Bool = false) -> MSActionSheet{
         
-        frontCamera = title
-        let frontCamAction = UIAlertAction(title: frontCamera, style: isDestructive(style), handler: handler)
+        let newTitle : String = (title == nil) ? type.title : title!
+        let newImage : UIImage? = defaultImage == true ? type.image : image
+        let newStyle : UIAlertActionStyle = (type == .cancel && style == nil) ? .cancel : style == nil ? .default : style!
         
-        if let img : UIImage = image{ // client select different image
-            frontCamAction.image = img
-        }else{
-            if let img = UIImage(named: "msactionsheet_frontCam") { //the image exists..
-                frontCamAction.image = img
-            }
-        }
-        MSActionSheet.sheet?.addAction(frontCamAction)
-        return self
+        let action = MSActionSheetAction(actionTitle: newTitle,
+                                         style: newStyle,
+                                         image: newImage,
+                                         actionType: type,
+                                         handler: actionSheetAction)
         
+        return self.add(action: action)
     }
     
-    /// Presents Rear Camera button in ActionSheet
+    /// Add new custom action to the action sheet.
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Rear Camera"
-    ///   - destructive : (_optional_) - Apply destructive style for this action
-    ///   - image: (_optional_) - Custom image for button, by default the image is "msactionsheet_rearCam" from assets
-    func addRearCamera(title : String = "Rear Camera", destructive style : Bool = false , image : UIImage? = nil) -> MSActionSheet{
-        guard UIImagePickerController.isCameraDeviceAvailable(.rear) else {
-            return self
-        }
-        
-        self.rearCamera = title
-        let rearCamAction = UIAlertAction(title: rearCamera, style: isDestructive(style), handler: handler)
+    ///   - title: (_optional_) - A title for the action
+    ///   - isDestructive: (_optional_) - set destructive style, false by default
+    ///   - image: (_optional_) - Custom image for the action, No image by default
+    ///   - handler: when the user click on the button
+    func addCustom(title : String,
+                   isDestructive : Bool = false,
+                   image : UIImage? = nil,
+                   handler : @escaping ()->Void) -> MSActionSheet{
         
-        if let img : UIImage = image{ // client select different image
-            rearCamAction.image = img
-        }else{
-            if let img = UIImage(named: "msactionsheet_rearCam") { //the image exists..
-                rearCamAction.image = img
-            }
+        let customButtonAction = MSActionSheetAction(actionTitle: title, style: self.isDestructive(isDestructive), image: image) { _ in
+            handler()
         }
-        MSActionSheet.sheet?.addAction(rearCamAction)
-        return self
+        return self.add(action: customButtonAction)
     }
     
     
-    /// Presents Cancel button in ActionSheet
+    /// Set color for ActionSheet
     /// - parameters:
-    ///   - title: (_optional_) - A title for the button, by default the title is "Cancel"
-    func addCancelButton(title : String = "Cancel") -> MSActionSheet{
-        cancel = title
-        MSActionSheet.sheet?.addAction(UIAlertAction(title: cancel, style: .cancel, handler: nil))
+    ///   - color: The tint color of the actionsheet
+    func setTint(color : UIColor) -> MSActionSheet{
+        self.view.tintColor = color
         return self
     }
     
     
-    /// Presents the builded ActionSheet on passed view controller.
+    /// Presents the ActionSheet on the view controller.
     /// (Make sure this is the last method called!)
     /// - parameters:
-    ///   - vc: The view controller to show the ActionSheet at
-    func show(on vc : UIViewController, onFinishPicking  handler: @escaping (_ : UIImage?) -> Swift.Void){
-        self.handler = handler
-        clientVC = vc
-        vc.present(MSActionSheet.sheet!, animated: true, completion: nil)
+    ///   - completion: (_optional UIImage_) The selected image, nil if the user did not select
+    func show(completion: @escaping (UIImage?) -> Void){
+        self.onFinishPicking = completion
+        
+        if UIDevice.current.userInterfaceIdiom == .pad, let source = sourceView{
+            self.popoverPresentationController?.sourceView = source
+            self.popoverPresentationController?.sourceRect = source.bounds
+        }
+        
+        currentvViewController?.present(self, animated: true, completion: nil)
     }
     
     
-    fileprivate func handler(_ action : UIAlertAction){
+    private func actionSheetAction(_ action : UIAlertAction){
+        
+        guard let action = action as? MSActionSheetAction else {
+            return
+        }
         
         let picker = UIImagePickerController()
         picker.delegate = self
         picker.allowsEditing = true
         picker.mediaTypes = [kUTTypeImage as String]
         
-        switch action.title ?? "" {
-        case library:
+        switch action.type! {
+        case ActionType.library:
             picker.sourceType = .photoLibrary
-        case rearCamera:
+        case ActionType.rearCamera:
             picker.sourceType = .camera
             picker.cameraDevice = .rear
             picker.showsCameraControls = true
-        case frontCamera:
+        case ActionType.frontCamera:
             picker.sourceType = .camera
             picker.cameraDevice = .front
             picker.showsCameraControls = true
         default: return
         }
         
-        clientVC?.present(picker, animated: true, completion: nil)
+        if UIDevice.current.userInterfaceIdiom == .pad, let source = sourceView{
+            self.popoverPresentationController?.sourceView = source
+            self.popoverPresentationController?.sourceRect = source.bounds
+        }
+        
+        currentvViewController?.present(picker, animated: true, completion: nil)
+        
     }
     
-    fileprivate var img : UIImage?
+    private func add(action: MSActionSheetAction) -> MSActionSheet{
+        self.addAction(action)
+        return self
+    }
     
-    /// Get the selected image by the user
-    /// (Make sure this method called inside the onFinishPicking()  method or inside showFullActionSheet() handler)
-    func getImage() -> UIImage?{
-        return img ?? nil
+    private func isDestructive(_ destructive : Bool) -> UIAlertActionStyle {
+        return destructive ? .destructive : .default
     }
     
+}
+extension MSActionSheet: UIImagePickerControllerDelegate, UINavigationControllerDelegate{
+    
     // get info about selected image when finish picking
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
         // dismiss picker
-        picker.dismiss(animated: true, completion: nil)
-        
-        
-        // get image
-        if let image = info[UIImagePickerControllerEditedImage] as? UIImage{
-            img = image
-            handler!(image)
+        picker.dismiss(animated: true) { [weak self] in
+            // get image
+            if let image = info[UIImagePickerControllerEditedImage] as? UIImage{
+                self?.onFinishPicking?(image)
+            }
         }
-        
-        reset()
     }
     
-    fileprivate var handler : ((_ : UIImage?) -> Void)?
-    
-    /*  /// Event will execute after the user took the image
-     /// - parameters:
-     ///   - handler: The function that  will execute after the user took the image
-     func onFinishPicking(handler : @escaping (_ : UIImage?) -> Swift.Void){
-     self.handler = handler
-     }*/
-    
-    /// Set color for ActionSheet
-    /// - parameters:
-    ///   - color: The color for actionsheet
-    func tintColor(color : UIColor) -> MSActionSheet{
-        MSActionSheet.sheet?.view.tintColor = color
-        return self
+    func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
+        picker.dismiss(animated: true) { [weak self] in
+            self?.onFinishPicking?(nil)
+        }
     }
+}
+
+
+extension MSActionSheet{
     
-    
-    fileprivate func isDestructive(_ destructive : Bool) -> UIAlertActionStyle {
-        return destructive ? .destructive : .default
+    enum ActionType {
+        case library
+        case frontCamera
+        case rearCamera
+        case cancel
+        
+        var title : String{
+            switch self {
+            case .library     : return "Photo Library"
+            case .frontCamera : return "Front Camera"
+            case .rearCamera  : return "Rear Camera"
+            case .cancel      : return "Cancel"
+            }
+        }
+        
+        var image : UIImage?{
+            switch self {
+            case .library     : return #imageLiteral(resourceName: "msactionsheet_library")
+            case .frontCamera : return #imageLiteral(resourceName: "msactionsheet_frontcam")
+            case .rearCamera  : return #imageLiteral(resourceName: "msactionsheet_rearcam")
+            case .cancel      : return nil
+            }
+        }
+        
     }
     
-    fileprivate func reset(){
-        handler = nil
-        img = nil
-        clientVC = nil
-        MSActionSheet.sheet = nil
-    }
 }
 
-extension UIAlertAction{
-    @NSManaged var image : UIImage?
-    convenience init(title: String?,style: UIAlertActionStyle,image : UIImage?, handler: ((UIAlertAction) -> Void)? = nil ){
-        self.init(title: title, style: style, handler: handler)
-        self.image = image
+class MSActionSheetAction : UIAlertAction{
+    
+    var type : MSActionSheet.ActionType?
+    
+    convenience init(actionTitle: String,
+                     style: UIAlertActionStyle,
+                     image : UIImage? = nil,
+                     actionType : MSActionSheet.ActionType? = nil,
+                     handler: @escaping ((UIAlertAction) -> Void) ){
+        
+        self.init(title: actionTitle, style: style, handler: handler)
+        
+        self.setValue(image, forKey: "image")
+        self.type = actionType
     }
 }
+
diff --git a/README.md b/README.md
index abd09bd..1f5da9f 100755
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 ![MSActionSheet: Logo](http://i.imgur.com/UkbNlEj.png)
 
 ![CocoaPods MSActionSheet](http://i.imgur.com/ys0rzRs.png)
-![MSActionSheet Version](http://i.imgur.com/1LmYVqf.png)
 ![MSActionSheet Platform](http://i.imgur.com/S79aHIK.png)
 
-Customized ActionSheet for taking photo from library / front / rear camera
+# Customized ActionSheet for taking photo from library / front / rear camera or custom buttons.
+##### Now supporting iPad
 
 ![MSActionSheet: screenshot](https://raw.githubusercontent.com/MaorS/MSActionSheet/master/Example/media/screenshots.png)
 
@@ -21,47 +21,47 @@ Drag and drop MSActionSheet.swift and Assets into your project
 
 ## Usage - long way
 
-### Creating new ActionSheet
+### Creating new ActionSheet, When the user select the image, get selected Image:
 
 ```swift
-let sheet = MSActionSheet.instance
-sheet.create().addLibrary().addRearCamera().addFrontCamera().addCancelButton().show(on: self)
-```
-
-### Handler when user finish picking, get selected Image:
-
-```swift
-.show(on: self) { (image) in
-// Your code here
+MSActionSheet(viewController: self, sourceView: sender)
+.add(.library)
+.add(.rearCamera)
+.add(.frontCamera)
+.add(.cancel).show { (image) in
 }
 ```
-
-
-
 ## Usage - Short way
 ### Creating new ActionSheet, when user finish picking get image
 
 ```swift
-MSActionSheet.instance.showFullActionSheet(on: self){ (image) in
-// Your code here
+MSActionSheet(viewController: self, sourceView: sender).showFullActionSheet {
+sender.setImage($0, for: .normal)
 }
 ```
 
 ## Customizing
-#### Adding custom titles and images
-You can set custom title or message or both
-
+Set custom title, image, style :
 ```swift
-sheet.create(title: "Select Image", message: "Another text..")
+.add(.frontCamera, title: "Take a Selfie", style: .destructive, image: #imageLiteral(resourceName: "my_image"))
 ```
-You can mix between action options
+Use the default image :
 ```swift
-.addFrontCamera(title: "Take a selfie", destructive: true, image: #imageLiteral(resourceName: "selfie"))
+.add(.rearCamera, defaultImage: true)
 ```
-
-#### Adding custom tint color to ActionSheet
+Add custom buttons :
+```swift
+.addCustom(title: "Print", image: #imageLiteral(resourceName: "print_photo")) {
+// action when the user click on "Print button"
+print("Printing the photo")
+}.addCustom(title: "Share", image: #imageLiteral(resourceName: "share_photo")) {
+// action when the user click on "Share button"
+print("Sharing the photo")
+}
+```
+Set ActionSheet tint color
 ```swift
-.tintColor(color: .red)
+.setTint(color: .purple)
 ```
 
 
@@ -72,10 +72,7 @@ Please make sure to enable in Info.plist
 ```Privacy - Camera Usage Description```
 ![MSActionSheet: Customized ActionSheet for taking photo from library / front / rear camera](http://i.imgur.com/oAeYJwy.png)
 
-### Short tutorial
-
-![MSActionSheet: Customized ActionSheet for taking photo from library / front / rear camera](https://github.com/MaorS/MSActionSheet/blob/master/Example/media/fullActionSheet.gif?raw=true)
-
 
 # License
 MSActionSheet is available under the MIT license. See the LICENSE file for more info.
+