diff --git a/plugin.xml b/plugin.xml
index 7fc9ffb..14f3597 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="com.synconset.imagepicker"
-  version="1.0.6">
+  version="2.0.0">
 
 	<name>ImagePicker</name>
 	 
@@ -30,30 +30,169 @@
 
 		<header-file src="src/ios/SOSPicker.h" />
 		<source-file src="src/ios/SOSPicker.m" />
+        
+        <header-file src="src/ios/GMImagePicker/UIImage+fixOrientation.h" />
+        <source-file src="src/ios/GMImagePicker/UIImage+fixOrientation.m" />
+        
+		<header-file src="src/ios/GMImagePicker/GMAlbumsViewCell.h" />
+		<source-file src="src/ios/GMImagePicker/GMAlbumsViewCell.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAlbumPickerController.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAlbumPickerController.m" />
+		<header-file src="src/ios/GMImagePicker/GMAlbumsViewController.h" />
+		<source-file src="src/ios/GMImagePicker/GMAlbumsViewController.m" />
+		
+		<header-file src="src/ios/GMImagePicker/GMFetchItem.h" />
+		<source-file src="src/ios/GMImagePicker/GMFetchItem.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAsset.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAsset.m" />
+		<header-file src="src/ios/GMImagePicker/GMGridViewCell.h" />
+		<source-file src="src/ios/GMImagePicker/GMGridViewCell.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAssetCell.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAssetCell.m" />
+		<header-file src="src/ios/GMImagePicker/GMGridViewController.h" />
+		<source-file src="src/ios/GMImagePicker/GMGridViewController.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAssetPickerFilterDelegate.h" />
-		<header-file src="src/ios/ELCImagePicker/ELCAssetSelectionDelegate.h" />
+		<header-file src="src/ios/GMImagePicker/GMImagePickerController.h" />
+		<source-file src="src/ios/GMImagePicker/GMImagePickerController.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAssetTablePicker.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAssetTablePicker.m" />
+		<header-file src="src/ios/GMImagePicker/PSYBlockTimer.h" />
+		<source-file src="src/ios/GMImagePicker/PSYBlockTimer.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCImagePickerController.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCImagePickerController.m" />
+		<header-file src="src/ios/GMImagePicker/GMPHAsset.h" />
+		<source-file src="src/ios/GMImagePicker/GMPHAsset.m" />
+
+		<resource-file src="src/ios/GMImagePicker/GMEmptyFolder@1x.png" />
+		<resource-file src="src/ios/GMImagePicker/GMEmptyFolder@2x.png" />
+
+		<resource-file src="src/ios/GMImagePicker/GMSelected.png" />
+		<resource-file src="src/ios/GMImagePicker/GMSelected@2x.png" />
+
+		<resource-file src="src/ios/GMImagePicker/GMVideoIcon.png" />
+		<resource-file src="src/ios/GMImagePicker/GMVideoIcon@2x.png" />
+
+		<resource-file src="src/ios/GMImagePicker/Base.lproj/GMImagePicker.strings" target="res/strings-base/GMImagePicker.strings" />
+		<asset src="src/ios/GMImagePicker/ca.lproj/GMImagePicker.strings" target="res/strings-ca/GMImagePicker.strings" />
+		<asset src="src/ios/GMImagePicker/de.lproj/GMImagePicker.strings" target="res/strings-de/GMImagePicker.strings" />
+		<asset src="src/ios/GMImagePicker/en.lproj/GMImagePicker.strings" target="res/strings-en/GMImagePicker.strings" />
+		<asset src="src/ios/GMImagePicker/es.lproj/GMImagePicker.strings" target="res/strings-es/GMImagePicker.strings"/>
+		<asset src="src/ios/GMImagePicker/fr.lproj/GMImagePicker.strings" target="res/strings-fr/GMImagePicker.strings" />
+		<asset src="src/ios/GMImagePicker/it.lproj/GMImagePicker.strings" target="res/strings-it/GMImagePicker.strings" />
+		<asset src="src/ios/GMImagePicker/pt.lproj/GMImagePicker.strings" target="res/strings-pt/GMImagePicker.strings" />
+
+		<!-- AF Networking -->
+		<source-file src="src/ios/GMImagePicker/AFNetworking/LICENSE" target-dir="resources/AFNetworking" />
+		<source-file src="src/ios/GMImagePicker/AFNetworking/README.md" target-dir="resources/AFNetworking" />
+		
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFHTTPRequestOperation.h"  target-dir="AFNetworking" />
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFHTTPRequestOperation.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFHTTPSessionManager.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFHTTPSessionManager.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFNetworking.h" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFSecurityPolicy.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFSecurityPolicy.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLConnectionOperation.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLConnectionOperation.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLRequestSerialization.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLRequestSerialization.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLResponseSerialization.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLResponseSerialization.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLSessionManager.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/AFNetworking/AFURLSessionManager.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m" target-dir="AFNetworking"/>
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m" target-dir="AFNetworking" />
+
+		<header-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h" target-dir="AFNetworking"/>
+		<source-file src="src/ios/GMImagePicker/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m" target-dir="AFNetworking"/>
+
+		<!-- mr progress -->
+		<header-file src="src/ios/GMImagePicker/mrprogress/MRProgress.h" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Blur/MRBlurView.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Blur/MRBlurView.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Blur/UIImage+MRImageEffects.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Blur/UIImage+MRImageEffects.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRActivityIndicatorView.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Components/MRActivityIndicatorView.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRCircularProgressView.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Components/MRCircularProgressView.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRIconView.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Components/MRIconView.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRNavigationBarProgressView.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Components/MRNavigationBarProgressView.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRProgressOverlayView.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Components/MRProgressOverlayView.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRProgressView.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Components/MRProgressView.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRStopableView.h" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Components/MRStopButton.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Components/MRStopButton.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Support/AFNetworking/MRActivityIndicatorView+AFNetworking.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Support/AFNetworking/MRActivityIndicatorView+AFNetworking.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Support/AFNetworking/MRProgressOverlayView+AFNetworking.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Support/AFNetworking/MRProgressOverlayView+AFNetworking.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Support/AFNetworking/MRProgressView+AFNetworking.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Support/AFNetworking/MRProgressView+AFNetworking.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Utils/MRMessageInterceptor.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Utils/MRMessageInterceptor.m" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Utils/MRMethodCopier.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Utils/MRMethodCopier.m" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Utils/MRProgressHelper.h" target-dir="mrprogress" />
+
+		<header-file src="src/ios/GMImagePicker/mrprogress/Utils/MRWeakProxy.h" target-dir="mrprogress" />
+		<source-file src="src/ios/GMImagePicker/mrprogress/Utils/MRWeakProxy.m" target-dir="mrprogress" />
+        
+        <framework src="Accelerate.framework" />
+        <framework src="Security.framework" />
+        <framework src="Photos.framework" />
+        <framework src="SystemConfiguration.framework" />
+        <framework src="QuartzCore.framework" />
 
