diff --git a/README.md b/README.md
index 6a79953..e7740d0 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,6 @@ Please see the Quick Start guide here:
 
 [PhoneGap Quick Start](https://developers.mobileapptracking.com/phonegap-plugin/)
 
-TUNE PhoneGap Plugin Version : 4.1.0
-Android SDK Version         : 3.11.0
-iOS SDK Version             : 3.11.0
+TUNE PhoneGap Plugin Version : 4.2.0
+Android SDK Version         : 3.11.4
+iOS SDK Version             : 3.15.0
diff --git a/example/index.html b/example/index.html
index 67c6e68..63dacaa 100644
--- a/example/index.html
+++ b/example/index.html
@@ -7,9 +7,9 @@
  to you under the Apache License, Version 2.0 (the
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,7 +25,7 @@
         <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
         <link rel="stylesheet" type="text/css" href="css/index.css" />
         <title>MAT PhoneGap Test App</title>
-        
+
         <style>
             button.btn {
                 width: 80%;  height: 40px;
@@ -41,53 +41,53 @@
         <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript">
             document.addEventListener("deviceready", onDeviceReady, true);
-            
+
             var mat;
-            
+
             function onDeviceReady()
             {
                 mat = window.plugins.matPlugin;
-                
+
                 console.log('onDeviceReady: mat = ' + mat);
             }
-            
+
             function handleOpenURL(url)
             {
                 console.log('handleOpenURL: url = ' + url);
             }
-            
+
             function setTUNEDebugMode()
             {
                 mat.setDebugMode(true);
             }
-            
+
             function setAllowDuplicates()
             {
                 mat.setAllowDuplicates(true);
             }
-            
+
             function setTUNEDelegate()
             {
                 mat.setDelegate(true, resultHandler, errorHandler);
             }
-            
+
             function startTUNE()
             {
                 // for main app
                 mat.init("877", "8c14d6bbe466b65211e781d62e301eec");
                 mat.setPackageName("com.hasoffers.phonegaptestapp");
                 //mat.init("877", "8c14d6bbe466b65211e781d62e301eec", "com.hasoffers.phonegaptestapp", false);
-                
+
                 // for wearables (e.g. Apple Watch)
                 //mat.init("877", "8c14d6bbe466b65211e781d62e301eec", "com.hasoffers.phonegaptestapp", true);
-                
+
                 mat.setDelegate(true, resultHandler, errorHandler);
-                
+
                 mat.checkForDeferredDeeplink(deeplinkReceived, deeplinkFailed);
-                
+
                 mat.automateIapEventMeasurement(true);
             }
-            
+
             function testSetters()
             {
                 mat.setAge(23);
@@ -114,30 +114,30 @@
                 mat.setUserEmail("tempUserEmail@tempUserCompany.com");
                 mat.setUserId("tempUserId");
                 mat.setUserName("tempUserName");
-                
+
                 var preloadData = {
                     "publisherId":"1122334455",
                     "publisherReferenceId":"RX1357",
                     "agencyId":"66554477",
                     "publisherSub5":"some_pub_sub_value"
                 };
-                
+
                 mat.setPreloadData(preloadData);
             }
-            
+
             function testGetters()
             {
                 console.log('testGetters clicked');
-                
-                mat.getMatId(resultHandler, errorHandler);
+
+                mat.getTuneId(resultHandler, errorHandler);
                 mat.getOpenLogId(resultHandler, errorHandler);
                 mat.getIsPayingUser(resultHandler, errorHandler);
             }
-            
+
             function showInterstitial()
             {
                 console.log('showInterstitial clicked');
-                
+
                 var metadata = {
                     "gender": "female",
                     "birthdate": new Date(2015, 6, 1).getTime(),
@@ -149,46 +149,46 @@
                 };
                 mat.showInterstitial("Test", metadata);
             }
-            
+
             function showBanner() {
                 console.log('showBanner clicked');
                 mat.showBanner("Test", null, 0);
             }
-            
+
             function showBannerTop() {
                 console.log('showBannerTop clicked');
                 mat.showBanner("Test", null, 1);
             }
-            
+
             function hideBanner() {
                 console.log('hideBanner clicked');
                 mat.hideBanner();
             }
-            
+
             function measureSessionTest()
             {
                 mat.measureSession();
             }
-            
+
             function measureEventNameTest()
             {
                 // event name
                 mat.measureEvent("purchase1");
-                
+
                 // event id
                 //mat.measureEvent(12345678);
             }
-            
+
             function measureEventTest()
             {
                 measureEventTest1();
                 measureEventTest2();
             }
-            
+
             function measureEventTest1()
             {
                 var eventItems = new Array();
-                
+
                 var eventItem1 = {
                     "item":"item1",
                     "quantity":1,
@@ -201,7 +201,7 @@
                     "attribute_sub5":"5"
                 };
                 eventItems[0] = eventItem1;
-                
+
                 var eventItem2 = {
                     "item":"item2",
                     "quantity":2,
@@ -209,7 +209,7 @@
                     "revenue":1
                 };
                 eventItems[1] = eventItem2;
-                
+
                 var matEvent1 = {
                     "name": "purchase2",
                     "revenue": 0.99,
@@ -231,10 +231,10 @@
                     "attribute4": "attr4",
                     "attribute5": "attr5"
                 };
-                
+
                 mat.measureEvent(matEvent1);
             }
-            
+
             function measureEventTest2()
             {
                 var matEvent2 = {
@@ -247,44 +247,44 @@
                     "attribute1": "attr1",
                     "attribute5": "attr5"
                 };
-                
+
                 mat.measureEvent(matEvent2);
             }
-            
+
             function getSampleiTunesIAPReceipt()
             {
                 return "dGhpcyBpcyBhIHNhbXBsZSBpb3MgYXBwIHN0b3JlIHJlY2VpcHQ=";
             }
-            
+
             function resultHandler (result)
             {
                 console.log('resultHandler: ' + result);
             }
-            
+
             function errorHandler (error)
             {
                 console.log('errorHandler: ' + error);
             }
-            
+
             function deeplinkReceived (deeplink)
             {
                 console.log('deferred deeplink success: ' + deeplink);
-                
+
                 // TODO: add your code to handle the deeplink url as appropriate
             }
-            
+
             function deeplinkFailed (error)
             {
                 console.log('deferred deeplink failed: ' + error);
             }
-            
+
             function handleOpenURL(url)
             {
                 console.log('deeplink-url to be opened: ' + url);
             }
-            
+
             </script>
-        
+
         <div>
             <br>
             <h1>MAT PhoneGap Test App</h1>
@@ -330,4 +330,4 @@ <h1>MAT PhoneGap Test App</h1>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ifawrapper/package.json b/ifawrapper/package.json
new file mode 100644
index 0000000..1ed8d6a
--- /dev/null
+++ b/ifawrapper/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "cordova-plugin-ifawrapper",
+  "version": "1.0.0",
+  "description": "This Cordova plugin allows you to retrieve the Apple Advertising Identifier from an iOS device.",
+  "cordova": {
+    "id": "cordova-plugin-ifawrapper",
+    "platforms": [
+      "ios"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MobileAppTracking/phonegap-plugin.git"
+  },
+  "keywords": [
+    "cordova",
+    "ios",
+    "ifa",
+    "idfa",
+    "apple",
+    "advertising",
+    "identifier",
+    "advertisingIdentifier",
+    "AdSupport",
+    "ecosystem:cordova",
+    "cordova-ios"
+  ],
+  "engines": [
+    {
+      "name": "cordova",
+      "version": ">=3.0.0"
+    }
+  ],
+  "author": "John Gu",
+  "license": "Apache 2.0",
+  "bugs": {
+    "url": "https://github.com/MobileAppTracking/phonegap-plugin/issues"
+  },
+  "homepage": "https://github.com/MobileAppTracking/phonegap-plugin#readme"
+}
diff --git a/ifawrapper/plugin.xml b/ifawrapper/plugin.xml
index b7e3815..0421082 100644
--- a/ifawrapper/plugin.xml
+++ b/ifawrapper/plugin.xml
@@ -37,10 +37,10 @@
         <plugins-plist key="IFAWrapperPlugin" string="IFAWrapperPlugin" />
         
         <config-file target="config.xml" parent="/*">
-	        <feature name="IFAWrapperPlugin">
-				<param name="ios-package" value="IFAWrapperPlugin" />
-				<param name="onload" value="true" />
-			</feature>
+            <feature name="IFAWrapperPlugin">
+                <param name="ios-package" value="IFAWrapperPlugin" />
+                <param name="onload" value="true" />
+            </feature>
         </config-file>
         
         <source-file src="src/ios/IFAWrapperPlugin.m" />
diff --git a/package.json b/package.json
index 1ca5c3e..e003e6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-tune",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "This Cordova plugin allows you to measure installs and events with the TUNE SDK.",
   "cordova": {
     "id": "cordova-plugin-tune",
diff --git a/plugin.xml b/plugin.xml
index 4f90f59..dcd1e1b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" 
         xmlns:android="http://schemas.android.com/apk/res/android" 
         id="cordova-plugin-tune" 
-        version="4.1.0">
+        version="4.2.0">
 
     <name>MATPlugin</name>
 
@@ -44,7 +44,7 @@
                 android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
         </config-file>
 
-        <source-file src="src/android/lib/MobileAppTracker-3.11.0.jar" target-dir="libs/" />
+        <source-file src="src/android/lib/MobileAppTracker-3.11.4.jar" target-dir="libs/" />
         <source-file src="src/android/com/mobileapptracking/MATPlugin.java"
                      target-dir="src/com/mobileapptracking" />
 
@@ -67,7 +67,7 @@
         <header-file src="src/ios/MATPlugin.h" />
 
         <!-- TUNE framework -->
-        <source-file src="src/ios/MobileAppTracker-3.11.0.a" framework="true" />
+        <source-file src="src/ios/MobileAppTracker-3.15.0.a" framework="true" />
         
         <header-file src="src/ios/MobileAppTracker.h" />
         <header-file src="src/ios/MATEvent.h" />
diff --git a/src/android/com/mobileapptracking/MATPlugin.java b/src/android/com/mobileapptracking/MATPlugin.java
index d2fff43..77d1467 100644
--- a/src/android/com/mobileapptracking/MATPlugin.java
+++ b/src/android/com/mobileapptracking/MATPlugin.java
@@ -66,7 +66,7 @@ public class MATPlugin extends CordovaPlugin {
     public static final String SETPACKAGENAME = "setPackageName";
     public static final String SETPAYINGUSER = "setPayingUser";
     public static final String SETPRELOADDATA = "setPreloadData";
-    public static final String SETTPID = "setTRUSTeID";
+    public static final String SETTPID = "setTRUSTeId";
     public static final String SETUSEREMAIL = "setUserEmail";
     public static final String SETUSERID = "setUserId";
     public static final String SETUSERNAME = "setUserName";
@@ -74,6 +74,7 @@ public class MATPlugin extends CordovaPlugin {
     public static final String SETTWUSERID = "setTwitterUserId";
     public static final String SETGGUSERID = "setGoogleUserId";
     public static final String GETMATID = "getMatId";
+    public static final String GETTUNEID = "getTuneId";
     public static final String GETOPENLOGID = "getOpenLogId";
     public static final String GETISPAYINGUSER = "getIsPayingUser";
 
@@ -511,7 +512,7 @@ public void didFailDeeplink(String error) {
             }
             callbackContext.success();
             return true;
-        } else if (GETMATID.equals(action)) {
+        } else if (GETMATID.equals(action) || GETTUNEID.equals(action)) {
             String matId = mat.getMatId();
             callbackContext.success(matId);
             return true;
diff --git a/src/android/lib/MobileAppTracker-3.11.0.jar b/src/android/lib/MobileAppTracker-3.11.4.jar
similarity index 50%
rename from src/android/lib/MobileAppTracker-3.11.0.jar
rename to src/android/lib/MobileAppTracker-3.11.4.jar
index 9ba2843..8d244e4 100644
Binary files a/src/android/lib/MobileAppTracker-3.11.0.jar and b/src/android/lib/MobileAppTracker-3.11.4.jar differ
diff --git a/src/ios/MATPlugin.h b/src/ios/MATPlugin.h
index 095dcfa..7ce63ea 100644
--- a/src/ios/MATPlugin.h
+++ b/src/ios/MATPlugin.h
@@ -21,7 +21,7 @@
 - (void)setDelegate:(CDVInvokedUrlCommand*)command;
 
 - (void)setPackageName:(CDVInvokedUrlCommand*)command;
-- (void)setSiteId:(CDVInvokedUrlCommand*)command;
+- (void)setSiteId:(CDVInvokedUrlCommand*)command DEPRECATED_MSG_ATTRIBUTE("Please use -(void)setPackageName:(CDVInvokedUrlCommand*)command instead.");
 
 - (void)setAppAdMeasurement:(CDVInvokedUrlCommand*)command;
 - (void)setAppleAdvertisingIdentifier:(CDVInvokedUrlCommand*)command;
@@ -63,7 +63,8 @@
 - (void)measureEventId:(CDVInvokedUrlCommand*)command;
 - (void)measureEvent:(CDVInvokedUrlCommand*)command;
 
-- (void)getMatId:(CDVInvokedUrlCommand *)command;
+- (void)getMatId:(CDVInvokedUrlCommand *)command DEPRECATED_MSG_ATTRIBUTE("Please use -(void)getTuneId:(CDVInvokedUrlCommand*)command instead.");;
+- (void)getTuneId:(CDVInvokedUrlCommand *)command;
 - (void)getOpenLogId:(CDVInvokedUrlCommand *)command;
 - (void)getIsPayingUser:(CDVInvokedUrlCommand *)command;
 
diff --git a/src/ios/MATPlugin.m b/src/ios/MATPlugin.m
index 49ccf29..2c792a0 100644
--- a/src/ios/MATPlugin.m
+++ b/src/ios/MATPlugin.m
@@ -445,7 +445,7 @@ - (void)setPackageName:(CDVInvokedUrlCommand*)command
 
 - (void)setSiteId:(CDVInvokedUrlCommand*)command
 {
-    NSLog(@"MATPlugin: setSiteId");
+    NSLog(@"MATPlugin: setSiteId: is deprecated, please use setPackageName: instead");
     
     NSArray *arguments = command.arguments;
     
@@ -1143,13 +1143,19 @@ - (void)setPreloadData:(CDVInvokedUrlCommand*)command
 
 - (void)getMatId:(CDVInvokedUrlCommand *)command
 {
-    NSLog(@"MATPlugin: getMatId");
+    NSLog(@"MATPlugin: getMatId: is deprecated, please use getTuneId: instead.");
+    [self getTuneId:command];
+}
+
+- (void)getTuneId:(CDVInvokedUrlCommand *)command
+{
+    NSLog(@"MATPlugin: getTuneId");
     
-    NSString *matId = [Tune matId];
+    NSString *tuneId = [Tune tuneId];
     
-    NSLog(@"MATPlugin: getMatId: %@", matId);
+    NSLog(@"MATPlugin: getTuneId: %@", tuneId);
     
-    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:matId];
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:tuneId];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
diff --git a/src/ios/MobileAppTracker-3.11.0.a b/src/ios/MobileAppTracker-3.11.0.a
deleted file mode 100644
index 15be577..0000000
Binary files a/src/ios/MobileAppTracker-3.11.0.a and /dev/null differ
diff --git a/src/ios/MobileAppTracker-3.15.0.a b/src/ios/MobileAppTracker-3.15.0.a
new file mode 100644
index 0000000..7f66be6
Binary files /dev/null and b/src/ios/MobileAppTracker-3.15.0.a differ
diff --git a/src/ios/MobileAppTracker.h b/src/ios/MobileAppTracker.h
index 1fdfb18..22cce9e 100644
--- a/src/ios/MobileAppTracker.h
+++ b/src/ios/MobileAppTracker.h
@@ -14,21 +14,25 @@
 #import "MATPreloadData.h"
 
 #import "Tune.h"
-#import "TuneAdView.h"
-#import "TuneBanner.h"
 #import "TuneEvent.h"
 #import "TuneEventItem.h"
-#import "TuneInterstitial.h"
 #import "TuneLocation.h"
 #import "TunePreloadData.h"
 
+#if TARGET_OS_IOS
 //#define MAT_USE_LOCATION
+
+#import "TuneAdView.h"
+#import "TuneBanner.h"
+#import "TuneInterstitial.h"
+#endif
+
 #ifdef MAT_USE_LOCATION
 #import <CoreLocation/CoreLocation.h>
 #import <CoreBluetooth/CoreBluetooth.h>
 #endif
 
-#define MATVERSION @"3.11.0"
+#define MATVERSION TUNEVERSION
 
 
 #pragma mark - enumerated types
@@ -144,12 +148,13 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  */
 + (void)checkForDeferredDeeplink:(id<MobileAppTrackerDelegate>)delegate DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
 
+#if !TARGET_OS_WATCH
 /*!
  Enable automatic measurement of app store in-app-purchase events. When enabled, your code should not explicitly measure events for successful purchases related to StoreKit to avoid event duplication.
  @param automate Automate IAP purchase event measurement. Defaults to NO.
  */
 + (void)automateIapEventMeasurement:(BOOL)automate DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
-
+#endif
 /*!
  * Set whether the MAT events should also be logged to the Facebook SDK. This flag is ignored if the Facebook SDK is not present.
  * @param logging Whether to send MAT events to FB as well
@@ -171,6 +176,7 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  */
 + (void)setExistingUser:(BOOL)existingUser DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
 
+#if !TARGET_OS_WATCH
 /*!
  Set the Apple Advertising Identifier available in iOS 6.
  @param appleAdvertisingIdentifier - Apple Advertising Identifier
@@ -183,6 +189,7 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  @param appleVendorIdentifier - Apple Vendor Identifier
  */
 + (void)setAppleVendorIdentifier:(NSUUID * )appleVendorIdentifier DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
+#endif
 
 /*!
  Sets the currency code.
@@ -204,6 +211,7 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  */
 + (void)setPackageName:(NSString *)packageName DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
 
+#if !TARGET_OS_WATCH
 /*!
  Specifies if the sdk should pull the Apple Advertising Identifier and Advertising Tracking Enabled properties from the device.
  YES/NO
@@ -211,13 +219,16 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  @param autoCollect YES will access the Apple Advertising Identifier and Advertising Tracking Enabled properties, defaults to YES.
  */
 + (void)setShouldAutoCollectAppleAdvertisingIdentifier:(BOOL)autoCollect DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
+#endif
 
+#if TARGET_OS_IOS
 /*!
  Specifies if the sdk should auto collect device location if location access has already been permitted by the end user.
  YES/NO
  @param autoCollect YES will auto collect device location, defaults to YES.
  */
 + (void)setShouldAutoCollectDeviceLocation:(BOOL)autoCollect DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
+#endif
 
 /*!
  Specifies if the sdk should auto detect if the iOS device is jailbroken.
@@ -226,6 +237,7 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  */
 + (void)setShouldAutoDetectJailbroken:(BOOL)autoDetect DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
 
+#if !TARGET_OS_WATCH
 /*!
  Specifies if the sdk should pull the Apple Vendor Identifier from the device.
  YES/NO
@@ -233,12 +245,13 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  @param autoGenerate YES will set the Apple Vendor Identifier, defaults to YES.
  */
 + (void)setShouldAutoGenerateAppleVendorIdentifier:(BOOL)autoGenerate DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
+#endif
 
 /*!
  Sets the site ID.
  @param siteId The MAT app/site ID of this mobile app.
  */
-+ (void)setSiteId:(NSString *)siteId DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
++ (void)setSiteId:(NSString *)siteId DEPRECATED_MSG_ATTRIBUTE("Please use +(void)setPackageName:(NSString *)packageName method from class Tune");
 
 /*!
  Set the TRUSTe Trusted Preference Identifier (TPID).
@@ -344,7 +357,7 @@ DEPRECATED_MSG_ATTRIBUTE("Please use class Tune instead") @interface MobileAppTr
  Get the MAT ID for this installation (mat_id).
  @return MAT ID
  */
-+ (NSString*)matId DEPRECATED_MSG_ATTRIBUTE("Please use corresponding method from class Tune");
++ (NSString*)matId DEPRECATED_MSG_ATTRIBUTE("Please use +(NSString*)tuneId method from class Tune");
 
 /*!
  Get the MAT log ID for the first app open (open_log_id).
@@ -771,6 +784,7 @@ DEPRECATED_MSG_ATTRIBUTE("Please use protocol TuneDelegate instead") @protocol M
  */
 - (void)mobileAppTrackerDidFailDeeplinkWithError:(NSError *)error DEPRECATED_MSG_ATTRIBUTE("Implement corresponding method of protocol TuneDelegate");
 
+#if USE_IAD
 /*!
  Delegate method called when an iAd is displayed and its parent view is faded in.
  */
@@ -786,6 +800,7 @@ DEPRECATED_MSG_ATTRIBUTE("Please use protocol TuneDelegate instead") @protocol M
  @param error Error object returned by the iAd framework.
  */
 - (void)mobileAppTrackerFailedToReceiveiAdWithError:(NSError *)error DEPRECATED_MSG_ATTRIBUTE("Implement corresponding method of protocol TuneDelegate");
+#endif
 
 @end
 
diff --git a/src/ios/Tune.h b/src/ios/Tune.h
index 8115729..dcdcec5 100644
--- a/src/ios/Tune.h
+++ b/src/ios/Tune.h
@@ -18,15 +18,18 @@
 @class TuneLocation;
 @class TunePreloadData;
 
+#if TARGET_OS_IOS
+//#define TUNE_USE_LOCATION
+
 #import "TuneAdMetadata.h"
+#endif
 
-//#define TUNE_USE_LOCATION
 #ifdef TUNE_USE_LOCATION
 #import <CoreLocation/CoreLocation.h>
 #import <CoreBluetooth/CoreBluetooth.h>
 #endif
 
-#define TUNEVERSION @"3.11.0"
+#define TUNEVERSION @"3.15.0"
 
 
 #pragma mark - enumerated types
@@ -131,11 +134,13 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  */
 + (void)checkForDeferredDeeplink:(id<TuneDelegate>)delegate;
 
+#if !TARGET_OS_WATCH
 /*!
- Enable automatic measurement of app store in-app-purchase events. When enabled, your code should not explicitly measure events for successful purchases related to StoreKit to avoid event duplication.
+ Enable automatic measurement of app store in-app-purchase events. When enabled, your code should not explicitly measure events for successful purchases related to StoreKit to avoid event duplication. If your app provides subscription IAP items, please make sure you enter the iTunes Shared Secret on the TUNE dashboard, otherwise Apple receipt validation will fail and the events will be marked as rejected.
  @param automate Automate IAP purchase event measurement. Defaults to NO.
  */
 + (void)automateIapEventMeasurement:(BOOL)automate;
+#endif
 
 /*!
  * Set whether the Tune events should also be logged to the Facebook SDK. This flag is ignored if the Facebook SDK is not present.
@@ -158,6 +163,7 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  */
 + (void)setExistingUser:(BOOL)existingUser;
 
+#if !TARGET_OS_WATCH
 /*!
  Set the Apple Advertising Identifier available in iOS 6.
  @param appleAdvertisingIdentifier - Apple Advertising Identifier
@@ -170,6 +176,7 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  @param appleVendorIdentifier - Apple Vendor Identifier
  */
 + (void)setAppleVendorIdentifier:(NSUUID * )appleVendorIdentifier;
+#endif
 
 /*!
  Sets the currency code.
@@ -191,6 +198,7 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  */
 + (void)setPackageName:(NSString *)packageName;
 
+#if !TARGET_OS_WATCH
 /*!
  Specifies if the sdk should pull the Apple Advertising Identifier and Advertising Tracking Enabled properties from the device.
  YES/NO
@@ -198,13 +206,16 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  @param autoCollect YES will access the Apple Advertising Identifier and Advertising Tracking Enabled properties, defaults to YES.
  */
 + (void)setShouldAutoCollectAppleAdvertisingIdentifier:(BOOL)autoCollect;
+#endif
 
+#if TARGET_OS_IOS
 /*!
  Specifies if the sdk should auto collect device location if location access has already been permitted by the end user.
  YES/NO
  @param autoCollect YES will auto collect device location, defaults to YES.
  */
 + (void)setShouldAutoCollectDeviceLocation:(BOOL)autoCollect;
+#endif
 
 /*!
  Specifies if the sdk should auto detect if the iOS device is jailbroken.
@@ -213,6 +224,7 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  */
 + (void)setShouldAutoDetectJailbroken:(BOOL)autoDetect;
 
+#if !TARGET_OS_WATCH
 /*!
  Specifies if the sdk should pull the Apple Vendor Identifier from the device.
  YES/NO
@@ -220,12 +232,13 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  @param autoGenerate YES will set the Apple Vendor Identifier, defaults to YES.
  */
 + (void)setShouldAutoGenerateAppleVendorIdentifier:(BOOL)autoGenerate;
+#endif
 
 /*!
  Sets the site ID.
  @param siteId The Tune app/site ID of this mobile app.
  */
-+ (void)setSiteId:(NSString *)siteId;
++ (void)setSiteId:(NSString *)siteId DEPRECATED_MSG_ATTRIBUTE("Please use +(void)setPackageName:(NSString *)packageName");
 
 /*!
  Set the TRUSTe Trusted Preference Identifier (TPID).
@@ -281,6 +294,17 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  */
 + (void)setAge:(NSInteger)userAge;
 
+#if !TARGET_OS_IOS
+
+/** @name Gender type constants */
+typedef NS_ENUM(NSInteger, TuneGender) {
+    TuneGenderMale       = 0,                // Gender type MALE. Equals 0.
+    TuneGenderFemale     = 1,                // Gender type FEMALE. Equals 1.
+    TuneGenderUnknown    = 2
+};
+
+#endif
+
 /*!
  Sets the user's gender.
  @param userGender user's gender, possible values TuneGenderMale, TuneGenderFemale, TuneGenderUnknown
@@ -318,11 +342,23 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
 
 /** @name Getter Methods */
 
+/*!
+ Get the Apple Advertising Identifier.
+ @return Apple Advertising Identifier (IFA)
+ */
++ (NSString*)appleAdvertisingIdentifier;
+
 /*!
  Get the MAT ID for this installation (mat_id).
  @return MAT ID
  */
-+ (NSString*)matId;
++ (NSString*)matId DEPRECATED_MSG_ATTRIBUTE("Please use +(NSString*)tuneId");
+
+/*!
+ Get the TUNE ID for this installation (mat_id).
+ @return TUNE ID
+ */
++ (NSString*)tuneId;
 
 /*!
  Get the Tune log ID for the first app open (open_log_id).
@@ -348,12 +384,12 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  when an iAd is received or failed to display. The Tune's delegate
  object will receive notifications when this happens.
  */
-+ (void)displayiAdInView:(UIView *)view;
++ (void)displayiAdInView:(UIView *)view DEPRECATED_MSG_ATTRIBUTE("Please use an alternate implementation. The iAd helper methods provided by this class will be removed in the next major release.");
 
 /*!
  Removes the currently displayed iAd, if any.
  */
-+ (void)removeiAd;
++ (void)removeiAd DEPRECATED_MSG_ATTRIBUTE("Please use an alternate implementation. The iAd helper methods provided by this class will be removed in the next major release.");
 
 #endif
 
@@ -750,21 +786,25 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  */
 - (void)tuneDidFailDeeplinkWithError:(NSError *)error;
 
+#if USE_IAD
+
 /*!
  Delegate method called when an iAd is displayed and its parent view is faded in.
  */
-- (void)tuneDidDisplayiAd;
+- (void)tuneDidDisplayiAd DEPRECATED_MSG_ATTRIBUTE("Please use an alternate implementation. The iAd helper methods provided by this class will be removed in the next major release.");
 
 /*!
  Delegate method called when an iAd failed to display and its parent view is faded out.
  */
-- (void)tuneDidRemoveiAd;
+- (void)tuneDidRemoveiAd DEPRECATED_MSG_ATTRIBUTE("Please use an alternate implementation. The iAd helper methods provided by this class will be removed in the next major release.");
 
 /*!
  Delegate method called to pass through an iAd display error.
  @param error Error object returned by the iAd framework.
  */
-- (void)tuneFailedToReceiveiAdWithError:(NSError *)error;
+- (void)tuneFailedToReceiveiAdWithError:(NSError *)error DEPRECATED_MSG_ATTRIBUTE("Please use an alternate implementation. The iAd helper methods provided by this class will be removed in the next major release.");
+
+#endif
 
 @end
 
@@ -780,6 +820,7 @@ typedef NS_ENUM(NSInteger, TuneErrorCode)
  */
 
 @protocol TuneRegionDelegate <NSObject>
+
 @optional
 
 /*!
diff --git a/src/ios/TuneInterstitial.h b/src/ios/TuneInterstitial.h
index 7b04f27..ef630df 100644
--- a/src/ios/TuneInterstitial.h
+++ b/src/ios/TuneInterstitial.h
@@ -54,14 +54,16 @@
 /*!
  Method to be called to display the next interstitial ad using the provided view controller. If a previously cached ad is not available, then a new ad will be requested and displayed.
  @param placement Ad view placement info, e.g. "menu_page", "highscores", "game-end"
+ @param viewController View Controller to be used to display the interstitial ad
  */
-- (void)showForPlacement:(NSString *)placement viewController:(UIViewController *)vc;
+- (void)showForPlacement:(NSString *)placement viewController:(UIViewController *)viewController;
 
 /*!
  Method to be called to display the next interstitial ad using the provided view controller. If a previously cached ad is not available, then a new ad will be requested and displayed.
  @param placement Ad view placement info, e.g. "menu_page", "highscores", "game-end"
+ @param viewController View Controller to be used to display the interstitial ad
  @param metadata Properties to be included when requesting ads for an ad view
  */
-- (void)showForPlacement:(NSString *)placement viewController:(UIViewController *)vc adMetadata:(TuneAdMetadata *)metadata;
+- (void)showForPlacement:(NSString *)placement viewController:(UIViewController *)viewController adMetadata:(TuneAdMetadata *)metadata;
 
 @end
diff --git a/src/wp8/MATPlugin.cs b/src/wp8/MATPlugin.cs
index d21fbad..1e4edb2 100644
--- a/src/wp8/MATPlugin.cs
+++ b/src/wp8/MATPlugin.cs
@@ -21,10 +21,20 @@ public void initTracker(string args)
             DispatchCommandResult(new PluginResult(PluginResult.Status.OK, "initTracker succeeded"));
         }
 
+        /// <summary>
+        /// Gets the mat identifier.
+        /// </summary>
+        /// <param name="args">Arguments.</param>
+        /// [Obsolete("getMATId is deprecated. Please use getTuneId instead.")]
         public void getMatId(string args) 
         { 
-            string matId = MobileAppTracker.Instance.GetMatId();
-            DispatchCommandResult(new PluginResult(PluginResult.Status.OK, "{\"" + matId + "\"}"));
+            getTuneId (args);
+        }
+
+        public void getTuneId(string args)
+        {
+            string tuneId = MobileAppTracker.Instance.GetMatId();
+            DispatchCommandResult(new PluginResult(PluginResult.Status.OK, "{\"" + tuneId + "\"}"));
         }
 
         public void getOpenLogId(string args) 
@@ -303,22 +313,10 @@ public void setUserName(string args)
 
         public void setAndroidId(string args) { return; } //Not supported
 
-        public void setAndroidIdMd5(string args) { return; } //Not supported
-
-        public void setAndroidIdSha1(string args) { return; } //Not supported
-
-        public void setAndroidIdSha256(string args) { return; } //Not supported
-
         public void setDeviceId(string args) { return; } //Not supported
 
-        public void setFacebookEventLogging(string args) { return; } //Not supported
-
         public void setGoogleAdvertisingId(string args) { return; } //Not supported
 
-        public void setEmailCollection(string args) { return; } //Not supported
-
-        public void checkForDeferredDeeplink(string args) { return; } //Not supported
-
         public void measureSession(string nothing)
         {
             MobileAppTracker.Instance.MeasureSession();
diff --git a/www/MATPlugin.js b/www/MATPlugin.js
index 92ab2ad..6bccdab 100644
--- a/www/MATPlugin.js
+++ b/www/MATPlugin.js
@@ -48,7 +48,13 @@ MATPlugin.prototype.automateIapEventMeasurement = function(automate) {
 
 MATPlugin.prototype.getMatId = function(success, failure) {
     console.log("MATPlugin.js: Calling getMatId");
-    exec(success, failure, "MATPlugin", "getMatId", []);
+    console.log("MATPlugin.js: getMatId() is deprecated. Please use getTuneId() instead.");
+    MATPlugin.prototype.getTuneId(success, failure);
+};
+
+MATPlugin.prototype.getTuneId = function(success, failure) {
+    console.log("MATPlugin.js: Calling getTuneId");
+    exec(success, failure, "MATPlugin", "getTuneId", []);
 };
 
 MATPlugin.prototype.getOpenLogId = function(success, failure) {