diff --git a/Module-Source/android/lib/pushwoosh-amazon_v5.5.8.jar b/Module-Source/android/lib/pushwoosh-amazon_v5.8.4.jar
similarity index 100%
rename from Module-Source/android/lib/pushwoosh-amazon_v5.5.8.jar
rename to Module-Source/android/lib/pushwoosh-amazon_v5.8.4.jar
diff --git a/Module-Source/android/lib/pushwoosh-badge_v5.5.8.jar b/Module-Source/android/lib/pushwoosh-badge_v5.8.4.jar
similarity index 100%
rename from Module-Source/android/lib/pushwoosh-badge_v5.5.8.jar
rename to Module-Source/android/lib/pushwoosh-badge_v5.8.4.jar
diff --git a/Module-Source/android/lib/pushwoosh-beacon_v5.5.8.jar b/Module-Source/android/lib/pushwoosh-beacon_v5.8.4.jar
similarity index 100%
rename from Module-Source/android/lib/pushwoosh-beacon_v5.5.8.jar
rename to Module-Source/android/lib/pushwoosh-beacon_v5.8.4.jar
diff --git a/Module-Source/android/lib/pushwoosh-gcm_v5.5.8.jar b/Module-Source/android/lib/pushwoosh-gcm_v5.8.4.jar
similarity index 91%
rename from Module-Source/android/lib/pushwoosh-gcm_v5.5.8.jar
rename to Module-Source/android/lib/pushwoosh-gcm_v5.8.4.jar
index d2bd4ef..5b869a8 100644
Binary files a/Module-Source/android/lib/pushwoosh-gcm_v5.5.8.jar and b/Module-Source/android/lib/pushwoosh-gcm_v5.8.4.jar differ
diff --git a/Module-Source/android/lib/pushwoosh-location_v5.5.8.jar b/Module-Source/android/lib/pushwoosh-location_v5.5.8.jar
deleted file mode 100644
index 57af235..0000000
Binary files a/Module-Source/android/lib/pushwoosh-location_v5.5.8.jar and /dev/null differ
diff --git a/Module-Source/android/lib/pushwoosh-location_v5.8.4.jar b/Module-Source/android/lib/pushwoosh-location_v5.8.4.jar
new file mode 100644
index 0000000..7f07df9
Binary files /dev/null and b/Module-Source/android/lib/pushwoosh-location_v5.8.4.jar differ
diff --git a/Module-Source/android/lib/pushwoosh_v5.5.8.jar b/Module-Source/android/lib/pushwoosh_v5.5.8.jar
deleted file mode 100644
index b871f3f..0000000
Binary files a/Module-Source/android/lib/pushwoosh_v5.5.8.jar and /dev/null differ
diff --git a/Module-Source/android/lib/pushwoosh_v5.8.4.jar b/Module-Source/android/lib/pushwoosh_v5.8.4.jar
new file mode 100644
index 0000000..ca3d208
Binary files /dev/null and b/Module-Source/android/lib/pushwoosh_v5.8.4.jar differ
diff --git a/Module-Source/android/manifest b/Module-Source/android/manifest
index 62c4575..fc9b116 100644
--- a/Module-Source/android/manifest
+++ b/Module-Source/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.5.5
+version: 5.8.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86
 description: pushnotifications
diff --git a/Module-Source/ios/Pushwoosh.framework/Modules/module.modulemap b/Module-Source/ios/Pushwoosh.framework/Modules/module.modulemap
old mode 100755
new mode 100644
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWGDPRManager.h b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWGDPRManager.h
old mode 100755
new mode 100644
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWInAppManager.h b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWInAppManager.h
old mode 100755
new mode 100644
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWInbox.h b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWInbox.h
old mode 100755
new mode 100644
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWLog.h b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWLog.h
old mode 100755
new mode 100644
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWRichMediaManager.h b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PWRichMediaManager.h
old mode 100755
new mode 100644
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h
old mode 100755
new mode 100644
index e531a82..eee8e4e
--- a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h
+++ b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h
@@ -12,7 +12,7 @@
 #import <UserNotifications/UserNotifications.h>
 #endif
 
-#define PUSHWOOSH_VERSION @"5.8.0"
+#define PUSHWOOSH_VERSION @"5.8.3"
 
 
 @class PushNotificationManager;
@@ -372,7 +372,7 @@ typedef void (^PushwooshErrorHandler)(NSError *error);
 
 - (void)handlePushRegistrationFailure:(NSError *)error;
 