-		<resource-file src="src/ios/ELCImagePicker/Resources/ELCAlbumPickerController.xib" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/ELCAssetPicker.xib" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/ELCAssetTablePicker.xib" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/Overlay.png" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/Overlay@2x.png" />
 	</platform>
 
 	<!-- android -->
@@ -78,6 +217,7 @@
 		
 		<source-file src="src/android/Library/src/ImageFetcher.java" target-dir="src/com/synconset"/>
 		<source-file src="src/android/Library/src/MultiImageChooserActivity.java" target-dir="src/com/synconset"/>
+		<source-file src="src/android/Library/src/FileNameItem.java" target-dir="src/com/synconset"/>
 		
         <source-file src="src/android/Library/res/anim/image_pop_in.xml" target-dir="res/anim"/>
 		<source-file src="src/android/Library/res/drawable/grid_background.xml" target-dir="res/drawable"/>
@@ -106,5 +246,8 @@
 		<source-file src="src/android/Library/res/values-hu/multiimagechooser_strings_hu.xml" target-dir="res/values-hu"/>
 		<source-file src="src/android/Library/res/values-ja/multiimagechooser_strings_ja.xml" target-dir="res/values-ja"/>
 		<source-file src="src/android/Library/res/values-ko/multiimagechooser_strings_ko.xml" target-dir="res/values-ko"/>
+		
+		<source-file src="src/android/Library/libs/commons-io-2.4.jar" target-dir="libs" />
+		<source-file src="src/android/Library/libs/gson-2.3.1.jar" target-dir="libs" />
 	</platform>
 </plugin>