-//if the push is received while the app is running.
+//If the push is received while the app is running. Call it only for iOS version < 10. For iOS 10 and higher use notificationCenterDelegate.
 - (BOOL)handlePushReceived:(NSDictionary *)userInfo;
 
 /**
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h b/Module-Source/ios/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h
old mode 100755
new mode 100644
diff --git a/Module-Source/ios/Pushwoosh.framework/Versions/A/Pushwoosh b/Module-Source/ios/Pushwoosh.framework/Versions/A/Pushwoosh
index abb7289..d9e2233 100644
Binary files a/Module-Source/ios/Pushwoosh.framework/Versions/A/Pushwoosh and b/Module-Source/ios/Pushwoosh.framework/Versions/A/Pushwoosh differ
diff --git a/Module-Source/ios/manifest b/Module-Source/ios/manifest
index 930dc7a..420205c 100644
--- a/Module-Source/ios/manifest
+++ b/Module-Source/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.5.5
+version: 5.8.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: PushwooshModule
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-location_v5.5.8.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-location_v5.5.8.jar
deleted file mode 100644
index 57af235..0000000
Binary files a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-location_v5.5.8.jar and /dev/null differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh_v5.5.8.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh_v5.5.8.jar
deleted file mode 100644
index b871f3f..0000000
Binary files a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh_v5.5.8.jar and /dev/null differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/arm64-v8a/libcom.pushwoosh.module.so b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/arm64-v8a/libcom.pushwoosh.module.so
deleted file mode 100644
index 545938a..0000000
Binary files a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/arm64-v8a/libcom.pushwoosh.module.so and /dev/null differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/armeabi-v7a/libcom.pushwoosh.module.so b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/armeabi-v7a/libcom.pushwoosh.module.so
deleted file mode 100644
index eefeb4b..0000000
Binary files a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/armeabi-v7a/libcom.pushwoosh.module.so and /dev/null differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/x86/libcom.pushwoosh.module.so b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/x86/libcom.pushwoosh.module.so
deleted file mode 100644
index 24341b7..0000000
Binary files a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/libs/x86/libcom.pushwoosh.module.so and /dev/null differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/pushnotifications.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/pushnotifications.jar
deleted file mode 100644
index 6af507e..0000000
Binary files a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/pushnotifications.jar and /dev/null differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/LICENSE b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/LICENSE
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/LICENSE
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/LICENSE
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/R.txt b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/R.txt
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/R.txt
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/R.txt
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/assets/.keep b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/assets/.keep
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/assets/.keep
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/assets/.keep
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/example/.keep b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/example/.keep
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/example/.keep
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/example/.keep
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/README.txt b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/README.txt
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/README.txt
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/README.txt
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/add.py b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/add.py
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/add.py
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/add.py
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/install.py b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/install.py
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/install.py
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/install.py
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/remove.py b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/remove.py
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/remove.py
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/remove.py
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/uninstall.py b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/uninstall.py
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/hooks/uninstall.py
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/hooks/uninstall.py
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-amazon_v5.5.8.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-amazon_v5.8.4.jar
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-amazon_v5.5.8.jar
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-amazon_v5.8.4.jar
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-badge_v5.5.8.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-badge_v5.8.4.jar
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-badge_v5.5.8.jar
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-badge_v5.8.4.jar
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-beacon_v5.5.8.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-beacon_v5.8.4.jar
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-beacon_v5.5.8.jar
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-beacon_v5.8.4.jar
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-gcm_v5.5.8.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-gcm_v5.8.4.jar
similarity index 91%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-gcm_v5.5.8.jar
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-gcm_v5.8.4.jar
index d2bd4ef..5b869a8 100644
Binary files a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-gcm_v5.5.8.jar and b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-gcm_v5.8.4.jar differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-location_v5.8.4.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-location_v5.8.4.jar
new file mode 100644
index 0000000..7f07df9
Binary files /dev/null and b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-location_v5.8.4.jar differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh_v5.8.4.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh_v5.8.4.jar
new file mode 100644
index 0000000..ca3d208
Binary files /dev/null and b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh_v5.8.4.jar differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/arm64-v8a/libcom.pushwoosh.module.so b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/arm64-v8a/libcom.pushwoosh.module.so
new file mode 100644
index 0000000..b6c84b3
Binary files /dev/null and b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/arm64-v8a/libcom.pushwoosh.module.so differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/armeabi-v7a/libcom.pushwoosh.module.so b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/armeabi-v7a/libcom.pushwoosh.module.so
new file mode 100644
index 0000000..8b17c62
Binary files /dev/null and b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/armeabi-v7a/libcom.pushwoosh.module.so differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/x86/libcom.pushwoosh.module.so b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/x86/libcom.pushwoosh.module.so
new file mode 100644
index 0000000..b205fd2
Binary files /dev/null and b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/libs/x86/libcom.pushwoosh.module.so differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/manifest b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/manifest
similarity index 96%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/manifest
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/manifest
index 62c4575..fc9b116 100644
--- a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/manifest
+++ b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.5.5
+version: 5.8.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86
 description: pushnotifications
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/pushnotifications.jar b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/pushnotifications.jar
new file mode 100644
index 0000000..df4b0c3
Binary files /dev/null and b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/pushnotifications.jar differ
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/timodule.xml b/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/timodule.xml
similarity index 100%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/timodule.xml
rename to Push-Notifications-Module/modules/android/com.pushwoosh.module/5.8.0/timodule.xml
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/libcom.pushwoosh.module.a b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/libcom.pushwoosh.module.a
deleted file mode 100644
index faea235..0000000
Binary files a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/libcom.pushwoosh.module.a and /dev/null differ
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/LICENSE b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/LICENSE
similarity index 100%
rename from Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/LICENSE
rename to Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/LICENSE
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/assets/.keep b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/assets/.keep
similarity index 100%
rename from Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/assets/.keep
rename to Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/assets/.keep
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/example/.keep b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/example/.keep
similarity index 100%
rename from Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/example/.keep
rename to Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/example/.keep
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/libcom.pushwoosh.module.a b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/libcom.pushwoosh.module.a
new file mode 100644
index 0000000..fd52429
Binary files /dev/null and b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/libcom.pushwoosh.module.a differ
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/manifest b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/manifest
similarity index 96%
rename from Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/manifest
rename to Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/manifest
index 930dc7a..420205c 100644
--- a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/manifest
+++ b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.5.5
+version: 5.8.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: PushwooshModule
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/metadata.json b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/metadata.json
similarity index 100%
rename from Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/metadata.json
rename to Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/metadata.json
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/module.xcconfig b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/module.xcconfig
similarity index 97%
rename from Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/module.xcconfig
rename to Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/module.xcconfig
index fa43fad..f0c8e9c 100644
--- a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/module.xcconfig
+++ b/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.8.0/module.xcconfig
@@ -1,5 +1,5 @@
 // This flag is generated by the module build, do not change it.
-TI_MODULE_VERSION=5.5.5
+TI_MODULE_VERSION=5.8.0
 
 //
 // PLACE ANY BUILD DEFINITIONS IN THIS FILE AND THEY WILL BE 
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-location_v5.5.8.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-location_v5.5.8.jar
deleted file mode 100644
index 57af235..0000000
Binary files a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-location_v5.5.8.jar and /dev/null differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh_v5.5.8.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh_v5.5.8.jar
deleted file mode 100644
index b871f3f..0000000
Binary files a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh_v5.5.8.jar and /dev/null differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/arm64-v8a/libcom.pushwoosh.module.so b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/arm64-v8a/libcom.pushwoosh.module.so
deleted file mode 100644
index 545938a..0000000
Binary files a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/arm64-v8a/libcom.pushwoosh.module.so and /dev/null differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/armeabi-v7a/libcom.pushwoosh.module.so b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/armeabi-v7a/libcom.pushwoosh.module.so
deleted file mode 100644
index eefeb4b..0000000
Binary files a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/armeabi-v7a/libcom.pushwoosh.module.so and /dev/null differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/x86/libcom.pushwoosh.module.so b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/x86/libcom.pushwoosh.module.so
deleted file mode 100644
index 24341b7..0000000
Binary files a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/libs/x86/libcom.pushwoosh.module.so and /dev/null differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/pushnotifications.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/pushnotifications.jar
deleted file mode 100644
index 6af507e..0000000
Binary files a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/pushnotifications.jar and /dev/null differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/LICENSE b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/LICENSE
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/LICENSE
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/LICENSE
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/R.txt b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/R.txt
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/R.txt
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/R.txt
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/assets/.keep b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/assets/.keep
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/assets/.keep
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/assets/.keep
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/example/.keep b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/example/.keep
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/example/.keep
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/example/.keep
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/README.txt b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/README.txt
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/README.txt
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/README.txt
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/add.py b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/add.py
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/add.py
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/add.py
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/install.py b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/install.py
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/install.py
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/install.py
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/remove.py b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/remove.py
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/remove.py
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/remove.py
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/uninstall.py b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/uninstall.py
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/hooks/uninstall.py
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/hooks/uninstall.py
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-amazon_v5.5.8.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-amazon_v5.8.4.jar
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-amazon_v5.5.8.jar
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-amazon_v5.8.4.jar
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-badge_v5.5.8.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-badge_v5.8.4.jar
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-badge_v5.5.8.jar
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-badge_v5.8.4.jar
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-beacon_v5.5.8.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-beacon_v5.8.4.jar
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-beacon_v5.5.8.jar
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-beacon_v5.8.4.jar
diff --git a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-gcm_v5.5.8.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-gcm_v5.8.4.jar
similarity index 91%
rename from Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-gcm_v5.5.8.jar
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-gcm_v5.8.4.jar
index d2bd4ef..5b869a8 100644
Binary files a/Push-Notifications-Module/modules/android/com.pushwoosh.module/5.5.5/lib/pushwoosh-gcm_v5.5.8.jar and b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-gcm_v5.8.4.jar differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-location_v5.8.4.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-location_v5.8.4.jar
new file mode 100644
index 0000000..7f07df9
Binary files /dev/null and b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh-location_v5.8.4.jar differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh_v5.8.4.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh_v5.8.4.jar
new file mode 100644
index 0000000..ca3d208
Binary files /dev/null and b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/lib/pushwoosh_v5.8.4.jar differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/arm64-v8a/libcom.pushwoosh.module.so b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/arm64-v8a/libcom.pushwoosh.module.so
new file mode 100644
index 0000000..b6c84b3
Binary files /dev/null and b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/arm64-v8a/libcom.pushwoosh.module.so differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/armeabi-v7a/libcom.pushwoosh.module.so b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/armeabi-v7a/libcom.pushwoosh.module.so
new file mode 100644
index 0000000..8b17c62
Binary files /dev/null and b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/armeabi-v7a/libcom.pushwoosh.module.so differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/x86/libcom.pushwoosh.module.so b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/x86/libcom.pushwoosh.module.so
new file mode 100644
index 0000000..b205fd2
Binary files /dev/null and b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/libs/x86/libcom.pushwoosh.module.so differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/manifest b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/manifest
similarity index 96%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/manifest
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/manifest
index 62c4575..fc9b116 100644
--- a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/manifest
+++ b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.5.5
+version: 5.8.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86
 description: pushnotifications
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/pushnotifications.jar b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/pushnotifications.jar
new file mode 100644
index 0000000..df4b0c3
Binary files /dev/null and b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/pushnotifications.jar differ
diff --git a/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/timodule.xml b/Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/timodule.xml
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.5.5/timodule.xml
rename to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/5.8.0/timodule.xml
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/libcom.pushwoosh.module.a b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/libcom.pushwoosh.module.a
deleted file mode 100644
index faea235..0000000
Binary files a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/libcom.pushwoosh.module.a and /dev/null differ
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/LICENSE b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/LICENSE
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/LICENSE
rename to Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/LICENSE
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/assets/.keep b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/assets/.keep
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/assets/.keep
rename to Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/assets/.keep
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/example/.keep b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/example/.keep
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/example/.keep
rename to Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/example/.keep
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/libcom.pushwoosh.module.a b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/libcom.pushwoosh.module.a
new file mode 100644
index 0000000..fd52429
Binary files /dev/null and b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/libcom.pushwoosh.module.a differ
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/manifest b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/manifest
similarity index 96%
rename from Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/manifest
rename to Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/manifest
index 930dc7a..420205c 100644
--- a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/manifest
+++ b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.5.5
+version: 5.8.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: PushwooshModule
diff --git a/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/metadata.json b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/metadata.json
similarity index 100%
rename from Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.5.5/metadata.json
rename to Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/metadata.json
diff --git a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/module.xcconfig b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/module.xcconfig
similarity index 97%
rename from Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/module.xcconfig
rename to Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/module.xcconfig
index fa43fad..f0c8e9c 100644
--- a/Push-Notifications-Module/modules/iphone/com.pushwoosh.module/5.5.5/module.xcconfig
+++ b/Titanium-Sample-iOS-Android/modules/iphone/com.pushwoosh.module/5.8.0/module.xcconfig
@@ -1,5 +1,5 @@
 // This flag is generated by the module build, do not change it.
-TI_MODULE_VERSION=5.5.5
+TI_MODULE_VERSION=5.8.0
 
 //
 // PLACE ANY BUILD DEFINITIONS IN THIS FILE AND THEY WILL BE