chore(): update changelog

4.3.3
fix(google-maps): HtmlInfoWindow should extend BaseClass #2034 (#2035 )
2026-02-04 00:06:19 +08:00 · 2017-11-01 05:01:25 -04:00 · 2017-11-01 05:01:21 -04:00 · 2017-11-01 05:00:52 -04:00 · 2017-10-19 14:24:37 -05:00 · 2017-10-18 03:25:01 -04:00
208 changed files with 18918 additions and 3744 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,7 +4,7 @@
 #### There are no rules, but here are a few things to consider:
 ###### Before you submit an issue:
 * Do a quick search to see if there are similar issues
-* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic 2, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/api/platform/Platform/#ready).
+* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/api/platform/Platform/#ready).
 * **Check that you are using the latest version of** `ionic-native`, you can install the latest version by running `npm i --save @ionic-native/core@latest`

 ###### Still having problems? submit an issue with the following details:
@@ -16,4 +16,4 @@
 ## Feature request?
 Have a plugin you'd like to see supported? Since Ionic Native is a thin wrapper around existing Cordova plugins, adding support for new plugins is as easy as creating a new wrapper for whatever plugin you'd like to add.

-Take a look at our [Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.
+Take a look at our [Developer Guide](https://github.com/ionic-team/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+**I'm submitting a ...**  (check one with "x")
+[ ] bug report
+[ ] feature request
+<!-- Please do not submit support requests here, use one of these channels: https://forum.ionicframework.com/ or https://ionicworldwide.herokuapp.com/ -->
+
+**Current behavior:**
+<!-- Describe how the bug manifests. -->
+
+**Expected behavior:**
+<!-- Describe what the behavior would be without the bug. -->
+
+**Steps to reproduce:**
+<!-- If you are able to illustrate the bug or feature request with an example, please provide steps to reproduce. -->
+
+**Related code:**
+
+```
+insert any relevant code here
+```
+
+**Other information:**
+<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
+
+**package.json info:**
+
+```json
+insert the content here
+```
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@ node_modules/
 .idea
 .tmp
 aot/
-dist/
 scripts/ionic-native-bower
+dist/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -103,7 +103,7 @@ Next, let's look at the `watchPosition` method.

 The `@Cordova` decorator has a few more options now.

-`observable` indicates that this method may call its callbacks multiple times, so `@Cordova` wraps it in an [`Observable`](https://github.com/driftyco/ionic-native#promises-and-observables) instead of a Promise.
+`observable` indicates that this method may call its callbacks multiple times, so `@Cordova` wraps it in an [`Observable`](https://github.com/ionic-team/ionic-native#promises-and-observables) instead of a Promise.

 `callbackOrder` refers to the method signature of the underlying Cordova plugin, and tells Ionic Native which arguments are the callbacks to map to the wrapping Promise or Observable.  In this case, the signature is [`watchPosition(success, error, options)`](https://github.com/apache/cordova-plugin-geolocation#navigatorgeolocationwatchposition), so we need to tell `@Cordova` that the callbacks are the first arguments, not the last arguments.  For rare cases, you can also specify the options `successIndex` and `errorIndex` to indicate where in the argument list the callbacks are located.

@@ -209,4 +209,13 @@ Example:
 someMethod(): Promise<any> {
  // anything here will only run if the plugin is available
 }
+```
+
+#### CordovaFunctionOverride
+Wrap a stub function in a call to a Cordova plugin, checking if both Cordova and the required plugin are installed.
+
+Example:
+```ts
+@CordovaFunctionOverride()
+someMethod(): Observable<any> { return; }
 ```
--- a/README.md
+++ b/README.md
@@ -1,24 +1,24 @@
-[![Circle CI](https://circleci.com/gh/driftyco/ionic-native.svg?style=shield)](https://circleci.com/gh/driftyco/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) ![](https://img.shields.io/npm/v/@ionic-native/core.svg)
+[![Circle CI](https://circleci.com/gh/ionic-team/ionic-native.svg?style=shield)](https://circleci.com/gh/ionic-team/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) ![](https://img.shields.io/npm/v/@ionic-native/core.svg)


 # Ionic Native

-Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic 2](http://ionicframework.com/) mobile app easy.
+Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic](https://ionicframework.com/) mobile app easy.

 Ionic Native wraps plugin callbacks in a Promise or Observable, providing a common interface for all plugins and making it easy to use plugins with Angular change detection.

 ## Installation

 Run following command to install Ionic Native in your project.
-```
+```bash
 npm install @ionic-native/core --save
 ```

-You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](http://ionicframework.com/docs/native/) for complete instructions on how to add and use the plugins.
+You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](https://ionicframework.com/docs/native/) for complete instructions on how to add and use the plugins.

 ## Documentation

-For the full Ionic Native documentation, please visit [http://ionicframework.com/docs/native/](http://ionicframework.com/docs/native/).
+For the full Ionic Native documentation, please visit [https://ionicframework.com/docs/native/](https://ionicframework.com/docs/native/).

 ### Basic Usage

@@ -52,38 +52,28 @@ import { NgZone } from '@angular/core';
@Component({ ... })
 export class MyComponent {

-  constructor(private geolocation: Geolocation, private platform: Platform, private ngZone: NgZone) {
+  constructor(private geolocation: Geolocation, private platform: Platform) {

    platform.ready().then(() => {

      // get position
      geolocation.getCurrentPosition().then(pos => {
-
        console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-
      });


      // watch position
      const watch = geolocation.watchPosition().subscribe(pos => {
-
        console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-
-        // Currently, observables from Ionic Native plugins
-        // need to run inside of zone to trigger change detection
-        ngZone.run(() => {
-          this.position = pos;
-        })
-
+        this.position = pos;
      });

      // to stop watching
      watch.unsubscribe();
-
    });
-
+    
  }
-
+  
 }
 ```

@@ -95,13 +85,13 @@ To do this, you need to provide a mock implementation of the plugins you wish to

 First import the `Camera` class in your `src/app/app.module.ts` file:

-```ts
+```typescript
 import { Camera } from '@ionic-native/camera';
 ```

 Then create a new class that extends the `Camera` class with a mock implementation:

-```ts
+```typescript
 class CameraMock extends Camera {
  getPicture(options) {
    return new Promise((resolve, reject) => {
@@ -113,7 +103,7 @@ class CameraMock extends Camera {

 Finally, override the previous `Camera` class in your `providers` for this module:

-```ts
+```typescript
 providers: [
  { provide: Camera, useClass: CameraMock }
 ]
@@ -121,8 +111,9 @@ providers: [

 Here's the full example:

-```ts
+```typescript
 import { NgModule, ErrorHandler } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
 import { MyApp } from './app.component';
 import { HomePage } from '../pages/home/home';
@@ -143,6 +134,7 @@ class CameraMock extends Camera {
    HomePage
  ],
  imports: [
+    BrowserModule,
    IonicModule.forRoot(MyApp)
  ],
  bootstrap: [IonicApp],
@@ -163,24 +155,24 @@ export class AppModule {}

 Spent way too long diagnosing an issue only to realize a plugin wasn't firing or installed? Ionic Native lets you know what the issue is and how you can resolve it.

-![img](http://ionic-io-assets.s3.amazonaws.com/ionic-native-console.png)
+![img](https://ionic-io-assets.s3.amazonaws.com/ionic-native-console.png)


 ## Plugin Missing?
-Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:
+Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/ionic-team/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:

-## Ionic 1/Angular 1 support
+## Ionic v1 (AngularJS, Angular 1.x) support

-Ionic Native 3.x supports Ionic 2.x and above. For Ionic/Angular 1 support, please use version 2 of Ionic Native. See the [2.x README](https://github.com/driftyco/ionic-native/blob/8cd648db5cddd7bdbe2bd78839b19c620cc8c04c/README.md) for usage information.
+For Ionic v1 (AngularJS, Angular 1.x) support, please use version 2 of Ionic Native. See the [2.x README](https://github.com/ionic-team/ionic-native/blob/v2.x/README.md) for usage information.

 # Credits

-Ibby Hadeed - [@ihadeed](http://github.com/ihadeed)
+Ibby Hadeed - [@ihadeed](https://github.com/ihadeed)

-Tim Lancina - [@timlancina](http://twitter.com/timlancina)
+Tim Lancina - [@timlancina](https://twitter.com/timlancina)

 Mike Hartington - [@mhartington](https://twitter.com/mhartington)

-Max Lynch - [@maxlynch](http://twitter.com/maxlynch)
+Max Lynch - [@maxlynch](https://twitter.com/maxlynch)

 Rob Wormald - [@robwormald](https://twitter.com/robwormald)
--- a/circle.yml
+++ b/circle.yml
@@ -7,12 +7,15 @@ jobs:
    steps:
      - checkout
      - restore_cache:
-         key: ionic-site
+         key: ionic-site-{{ checksum "package.json" }}
      - run:
         name: Prepare ionic-site repo
-         command: ./scripts/docs/prepare.sh
+         command: |
+           if [ "${CIRCLE_BRANCH}" == "master" ]; then
+             ./scripts/docs/prepare.sh
+           fi
      - save_cache:
-         key: ionic-site
+         key: ionic-site-{{ checksum "package.json" }}
         paths:
         - ~/ionic-site/
      - restore_cache:
@@ -27,6 +30,16 @@ jobs:
      - run:
          name: Run tslint
          command: npm run lint
+      - run: bash ./scripts/git/config.sh
+      - run:
+          name: Build Ionic Native
+          command: npm run build:core && ./node_modules/.bin/tsc
+      - run:
+          name: Generate README files to ensure docs are valid
+          command: npm run readmes
+      - run:
+          name: Run tests
+          command: npm test
      - add_ssh_keys
      - deploy:
          name: Update docs
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -34,14 +34,16 @@ gulp.task('plugin:create', () => {

    const src = flags.m ? './scripts/templates/wrap-min.tmpl':'./scripts/templates/wrap.tmpl',
      pluginName = flags.n,
-      pluginNameSpaced = pluginName.replace(/(?!^)([A-Z])/g, ' $1');
+      spaced = pluginName.replace(/(?!^)([A-Z])/g, ' $1'),
+      kebabCase = _.kebabCase(pluginName);

    return gulp.src(src)
-      .pipe(replace('$PluginName', pluginName))
-      .pipe(replace('$Plugin_Name', pluginNameSpaced))
-      .pipe(replace('$pluginName', _.lowerFirst(pluginName)))
+      .pipe(replace('{{ PluginName }}', pluginName))
+      .pipe(replace('{{ Plugin_Name }}', spaced))
+      .pipe(replace('{{ pluginName }}', _.lowerFirst(pluginName)))
+      .pipe(replace('{{ plugin-name }}', kebabCase))
      .pipe(rename('index.ts'))
-      .pipe(gulp.dest('./src/@ionic-native/plugins/' + _.kebabCase(pluginName)));
+      .pipe(gulp.dest('./src/@ionic-native/plugins/' + kebabCase));

  } else {
    console.log("Usage is: gulp plugin:create -n PluginName");
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -0,0 +1,55 @@
+"use strict";
+
+module.exports = config => {
+
+  const conf = {
+    frameworks: [
+      'jasmine',
+      'karma-typescript'
+    ],
+
+    plugins: [
+      'karma-typescript',
+      'karma-jasmine',
+      'karma-phantomjs-launcher'
+    ],
+
+    preprocessors: {
+      'src/**/*.ts': ['karma-typescript']
+    },
+
+    karmaTypescriptConfig: {
+      bundlerOptions: {
+        entrypoints: /\.spec\.ts$/,
+        transforms: [
+          require("karma-typescript-es6-transform")()
+        ]
+      },
+      compilerOptions: {
+        lib: ['es2015', 'dom'],
+        paths: {
+          "@ionic-native/core": ["./src/@ionic-native/core"]
+        },
+        baseUrl: '.'
+      }
+    },
+
+    files: [
+      { pattern: 'src/**/*.ts', included: true, watched: true }
+    ],
+
+    reporters: ['progress'],
+
+    port: 9876,
+    colors: true,
+    logLevel: config.INFO,
+    autoWatch: true,
+    browsers: [
+      'PhantomJS'
+    ],
+    singleRun: false
+  };
+
+  config.set(conf);
+
+};
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,17 +1,22 @@
 {
  "name": "ionic-native",
-  "version": "3.6.0",
+  "version": "4.3.3",
  "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
+  "homepage": "https://ionicframework.com/",
+  "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
  "license": "MIT",
  "devDependencies": {
-    "@angular/compiler": "4.0.0",
-    "@angular/compiler-cli": "4.0.0",
-    "@angular/core": "4.0.0",
+    "@angular/compiler": "4.4.4",
+    "@angular/compiler-cli": "4.4.4",
+    "@angular/core": "4.4.4",
+    "@types/cordova": "0.0.34",
+    "@types/jasmine": "^2.5.51",
+    "@types/node": "^7.0.27",
    "canonical-path": "0.0.2",
-    "child-process-promise": "2.2.0",
-    "conventional-changelog-cli": "1.2.0",
+    "child-process-promise": "2.2.1",
+    "conventional-changelog-cli": "1.3.1",
    "cpr": "2.0.2",
-    "cz-conventional-changelog": "1.2.0",
+    "cz-conventional-changelog": "2.0.0",
    "decamelize": "1.2.0",
    "dgeni": "0.4.7",
    "dgeni-packages": "0.16.10",
@@ -21,18 +26,25 @@
    "gulp-rename": "1.2.2",
    "gulp-replace": "0.5.4",
    "gulp-tslint": "6.1.2",
+    "jasmine-core": "^2.6.1",
+    "karma": "^1.7.0",
+    "karma-cli": "^1.0.1",
+    "karma-jasmine": "^1.1.0",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "karma-typescript": "^3.0.1",
+    "karma-typescript-es6-transform": "^1.0.0",
    "lodash": "4.17.4",
-    "minimist": "1.1.3",
+    "minimist": "1.2.0",
    "node-html-encoder": "0.0.2",
-    "q": "1.4.1",
+    "q": "1.5.0",
    "queue": "4.2.1",
-    "rimraf": "2.5.4",
-    "rxjs": "5.1.1",
+    "rimraf": "2.6.1",
+    "rxjs": "5.4.3",
    "semver": "5.3.0",
    "tslint": "3.15.1",
-    "tslint-ionic-rules": "0.0.7",
-    "typescript": "2.2.1",
-    "zone.js": "^0.8.4"
+    "tslint-ionic-rules": "0.0.8",
+    "typescript": "2.3.4",
+    "zone.js": "0.8.18"
  },
  "scripts": {
    "start": "npm run test:watch",
@@ -44,7 +56,17 @@
    "shipit": "npm run build && gulp readmes && npm run npmpub",
    "npmpub": "node scripts/build/publish.js",
    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "postchangelog": "git commit -am \"chore(): update changelog\""
+    "postchangelog": "git commit -am \"chore(): update changelog\"",
+    "test": "karma start karma.conf.js --single-run",
+    "test:watch": "karma start karma.conf.js",
+    "readmes": "gulp readmes"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ionic-team/ionic-native.git"
+  },
+  "bugs": {
+    "url": "https://github.com/ionic-team/ionic-native/issues"
  },
  "config": {
    "commitizen": {
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -19,7 +19,7 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native
 // dependency versions
 const ANGULAR_VERSION = '*',
  RXJS_VERSION = '^5.0.1',
-  MIN_CORE_VERSION = '^3.1.0',
+  MIN_CORE_VERSION = '^4.2.0',
  IONIC_NATIVE_VERSION = require(path.resolve(ROOT, 'package.json')).version;

 // package dependencies
@@ -52,6 +52,16 @@ const PLUGINS = fs.readdirSync(PLUGINS_PATH);

 // Build specific list of plugins to build from arguments, if any
 let pluginsToBuild = process.argv.slice(2);
+let ignoreErrors = false;
+let errors = [];
+
+const index = pluginsToBuild.indexOf('ignore-errors');
+if (index > -1) {
+  ignoreErrors = true;
+  pluginsToBuild.splice(index, 1);
+  console.log('Build will continue even if errors were thrown. Errors will be printed when build finishes.');
+}
+
 if (!pluginsToBuild.length) {
  pluginsToBuild = PLUGINS;
 }
@@ -102,10 +112,16 @@ const addPluginToQueue = pluginName => {
        exec(`${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`, (err, stdout, stderr) => {

          if (err) {
-            // oops! something went wrong.
-            callback(`\n\nBuilding ${pluginName} failed.`);
-            console.log(err);
-            return;
+
+            if (!ignoreErrors) {
+              // oops! something went wrong.
+              console.log(err);
+              callback(`\n\nBuilding ${pluginName} failed.`);
+              return;
+            } else {
+              errors.push(err);
+            }
+
          }

          // we're done with this plugin!
@@ -125,7 +141,17 @@ pluginsToBuild.forEach(addPluginToQueue);
 QUEUE.start((err) => {

  if (err) {
-    console.log('Error building plugins. ', err);
+    console.log('Error building plugins.');
+    console.log(err);
+    process.stderr.write(err);
+    process.exit(1);
+  } else if (errors.length) {
+    errors.forEach(e => {
+      console.log(e.message) && console.log('\n');
+      process.stderr.write(err);
+    });
+    console.log('Build complete with errors');
+    process.exit(1);
  } else {
    console.log('Done processing plugins!');
  }
--- a/scripts/build/core-package.json
+++ b/scripts/build/core-package.json
@@ -9,6 +9,6 @@
  "peerDependencies": {},
  "repository": {
    "type": "git",
-    "url": "https://github.com/driftyco/ionic-native.git"
+    "url": "https://github.com/ionic-team/ionic-native.git"
  }
 }
--- a/scripts/build/plugin-package.json
+++ b/scripts/build/plugin-package.json
@@ -9,6 +9,6 @@
  "peerDependencies": {},
  "repository": {
    "type": "git",
-    "url": "https://github.com/driftyco/ionic-native.git"
+    "url": "https://github.com/ionic-team/ionic-native.git"
  }
 }
--- a/scripts/build/tsconfig-core.json
+++ b/scripts/build/tsconfig-core.json
@@ -13,7 +13,8 @@
    "skipLibCheck": true,
    "lib": ["es2015", "dom"],
    "sourceMap": true,
-    "inlineSources": true
+    "inlineSources": true,
+    "noImplicitAny": true
  },
  "files": [
    "../../src/@ionic-native/core/index.ts"
--- a/scripts/build/tsconfig-plugin.json
+++ b/scripts/build/tsconfig-plugin.json
@@ -16,7 +16,8 @@
    "skipLibCheck": true,
    "lib": ["es2015", "dom"],
    "sourceMap": true,
-    "inlineSources": true
+    "inlineSources": true,
+    "noImplicitAny": true
  },
  "files": []
 }
--- a/scripts/ci-tests.js
+++ b/scripts/ci-tests.js
@@ -0,0 +1,65 @@
+const exec = require('child-process-promise').exec;
+let diff;
+exec(`git branch | grep \\* | cut -d ' ' -f2`)
+  .then(output => {
+    if (output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    const branch = output.stdout.trim();
+
+    if (branch !== 'master') {
+
+      console.log('Merging master branch in ...');
+      // not on master branch
+      // let's test the changes that were made
+      return exec(`git merge origin master`);
+    }
+  })
+  .then((output) => {
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+    console.log('Checking for differences ...');
+    return exec(`git diff --name-status origin master`)
+  })
+  .then((output) => {
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    diff = output.stdout;
+    diff = diff.replace(/A\s+/g, '');
+    diff = diff.match(/src\/@ionic-native\/plugins\/([a-zA-Z0-9\-]+)\/index\.ts/g);
+
+    if (!diff) process.exit();
+
+    console.log(`${ diff.length } plugins were modified. We will now build them to verify they still work.`);
+
+    return exec('npm run build:core --silent');
+  })
+  .then((output) => {
+
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    console.log('Built core library successfully ...');
+    console.log('Building plugins ...');
+
+    diff = diff.map(text => text.replace('src/@ionic-native/plugins/', '').replace('/index.ts', ''));
+
+    return exec(`npm run build:modules ${diff.join(' ')} --silent`);
+  })
+  .then((output) => {
+    if (output && output.stderr) {
+      console.log(output.stderr);
+      process.exit(1);
+    }
+    console.log(output.stdout);
+    process.exit();
+  })
+  .catch(e => {
+    console.log(e.message || e);
+    process.exit(1);
+  });
--- a/scripts/docs/dgeni-readmes-config.js
+++ b/scripts/docs/dgeni-readmes-config.js
@@ -41,7 +41,7 @@ module.exports = currentVersion => {
        docTypes: ['class'],
        getOutputPath: doc => doc.originalModule.replace(config.pluginDir + '/', '')
          .replace('/plugins', '')
-          .replace('/index', '/README.md')
+          .replace(/\/index$/, '/README.md')
      }];

    })
--- a/scripts/docs/processors/jekyll.js
+++ b/scripts/docs/processors/jekyll.js
@@ -22,8 +22,24 @@ module.exports = function jekyll(renderDocsProcessor) {
        doc.URL = doc.outputPath.replace('docs//', 'docs/')
          .replace('/index.md', '')
          .replace('content/', '');
+        // add trailing slash to plugin pages
+        if(!doc.URL.endsWith("/") && !doc.URL.endsWith(".html")) {
+          doc.URL = doc.URL+'/'; 
+        }
      });

+      const betaDocs = [];
+
+      docs = docs.filter(doc => {
+        if (doc.beta === true) {
+          betaDocs.push(doc);
+          return false;
+        }
+        return true;
+      });
+
+      docs = docs.concat(betaDocs);
+
      // add side menu
      docs.push({
        docType: 'nativeMenu',
--- a/scripts/docs/tag-defs/tag-defs.js
+++ b/scripts/docs/tag-defs/tag-defs.js
@@ -6,5 +6,6 @@ module.exports = [
  {'name': 'usage'},
  {'name': 'hidden'}, // hide from docs
  {'name': 'classes'}, // related classes
-  {'name': 'interfaces'} // related interfaces
+  {'name': 'interfaces'}, // related interfaces
+  {'name': 'paid', transforms: (doc, tag, value) => typeof value !== 'undefined'} // paid plugin, set value to true
 ];
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -44,7 +44,7 @@ docType: "<$ doc.docType $>"
 <@- endmacro -@>

 <@- macro githubViewLink(doc) -@>
-<a href="https://github.com/driftyco/ionic-native/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
+<a href="https://github.com/ionic-team/ionic-native/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
 <@- endmacro -@>

 <@- macro paramTable(params, isDirective) -@>
@@ -127,7 +127,7 @@ docType: "<$ doc.docType $>"

 <@- macro documentClass(doc) @>
 <@- if doc.statics.length -@>
-<h2>Static Members</h2>
+<h2><a class="anchor" name="static-members" href="#static-members"></a>Static Members</h2>
 <@ for method in doc.statics -@>
 <$ documentMethod(method) $>
 <@ endfor -@>
@@ -136,7 +136,7 @@ docType: "<$ doc.docType $>"
 <# --- methods in class --- #>
 <@- if doc.members and doc.members.length @>

-<h2>Instance Members</h2>
+<h2><a class="anchor" name="instance-members" href="#instance-members"></a>Instance Members</h2>
 <@ for method in doc.members -@>
 <$ documentMethod(method) $>
 <@- endfor @>
@@ -147,9 +147,12 @@ docType: "<$ doc.docType $>"
  <@- if doc.beta == true -@>
    <span class="beta" title="beta">&beta;</span>
  <@- endif -@>
+  <@- if doc.paid == true -@>
+    <span class="paid" title="paid">Paid</span>
+  <@- endif -@>
 </h1>

-<a class="improve-v2-docs" href="http://github.com/driftyco/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
+<a class="improve-v2-docs" href="http://github.com/ionic-team/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
  Improve this doc
 </a>

@@ -163,23 +166,36 @@ docType: "<$ doc.docType $>"
  href="<$ prop.repo $>/issues">plugin repo</a>.
 </p>
 <@ endif @>
+<@ if doc.paid == true @>
+<p class="paid-notice">
+  This plugin might require a paid license, or might take a share of your app's earnings.
+  Check the <a target="_blank" rel="nofollow" href="<$ prop.repo $>">plugin's repo</a> for more information.
+</p>
+<@ endif @>
+
+<# --- Plugin description --- #>
+<$ doc.description | marked $>

-<# --- Install commands --- #>
-<pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add --save <$ prop.plugin $><@ endif @>
-$ npm install --save @ionic-native/<$ doc.npmId $>
-</code></pre>
 <p>Repo:
  <a href="<$ prop.repo $>">
    <$ prop.repo $>
  </a>
 </p>

-<# --- Plugin description --- #>
-<$ doc.description | marked $>
+<# --- Install commands --- #>
+<h2><a class="anchor" name="installation" href="#installation"></a>Installation</h2>
+<ol class="installation">
+  <li>Install the Cordova and Ionic Native plugins:<br>
+    <pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install | replace('<', '&lt;').replace('>', '&gt;') $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
+$ npm install --save @ionic-native/<$ doc.npmId $>
+</code></pre>
+  </li>
+  <li><a href="https://ionicframework.com/docs/native/#Add_Plugins_to_Your_App_Module">Add this plugin to your app's module</a></li>
+</ol>

 <# --- Plugin supported platforms --- #>
 <@ if prop.platforms @>
-<h2>Supported platforms</h2>
+<h2><a class="anchor" name="platforms" href="#platforms"></a>Supported platforms</h2>
 <ul>
  <@ for platform in prop.platforms -@>
  <li><$ platform $></li>
@@ -191,13 +207,13 @@ $ npm install --save @ionic-native/<$ doc.npmId $>

 <# --- Plugin usage --- #>
 <@ if doc.usage @>
-<h2>Usage</h2>
+<h2><a class="anchor" name="usage" href="#usage"></a>Usage</h2>
 <$ doc.usage | marked $>
 <@ endif @>

 <# --- Plugin attributes --- #>
 <@- if doc.properties -@>
-<h2>Attributes:</h2>
+<h2><a class="anchor" name="attributes" href="#attributes"></a>Attributes:</h2>
 <table class="table" style="margin:0;">
  <thead>
  <tr>
--- a/scripts/docs/templates/native_menu.template.html
+++ b/scripts/docs/templates/native_menu.template.html
@@ -4,11 +4,7 @@
 <li class="capitalize {% if page.id == 'mocking' %}active{% endif %}">
  <a href="/docs/native/browser.html">Browser Usage</a>
 </li>
-<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
+<@- for doc in docs @><@ if doc.URL and doc.private != true @>
 <li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
-  <a href="/<$ doc.URL $>"><$ doc.name $></a>
-</li><@ endif @><@ endfor @>
-<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta == true @>
-<li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
-  <a href="/<$ doc.URL $>"><$ doc.name $> <span class="beta">&beta;</span></a>
+  <a href="/<$ doc.URL $>"><$ doc.name $><@ if doc.paid == true @> <span class="paid">Paid</span><@ endif @><@ if doc.beta == true @> <span class="beta">&beta;</span><@ endif @></a>
 </li><@ endif @><@ endfor @>
--- a/scripts/docs/templates/readme.template.md
+++ b/scripts/docs/templates/readme.template.md
@@ -1,4 +1,4 @@
-<a style="float:right;font-size:12px;" href="http://github.com/driftyco/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
+<a style="float:right;font-size:12px;" href="http://github.com/ionic-team/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
  Improve this doc
 </a>

@@ -16,7 +16,7 @@
 <@ for prop in doc.decorators[0].argumentInfo @>

 ```
-$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plugin $><@ endif @>
+$ <@ if prop.install @><$ prop.install $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
 $ npm install --save @ionic-native/<$ doc.npmId $>
 ```

--- a/scripts/docs/update_docs.sh
+++ b/scripts/docs/update_docs.sh
@@ -31,11 +31,11 @@ function run {
  if [ $CHANGED -eq 0 ];
  then
    echo "-- No changes detected for the following commit, docs not updated."
-    echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
+    echo "https://github.com/ionic-team/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
  else
    git config --global user.email "hi@ionicframework.com"
    git config --global user.name "Ionitron"
-    git commit -am "Automated build of native docs driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
+    git commit -am "Automated build of native docs ionic-team/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
    # in case a different commit was pushed to ionic-site during doc/demo gen,
    # try to rebase around it before pushing
    git fetch
--- a/scripts/docs/update_readmes.sh
+++ b/scripts/docs/update_readmes.sh
@@ -18,12 +18,12 @@ function run {
  if [ -z "$CHANGED" ];
  then
    echo "-- No changes detected for the following commit, docs not updated."
-    echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
+    echo "https://github.com/ionic-team/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
  else
    git config --global user.email "hi@ionicframework.com"
    git config --global user.name "Ionitron"
    git add -A
-    git commit -am "Automated build of native readmes for driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
+    git commit -am "Automated build of native readmes for ionic-team/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
    # in case a different commit was pushed to ionic-site during doc/demo gen,
    # try to rebase around it before pushing
    git fetch
--- a/scripts/git/clone.sh
+++ b/scripts/git/clone.sh
@@ -21,7 +21,7 @@ function run {
  git config --global user.email "hi@ionicframework.com"
  git config --global user.name "Ionitron"

-  git clone git@github.com:driftyco/$REPOSITORY.git $DIRECTORY $ARGS
+  git clone git@github.com:ionic-team/$REPOSITORY.git $DIRECTORY $ARGS
  cd $DIRECTORY
  git fetch origin --tags
  cd ../
--- a/scripts/git/config.sh
+++ b/scripts/git/config.sh
@@ -0,0 +1,2 @@
+git config --global user.email "hi@ionicframework.com"
+git config --global user.name "Ionitron"
--- a/scripts/templates/wrap-min.tmpl
+++ b/scripts/templates/wrap-min.tmpl
@@ -2,15 +2,15 @@ import { Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';

 /**
- * @name $Plugin_Name
+ * @name {{ Plugin_Name }}
 * @description
 *
 * @usage
- * ```
- * import { $PluginName } from 'ionic-native';
+ * ```typescript
+ * import { {{ PluginName }} } from '@ionic-native/{{ plugin-name }}';
 *
 *
- * constructor(private $pluginName: $PluginName) { }
+ * constructor(private {{ pluginName }}: {{ PluginName }}) { }
 *
 * ...
 *
@@ -18,13 +18,13 @@ import { Injectable } from '@angular/core';
 * ```
 */
@Plugin({
-  pluginName: '$PluginName',
+  pluginName: '{{ PluginName }}',
  plugin: '',
  pluginRef: '',
  repo: '',
  platforms: []
 })
@Injectable()
-export class $PluginName extends IonicNativePlugin {
+export class {{ PluginName }} extends IonicNativePlugin {

 }
--- a/scripts/templates/wrap.tmpl
+++ b/scripts/templates/wrap.tmpl
@@ -10,33 +10,33 @@
 * - Remove this note
 *
 */
-import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
+import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';

 /**
- * @name $Plugin_Name
+ * @name {{ Plugin_Name }}
 * @description
 * This plugin does something
 *
 * @usage
- * ```
- * import { $PluginName } from 'ionic-native';
+ * ```typescript
+ * import { {{ PluginName }} } from '@ionic-native/{{ plugin-name }}';
 *
 *
- * constructor(private $pluginName: $PluginName) { }
+ * constructor(private {{ pluginName }}: {{ PluginName }}) { }
 *
 * ...
 *
 *
- * this.$pluginName.functionName('Hello', 123)
+ * this.{{ pluginName }}.functionName('Hello', 123)
 *   .then((res: any) => console.log(res))
 *   .catch((error: any) => console.error(error));
 *
 * ```
 */
@Plugin({
-  pluginName: '$PluginName',
+  pluginName: '{{ PluginName }}',
  plugin: '', // npm package name, example: cordova-plugin-camera
  pluginRef: '', // the variable reference to call the plugin, example: navigator.geolocation
  repo: '', // the github repository URL for the plugin
@@ -44,7 +44,7 @@ import { Observable } from 'rxjs/Observable';
  install: '', // OPTIONAL install command, in case the plugin requires variables
 })
@Injectable()
-export class $PluginName extends IonicNativePlugin {
+export class {{ PluginName }} extends IonicNativePlugin {

  /**
   * This function does something
--- a/src/@ionic-native/core/bootstrap.ts
+++ b/src/@ionic-native/core/bootstrap.ts
@@ -1,5 +1,3 @@
-declare var window;
-
 export function checkReady() {
  const DEVICE_READY_TIMEOUT = 5000;

@@ -16,7 +14,7 @@ export function checkReady() {
  });

  setTimeout(() => {
-    if (!didFireReady && window.cordova) {
+    if (!didFireReady && !!window.cordova) {
      console.warn(`Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`);
    }
  }, DEVICE_READY_TIMEOUT);
--- a/src/@ionic-native/core/decorators.spec.ts
+++ b/src/@ionic-native/core/decorators.spec.ts
@@ -0,0 +1,277 @@
+import 'core-js';
+import { Plugin, Cordova, CordovaProperty, CordovaCheck, CordovaInstance, InstanceProperty } from './decorators';
+import { IonicNativePlugin } from './ionic-native-plugin';
+import { ERR_CORDOVA_NOT_AVAILABLE, ERR_PLUGIN_NOT_INSTALLED } from './plugin';
+import { Observable } from 'rxjs/Observable';
+
+declare const window: any;
+
+class TestObject {
+
+  constructor(public _objectInstance: any) {}
+
+  @InstanceProperty
+  name: string;
+
+  @CordovaInstance({ sync: true })
+  pingSync(): string { return; }
+
+  @CordovaInstance()
+  ping(): Promise<any> { return; }
+
+}
+
+@Plugin({
+  pluginName: 'TestPlugin',
+  pluginRef: 'testPlugin',
+  repo: '',
+  plugin: 'cordova-plugin-my-plugin',
+  platforms: ['Android', 'iOS']
+})
+class TestPlugin extends IonicNativePlugin {
+
+  @CordovaProperty
+  name: string;
+
+  @Cordova({ sync: true })
+  pingSync(): string { return; }
+
+  @Cordova()
+  ping(): Promise<string> { return; }
+
+  @CordovaCheck()
+  customPing(): Promise<string> {
+    return Promise.resolve('pong');
+  }
+
+  create(): TestObject {
+    return new TestObject(TestPlugin.getPlugin().create());
+  }
+
+  @Cordova({
+    destruct: true
+  })
+  destructPromise(): Promise<any> { return; }
+
+  @Cordova({
+    destruct: true,
+    observable: true
+  })
+  destructObservable(): Observable<any> { return; }
+
+}
+
+function definePlugin() {
+  (window as any).testPlugin = {
+    name: 'John Smith',
+    ping: (success: Function, error: Function) => success('pong'),
+    pingSync: () => 'pong',
+    create: function TestObject() {
+      this.pingSync = () => 'pong';
+      this.ping = (success: Function, error: Function) => success('pong');
+      this.name = 'John Smith';
+      return this;
+    },
+    destructPromise: (success: Function) => success('hello', 'world'),
+    destructObservable: (success: Function) => success('hello', 'world')
+  };
+}
+
+describe('Regular Decorators', () => {
+
+  let plugin: TestPlugin;
+
+  beforeEach(() => {
+    plugin = new TestPlugin();
+    definePlugin();
+  });
+
+  describe('Plugin', () => {
+
+    it('should set pluginName', () => {
+      expect(TestPlugin.getPluginName()).toEqual('TestPlugin');
+    });
+
+    it('should set pluginRef', () => {
+      expect(TestPlugin.getPluginRef()).toEqual('testPlugin');
+    });
+
+    it('should return original plugin object', () => {
+      expect(TestPlugin.getPlugin()).toEqual(window.testPlugin);
+    });
+
+    it('should return supported platforms', () => {
+      expect(TestPlugin.getSupportedPlatforms()).toEqual(['Android', 'iOS']);
+    });
+
+  });
+
+  describe('Cordova', () => {
+
+    it('should do a sync function', () => {
+      expect(plugin.pingSync()).toEqual('pong');
+    });
+
+    it('should do an async function', (done: Function) => {
+      plugin.ping()
+        .then(res => {
+          expect(res).toEqual('pong');
+          done();
+        })
+        .catch(e => {
+          expect(e).toBeUndefined();
+          done('Method should have resolved');
+        });
+    });
+
+    it('should throw plugin_not_installed error', (done: Function) => {
+
+      delete window.testPlugin;
+      window.cordova = true;
+
+      expect(<any>plugin.pingSync()).toEqual(ERR_PLUGIN_NOT_INSTALLED);
+
+      plugin.ping()
+        .catch(e => {
+          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+          delete window.cordova;
+          done();
+        });
+
+    });
+
+    it('should throw cordova_not_available error', (done: Function) => {
+
+      delete window.testPlugin;
+
+      expect(<any>plugin.pingSync()).toEqual(ERR_CORDOVA_NOT_AVAILABLE);
+
+      plugin.ping()
+        .catch(e => {
+          expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
+          done();
+        });
+
+    });
+
+  });
+
+  describe('CordovaProperty', () => {
+
+    it('should return property value', () => {
+      expect(plugin.name).toEqual('John Smith');
+    });
+
+    it('should set property value', () => {
+      plugin.name = 'value2';
+      expect(plugin.name).toEqual('value2');
+    });
+
+  });
+
+  describe('CordovaCheck', () => {
+
+    it('should run the method when plugin exists', (done) => {
+      plugin.customPing()
+        .then(res => {
+          expect(res).toEqual('pong');
+          done();
+        });
+    });
+
+    it('shouldnt run the method when plugin doesnt exist', (done) => {
+      delete window.testPlugin;
+      window.cordova = true;
+      plugin.customPing()
+        .catch(e => {
+          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+          done();
+        });
+    });
+
+  });
+
+  describe('CordovaOptions', () => {
+
+    describe('destruct', () => {
+
+      it('should destruct values returned by a Promise', (done) => {
+        plugin.destructPromise()
+          .then((args: any[]) => {
+            expect(args).toEqual(['hello', 'world']);
+            done();
+          });
+      });
+
+      it('should destruct values returned by an Observable', (done) => {
+        plugin.destructObservable()
+          .subscribe((args: any[]) => {
+            expect(args).toEqual(['hello', 'world']);
+            done();
+          });
+      });
+
+    });
+
+  });
+
+});
+
+describe('Instance Decorators', () => {
+
+  let instance: TestObject,
+    plugin: TestPlugin;
+
+  beforeEach(() => {
+    definePlugin();
+    plugin = new TestPlugin();
+    instance = plugin.create();
+  });
+
+  describe('Instance plugin', () => {
+
+
+
+  });
+
+  describe('CordovaInstance', () => {
+
+    it('should call instance async method', (done) => {
+      instance.ping()
+        .then(r => {
+          expect(r).toEqual('pong');
+          done();
+        });
+    });
+
+    it('should call instance sync method', () => {
+      expect(instance.pingSync()).toEqual('pong');
+    });
+
+    it('shouldnt call instance method when _objectInstance is undefined', () => {
+
+      delete instance._objectInstance;
+      instance.ping()
+        .then(r => {
+          expect(r).toBeUndefined();
+        })
+        .catch(e => {
+          expect(e).toBeUndefined();
+        });
+
+    });
+
+  });
+
+  describe('InstanceProperty', () => {
+    it('should return property value', () => {
+      expect(instance.name).toEqual('John Smith');
+    });
+
+    it('should set property value', () => {
+      instance.name = 'John Cena';
+      expect(instance.name).toEqual('John Cena');
+    });
+  });
+
+});
--- a/src/@ionic-native/core/decorators.ts
+++ b/src/@ionic-native/core/decorators.ts
@@ -32,9 +32,12 @@ export interface PluginConfig {
   * Supported platforms
   */
  platforms?: string[];
+
+  [key: string]: any;
 }

 export interface CordovaOptions {
+  destruct?: boolean;
  /**
   * Set to true if the wrapped method is a sync function
   */
@@ -127,13 +130,14 @@ export function InstanceCheck(opts: CordovaCheckOptions = {}) {
          if (opts.sync) {
            return;
          } else if (opts.observable) {
-            return new Observable<any>(() => {});
+            return new Observable<any>(() => { });
          }

-          return getPromise(() => {});
+          return getPromise(() => { });

        }
-      }
+      },
+      enumerable: true
    };
  };
 }
@@ -157,7 +161,8 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) {
          }
          return Promise.reject(check && check.error);
        }
-      }
+      },
+      enumerable: true
    };
  };
 }
@@ -182,12 +187,12 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) {
 *  }
 * ```
 */
-export function Plugin(config: PluginConfig) {
-  return function(cls) {
+export function Plugin(config: PluginConfig): ClassDecorator {
+  return function(cls: any) {

    // Add these fields to the class
-    for (let k in config) {
-      cls[k] = config[k];
+    for (let prop in config) {
+      cls[prop] = config[prop];
    }

    cls['installed'] = function(printWarning?: boolean) {
@@ -237,7 +242,8 @@ export function Cordova(opts: CordovaOptions = {}) {
    return {
      value: function(...args: any[]) {
        return wrap(this, methodName, opts).apply(this, args);
-      }
+      },
+      enumerable: true
    };
  };
 }
@@ -247,12 +253,13 @@ export function Cordova(opts: CordovaOptions = {}) {
 *
 * Wrap an instance method
 */
-export function CordovaInstance(opts: any = {}) {
+export function CordovaInstance(opts: CordovaOptions = {}) {
  return (target: Object, methodName: string) => {
    return {
      value: function(...args: any[]) {
        return wrapInstance(this, methodName, opts).apply(this, args);
-      }
+      },
+      enumerable: true
    };
  };
 }
@@ -290,10 +297,10 @@ export function CordovaProperty(target: any, key: string) {
 export function InstanceProperty(target: any, key: string) {
  Object.defineProperty(target, key, {
    enumerable: true,
-    get: function(){
+    get: function() {
      return this._objectInstance[key];
    },
-    set: function(value){
+    set: function(value) {
      this._objectInstance[key] = value;
    }
  });
@@ -310,7 +317,8 @@ export function CordovaFunctionOverride(opts: any = {}) {
    return {
      value: function(...args: any[]) {
        return overrideFunction(this, methodName, opts);
-      }
+      },
+      enumerable: true
    };
  };
 }
@@ -346,7 +354,8 @@ export function CordovaFiniteObservable(opts: CordovaFiniteObservableOptions = {
            wrappedSubscription.unsubscribe();
          };
        });
-      }
+      },
+      enumerable: true
    };
  };
 }
--- a/src/@ionic-native/core/ionic-native-plugin.spec.ts
+++ b/src/@ionic-native/core/ionic-native-plugin.spec.ts
@@ -0,0 +1,69 @@
+// This is to verify that new (FileTransfer.getPlugin)() works
+
+import { Plugin, CordovaInstance } from './decorators';
+import { checkAvailability } from './plugin';
+import { IonicNativePlugin } from './ionic-native-plugin';
+
+class FT {
+  hello(): string {
+    return 'world';
+  }
+}
+
+(window as any).FileTransfer = () => new FT();
+
+@Plugin({
+  plugin: 'cordova-plugin-file-transfer',
+  pluginRef: 'FileTransfer',
+  repo: '',
+  pluginName: 'FileTransfer'
+})
+export class FileTransfer extends IonicNativePlugin {
+  create(): FileTransferObject {
+    let instance: any;
+    if (checkAvailability(FileTransfer.getPluginRef(), null, FileTransfer.getPluginName()) === true) {
+      instance = new (FileTransfer.getPlugin())();
+    }
+    return new FileTransferObject(instance);
+  }
+}
+
+export class FileTransferObject {
+
+  constructor(public _objectInstance: any) {
+    console.info('Creating a new FileTransferObject with instance: ', _objectInstance);
+  }
+
+  @CordovaInstance({ sync: true })
+  hello(): string { return; }
+
+}
+
+describe('Mock FileTransfer Plugin', () => {
+
+  let plugin: FileTransfer,
+    instance: FileTransferObject;
+
+  beforeAll(() => {
+    plugin = new FileTransfer();
+    instance = plugin.create();
+  });
+
+  it('should create a new FileTransfer plugin instance', () => {
+    expect(plugin instanceof FileTransfer).toBeTruthy();
+  });
+
+  it('should create new FileTransferObject instance', () => {
+    expect(instance instanceof FileTransferObject).toBeTruthy();
+  });
+
+  it('FileTransferObject instance should have _objectInstance property', () => {
+    expect(instance._objectInstance).toBeDefined();
+  });
+
+  it('FileTransferObject.hello should return world', () => {
+    console.info('instance hello is', instance.hello());
+    expect(instance.hello()).toEqual('world');
+  });
+
+});
--- a/src/@ionic-native/core/ionic-native-plugin.ts
+++ b/src/@ionic-native/core/ionic-native-plugin.ts
@@ -21,7 +21,7 @@ export class IonicNativePlugin {
  /**
   * Returns the original plugin object
   */
-  static getPlugin(): any {}
+  static getPlugin(): any { }

  /**
   * Returns the plugin's name
@@ -38,4 +38,9 @@ export class IonicNativePlugin {
   */
  static getPluginInstallName(): string { return; }

+  /**
+   * Returns the plugin's supported platforms
+   */
+  static getSupportedPlatforms(): string[] { return; }
+
 }
--- a/src/@ionic-native/core/plugin.ts
+++ b/src/@ionic-native/core/plugin.ts
@@ -1,4 +1,4 @@
-import { get, getPlugin, getPromise, cordovaWarn, pluginWarn } from './util';
+import { getPlugin, getPromise, cordovaWarn, pluginWarn } from './util';
 import { checkReady } from './bootstrap';
 import { CordovaOptions } from './decorators';

@@ -7,8 +7,11 @@ import 'rxjs/add/observable/fromEvent';

 checkReady();

-declare var window;
-declare var Promise;
+// declare const window;
+// declare var Promise;
+
+export const ERR_CORDOVA_NOT_AVAILABLE = { error: 'cordova_not_available' };
+export const ERR_PLUGIN_NOT_INSTALLED = { error: 'plugin_not_installed' };


 /**
@@ -16,8 +19,8 @@ declare var Promise;
 * @return {boolean | { error: string } }
 * @private
 */
-export function checkAvailability(pluginRef: string, methodName?: string, pluginName?: string);
-export function checkAvailability(pluginObj: any, methodName?: string, pluginName?: string);
+export function checkAvailability(pluginRef: string, methodName?: string, pluginName?: string): boolean | { error: string };
+export function checkAvailability(pluginObj: any, methodName?: string, pluginName?: string): boolean | { error: string };
 export function checkAvailability(plugin: any, methodName?: string, pluginName?: string): boolean | { error: string } {

  let pluginRef, pluginInstance, pluginPackage;
@@ -35,15 +38,11 @@ export function checkAvailability(plugin: any, methodName?: string, pluginName?:
  if (!pluginInstance || (!!methodName && typeof pluginInstance[methodName] === 'undefined')) {
    if (!window.cordova) {
      cordovaWarn(pluginName, methodName);
-      return {
-        error: 'cordova_not_available'
-      };
+      return ERR_CORDOVA_NOT_AVAILABLE;
    }

    pluginWarn(pluginName, pluginPackage, methodName);
-    return {
-      error: 'plugin_not_installed'
-    };
+    return ERR_PLUGIN_NOT_INSTALLED;
  }

  return true;
@@ -69,7 +68,7 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
    args.unshift(reject);
    args.unshift(resolve);
  } else if (opts.callbackStyle === 'node') {
-    args.push((err, result) => {
+    args.push((err: any, result: any) => {
      if (err) {
        reject(err);
      } else {
@@ -135,9 +134,13 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts
 }

 function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
-  let pluginResult, rej;
-  const p = getPromise((resolve, reject) => {
-    pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
+  let pluginResult: any, rej: Function;
+  const p = getPromise((resolve: Function, reject: Function) => {
+    if (opts.destruct) {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
+    } else {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
+    }
    rej = reject;
  });
  // Angular throws an error on unhandled rejection, but in this case we have already printed
@@ -145,13 +148,13 @@ function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any
  // to error
  if (pluginResult && pluginResult.error) {
    p.catch(() => { });
-    rej(pluginResult.error);
+    typeof rej === 'function' && rej(pluginResult.error);
  }
  return p;
 }

-function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any= {}) {
-  return getPromise((resolve, reject) => {
+function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
+  return getPromise((resolve: Function, reject: Function) => {
    const pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
    if (pluginResult) {
      if (pluginResult.error) {
@@ -167,7 +170,14 @@ function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts:

 function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
  return new Observable(observer => {
-    let pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+    let pluginResult;
+
+    if (opts.destruct) {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
+    } else {
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+    }
+
    if (pluginResult && pluginResult.error) {
      observer.error(pluginResult.error);
      observer.complete();
@@ -178,11 +188,11 @@ function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: a
          if (opts.clearWithArgs) {
            return callCordovaPlugin(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
          }
-          return get(window, pluginObj.constructor.getPluginRef())[opts.clearFunction].call(pluginObj, pluginResult);
+          return callCordovaPlugin(pluginObj, opts.clearFunction, []);
        }
      } catch (e) {
        console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-        console.error(e);
+        console.warn(e);
      }
    };
  });
@@ -225,7 +235,7 @@ export function overrideFunction(pluginObj: any, methodName: string, args: any[]
    if (availabilityCheck === true) {
      const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
      pluginInstance[methodName] = observer.next.bind(observer);
-      return () => pluginInstance[methodName] = () => {};
+      return () => pluginInstance[methodName] = () => { };
    } else {
      observer.error(availabilityCheck);
      observer.complete();
@@ -239,7 +249,7 @@ export function overrideFunction(pluginObj: any, methodName: string, args: any[]
 * @private
 */
 export const wrap = function(pluginObj: any, methodName: string, opts: CordovaOptions = {}) {
-  return (...args) => {
+  return (...args: any[]) => {
    if (opts.sync) {
      // Sync doesn't wrap the plugin with a promise or observable, it returns the result as-is
      return callCordovaPlugin(pluginObj, methodName, args, opts);
@@ -259,7 +269,7 @@ export const wrap = function(pluginObj: any, methodName: string, opts: CordovaOp
 * @private
 */
 export function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
-  return (...args) => {
+  return (...args: any[]) => {
    if (opts.sync) {

      return callInstance(pluginObj, methodName, args, opts);
@@ -267,7 +277,14 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
    } else if (opts.observable) {

      return new Observable(observer => {
-        let pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+
+        let pluginResult;
+
+        if (opts.destruct) {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
+        } else {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+        }

        if (pluginResult && pluginResult.error) {
          observer.error(pluginResult.error);
@@ -277,38 +294,51 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
        return () => {
          try {
            if (opts.clearWithArgs) {
-              return pluginObj._objectInstance[opts.clearFunction].apply(pluginObj._objectInstance, args);
+              return callInstance(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
            }
-            return pluginObj._objectInstance[opts.clearFunction].call(pluginObj, pluginResult);
+            return callInstance(pluginObj, opts.clearFunction, []);
          } catch (e) {
            console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-            console.error(e);
+            console.warn(e);
          }
        };
      });

    } else if (opts.otherPromise) {
-
-      return getPromise((resolve, reject) => {
-        let result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
-        if (result && !result.error) {
+      return getPromise((resolve: Function, reject: Function) => {
+        let result;
+        if (opts.destruct) {
+          result = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
+        } else {
+          result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+        }
+        if (result && !!result.then) {
          result.then(resolve, reject);
+        } else {
+          reject();
        }
      });

    } else {
-
-      let pluginResult, rej;
-      const p = getPromise((resolve, reject) => {
-        pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+      let pluginResult: any, rej: Function;
+      const p = getPromise((resolve: Function, reject: Function) => {
+        if (opts.destruct) {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
+        } else {
+          pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+        }
        rej = reject;
      });
+      // Angular throws an error on unhandled rejection, but in this case we have already printed
+      // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
+      // to error
      if (pluginResult && pluginResult.error) {
        p.catch(() => { });
-        rej(pluginResult.error);
+        typeof rej === 'function' && rej(pluginResult.error);
      }
      return p;

+
    }
  };
 }
--- a/src/@ionic-native/core/util.ts
+++ b/src/@ionic-native/core/util.ts
@@ -1,56 +1,57 @@
-declare var window: any;
+declare const window: any;

 /**
 * @private
 */
-export function get(obj, path) {
-  path = path.split('.');
-  for (let i = 0; i < path.length; i++) {
+export const get = (element: Element | Window, path: string): any => {
+  const paths: string[] = path.split('.');
+  let obj: any = element;
+  for (let i: number = 0; i < paths.length; i++) {
    if (!obj) { return null; }
-    obj = obj[path[i]];
+    obj = obj[paths[i]];
  }
  return obj;
-}
+};


 /**
 * @private
 */
-export function getPromise(cb) {
+export const getPromise = (callback: Function): Promise<any> => {

  const tryNativePromise = () => {
    if (window.Promise) {
      return new Promise((resolve, reject) => {
-        cb(resolve, reject);
+        callback(resolve, reject);
      });
    } else {
-      console.error('No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular 2 or on a recent browser.');
+      console.error('No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular or on a recent browser.');
    }
  };

  return tryNativePromise();
-}
+};

 /**
 * @private
 * @param pluginRef
 * @returns {null|*}
 */
-export function getPlugin(pluginRef: string): any {
+export const getPlugin = (pluginRef: string): any => {
  return get(window, pluginRef);
 };

 /**
 * @private
 */
-export const pluginWarn = function(pluginName: string, plugin?: string, method?: string) {
+export const pluginWarn = (pluginName: string, plugin?: string, method?: string): void => {
  if (method) {
    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
  } else {
    console.warn('Native: tried accessing the ' + pluginName + ' plugin but it\'s not installed.');
  }
  if (plugin) {
-    console.warn('Install the ' + pluginName + ' plugin: \'ionic plugin add ' + plugin + '\'');
+    console.warn('Install the ' + pluginName + ' plugin: \'ionic cordova plugin add ' + plugin + '\'');
  }
 };

@@ -59,7 +60,7 @@ export const pluginWarn = function(pluginName: string, plugin?: string, method?:
 * @param pluginName
 * @param method
 */
-export const cordovaWarn = function(pluginName: string, method?: string) {
+export const cordovaWarn = (pluginName: string, method?: string): void => {
  if (method) {
    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
  } else {
--- a/src/@ionic-native/plugins/action-sheet/index.ts
+++ b/src/@ionic-native/plugins/action-sheet/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, CordovaProperty, IonicNativePlugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';

 export interface ActionSheetOptions {

@@ -51,7 +51,7 @@ export interface ActionSheetOptions {
  /**
   * Choose if destructive button will be the last
   */
-  destructiveButtonLast: boolean;
+  destructiveButtonLast?: boolean;
 }

 /**
@@ -94,18 +94,26 @@ export interface ActionSheetOptions {
  plugin: 'cordova-plugin-actionsheet',
  pluginRef: 'plugins.actionsheet',
  repo: 'https://github.com/EddyVerbruggen/cordova-plugin-actionsheet',
-  platforms: ['Android', 'iOS', 'Windows Phone 8', 'Browser']
+  platforms: ['Android', 'Browser', 'iOS', 'Windows', 'Windows Phone 8']
 })
@Injectable()
 export class ActionSheet extends IonicNativePlugin {

-  @CordovaProperty
+  /**
+   * Convenience property to select an Android theme value
+   */
  ANDROID_THEMES: {
    THEME_TRADITIONAL: number;
    THEME_HOLO_DARK: number;
    THEME_HOLO_LIGHT: number;
    THEME_DEVICE_DEFAULT_DARK: number;
    THEME_DEVICE_DEFAULT_LIGHT: number;
+  } = {
+    THEME_TRADITIONAL: 1,
+    THEME_HOLO_DARK: 2,
+    THEME_HOLO_LIGHT: 3,
+    THEME_DEVICE_DEFAULT_DARK: 4,
+    THEME_DEVICE_DEFAULT_LIGHT: 5
  };

  /**
--- a/src/@ionic-native/plugins/admob-free/index.ts
+++ b/src/@ionic-native/plugins/admob-free/index.ts
@@ -69,7 +69,7 @@ export interface AdMobFreeRewardVideoConfig {
 * @description
 *
 * @usage
- * ```
+ * ```typescript
 * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
 *
 *
@@ -96,6 +96,14 @@ export interface AdMobFreeRewardVideoConfig {
 *
 *
 * ```
+ * @interfaces
+ * AdMobFreeBannerConfig
+ * AdMobFreeInterstitialConfig
+ * AdMobFreeRewardVideoConfig
+ * @classes
+ * AdMobFreeBanner
+ * AdMobFreeInterstitial
+ * AdMobFreeRewardVideo
 */
@Plugin({
  pluginName: 'AdMobFree',
@@ -108,9 +116,10 @@ export interface AdMobFreeRewardVideoConfig {
 export class AdMobFree extends IonicNativePlugin {

  /**
-   * Convenience constructor to get event names
+   * Convenience object to get event names
+   * @type {Object}
   */
-  events = {
+  events: any = {
    BANNER_LOAD: 'admob.banner.events.LOAD',
    BANNER_LOAD_FAIL: 'admob.banner.events.LOAD_FAIL',
    BANNER_OPEN: 'admob.banner.events.OPEN',
@@ -142,19 +151,19 @@ export class AdMobFree extends IonicNativePlugin {
  }

  /**
-   *
+   * Returns the AdMobFreeBanner object
   * @type {AdMobFreeBanner}
   */
  banner: AdMobFreeBanner = new AdMobFreeBanner();

  /**
-   *
+   * Returns the AdMobFreeInterstitial object
   * @type {AdMobFreeInterstitial}
   */
  interstitial: AdMobFreeInterstitial = new AdMobFreeInterstitial();

  /**
-   *
+   * Returns the AdMobFreeRewardVideo object
   * @type {AdMobFreeRewardVideo}
   */
  rewardVideo: AdMobFreeRewardVideo = new AdMobFreeRewardVideo();
@@ -183,28 +192,28 @@ export class AdMobFreeBanner {
   * Hide the banner.
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  hide(): Promise<any> { return; }

  /**
   * Create banner.
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  prepare(): Promise<any> { return; }

  /**
   * Remove the banner.
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  remove(): Promise<any> { return; }

  /**
   * Show the banner.
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  show(): Promise<any> { return; }

 }
@@ -231,21 +240,21 @@ export class AdMobFreeInterstitial {
   * Check if interstitial is ready
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  isReady(): Promise<any> { return; }

  /**
   * Prepare interstitial
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  prepare(): Promise<any> { return; }

  /**
   * Show the interstitial
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  show(): Promise<any> { return; }

 }
@@ -272,21 +281,21 @@ export class AdMobFreeRewardVideo {
   * Check if reward video is ready
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  isReady(): Promise<any> { return; }

  /**
   * Prepare reward video
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  prepare(): Promise<any> { return; }

  /**
   * Show the reward video
   * @return {Promise<any>}
   */
-  @Cordova({ sync: true })
+  @Cordova({ otherPromise: true })
  show(): Promise<any> { return; }

 }
--- a/src/@ionic-native/plugins/admob-pro/index.ts
+++ b/src/@ionic-native/plugins/admob-pro/index.ts
@@ -32,7 +32,7 @@ export interface AdMobOptions {
  overlap?: boolean;

  /**
-   * Position of banner ad. Defaults to `TOP_CENTER`. You can use the `AdMob.AD_POSITION` property to select other values.
+   * Position of banner ad. Defaults to `TOP_CENTER`. You can use the `AdMobPro.AD_POSITION` property to select other values.
   */
  position?: number;

@@ -90,14 +90,18 @@ export interface AdExtras {
 }

 /**
- * @name AdMob
+ * @paid
+ * @name AdMob Pro
 * @description
- * Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
+ * Plugin for Google Ads, including AdMob / DFP (DoubleClick for publisher) and mediations to other Ad networks.
+ *
+ * IMPORTANT NOTICE: this plugin takes a percentage out of your earnings if you profit more than $1,000. Read more about this on the plugin's repo. For a completely free alternative, see [AdMobPro Free](../admob-free).
 * @usage
 * ```typescript
- * import { AdMob, AdMobOptions, AdSize, AdExtras } from '@ionic-native/admob';
+ * import { AdMobPro } from '@ionic-native/admob-pro';
+ * import { Platform } from 'ionic-angular';
 *
- * constructor(private admob: AdMob){}
+ * constructor(private admob: AdMobPro, private platform: Platform ) { }
 *
 * ionViewDidLoad() {
 *   this.admob.onAdDismiss()
@@ -105,7 +109,13 @@ export interface AdExtras {
 * }
 *
 * onClick() {
- *   this.admob.prepareInterstitial('YOUR_ADID')
+ *   let adId;
+ *   if(this.platform.is('android')) {
+ *     adId = 'YOUR_ADID_ANDROID';
+ *   } else if (this.platform.is('ios')) {
+ *     adId = 'YOUR_ADID_IOS';
+ *   }
+ *   this.admob.prepareInterstitial({adId: adId})
 *     .then(() => { this.admob.showInterstitial(); });
 * }
 *
@@ -116,14 +126,14 @@ export interface AdExtras {
 * AdExtras
 */
@Plugin({
-  pluginName: 'AdMob',
+  pluginName: 'AdMob Pro',
  plugin: 'cordova-plugin-admobpro',
  pluginRef: 'AdMob',
  repo: 'https://github.com/floatinghotpot/cordova-admob-pro',
  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
@Injectable()
-export class AdMob extends IonicNativePlugin {
+export class AdMobPro extends IonicNativePlugin {

  AD_POSITION: {
    NO_CHANGE: number;
@@ -169,7 +179,7 @@ export class AdMob extends IonicNativePlugin {

  /**
   * Show banner at position
-   * @param position {number} Position. Use `AdMob.AD_POSITION` to set values.
+   * @param position {number} Position. Use `AdMobPro.AD_POSITION` to set values.
   */
  @Cordova({
    sync: true
--- a/src/@ionic-native/plugins/alipay/index.ts
+++ b/src/@ionic-native/plugins/alipay/index.ts
@@ -1,6 +1,8 @@
 import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';

+
+
 export interface AlipayOrder {
  /**
   * appId assigned by Alipay
@@ -67,7 +69,7 @@ export interface AlipayOrder {
 * Requires Cordova plugin: `cordova-alipay-base`. For more info, please see the [Alipay plugin docs](https://github.com/xueron/cordova-alipay-base).
 *
 * @usage
- * ```
+ * ```typescript
 * import { Alipay, AlipayOrder } from '@ionic-native/alipay';
 *
 * constructor(private alipay: Alipay) {
@@ -99,8 +101,9 @@ export interface AlipayOrder {
  plugin: 'cordova-alipay-base',
  pluginRef: 'Alipay.Base',
  repo: 'https://github.com/xueron/cordova-alipay-base',
-  platforms: ['Android', 'iOS'],
-  install: 'ionic plugin add https://github.com/xueron/cordova-alipay-base --variable APP_ID=your_app_id'
+  install: 'ionic cordova plugin add cordova-alipay-base --variable APP_ID=your_app_id',
+  installVariables: ['APP_ID'],
+  platforms: ['Android', 'iOS']
 })
@Injectable()
 export class Alipay extends IonicNativePlugin {
@@ -112,4 +115,3 @@ export class Alipay extends IonicNativePlugin {
  @Cordova()
  pay(order: AlipayOrder): Promise<any> { return; }
 }
-
--- a/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
+++ b/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
@@ -102,7 +102,7 @@ export interface AFAEncryptResponse {
 * This plugin will open a native dialog fragment prompting the user to authenticate using their fingerprint. If the device has a secure lockscreen (pattern, PIN, or password), the user may opt to authenticate using that method as a backup.
 * @usage
 * ```typescript
- * import { AndroidFingerprintAuth, AFAAuthOptions } from '@ionic-native/android-fingerprint-auth';
+ * import { AndroidFingerprintAuth } from '@ionic-native/android-fingerprint-auth';
 *
 * constructor(private androidFingerprintAuth: AndroidFingerprintAuth) { }
 *
@@ -114,18 +114,18 @@ export interface AFAEncryptResponse {
 *     if(result.isAvailable){
 *       // it is available
 *
- *       this.androidFingerprintAuth.encrypt({ clientId: "myAppName", username: "myUsername", password: "myPassword" })
+ *       this.androidFingerprintAuth.encrypt({ clientId: 'myAppName', username: 'myUsername', password: 'myPassword' })
 *         .then(result => {
 *            if (result.withFingerprint) {
- *                console.log("Successfully encrypted credentials.");
- *                console.log("Encrypted credentials: " + result.token);
+ *                console.log('Successfully encrypted credentials.');
+ *                console.log('Encrypted credentials: ' + result.token);
 *            } else if (result.withBackup) {
 *              console.log('Successfully authenticated with backup password!');
 *            } else console.log('Didn\'t authenticate!');
 *         })
 *         .catch(error => {
- *            if (error === "Cancelled") {
- *              console.log("Fingerprint authentication cancelled");
+ *            if (error === this.androidFingerprintAuth.ERRORS.FINGERPRINT_CANCELLED) {
+ *              console.log('Fingerprint authentication cancelled');
 *            } else console.error(error)
 *         });
 *
@@ -150,13 +150,26 @@ export interface AFAEncryptResponse {
@Injectable()
 export class AndroidFingerprintAuth extends IonicNativePlugin {

-  /**
-   * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
-   * @param options {AFAAuthOptions} Options
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> {return; }
+  ERRORS: {
+    BAD_PADDING_EXCEPTION: 'BAD_PADDING_EXCEPTION',
+    CERTIFICATE_EXCEPTION: 'CERTIFICATE_EXCEPTION',
+    FINGERPRINT_CANCELLED: 'FINGERPRINT_CANCELLED',
+    FINGERPRINT_DATA_NOT_DELETED: 'FINGERPRINT_DATA_NOT_DELETED',
+    FINGERPRINT_ERROR: 'FINGERPRINT_ERROR',
+    FINGERPRINT_NOT_AVAILABLE: 'FINGERPRINT_NOT_AVAILABLE',
+    FINGERPRINT_PERMISSION_DENIED: 'FINGERPRINT_PERMISSION_DENIED',
+    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: 'FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST',
+    ILLEGAL_BLOCK_SIZE_EXCEPTION: 'ILLEGAL_BLOCK_SIZE_EXCEPTION',
+    INIT_CIPHER_FAILED: 'INIT_CIPHER_FAILED',
+    INVALID_ALGORITHM_PARAMETER_EXCEPTION: 'INVALID_ALGORITHM_PARAMETER_EXCEPTION',
+    IO_EXCEPTION: 'IO_EXCEPTION',
+    JSON_EXCEPTION: 'JSON_EXCEPTION',
+    MINIMUM_SDK: 'MINIMUM_SDK',
+    MISSING_ACTION_PARAMETERS: 'MISSING_ACTION_PARAMETERS',
+    MISSING_PARAMETERS: 'MISSING_PARAMETERS',
+    NO_SUCH_ALGORITHM_EXCEPTION: 'NO_SUCH_ALGORITHM_EXCEPTION',
+    SECURITY_EXCEPTION: 'SECURITY_EXCEPTION'
+  };

  /**
   * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
@@ -164,19 +177,27 @@ export class AndroidFingerprintAuth extends IonicNativePlugin {
   * @returns {Promise<any>}
   */
  @Cordova()
-  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> {return; }
+  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> { return; }
+
+  /**
+   * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
+   * @param options {AFAAuthOptions} Options
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> { return; }

  /**
   * Check if service is available
   * @returns {Promise<any>} Returns a Promise that resolves if fingerprint auth is available on the device
   */
  @Cordova()
-  isAvailable(): Promise<{isAvailable: boolean}> { return; }
+  isAvailable(): Promise<{ isAvailable: boolean, isHardwareDetected: boolean, hasEnrolledFingerprints: boolean }> { return; }

  /**
   * Delete the cipher used for encryption and decryption by username
   * @returns {Promise<any>} Returns a Promise that resolves if the cipher was successfully deleted
   */
  @Cordova()
-  delete(options: {clientId: string; username: string; }): Promise<{deleted: boolean}> { return; }
+  delete(options: { clientId: string; username: string; }): Promise<{ deleted: boolean }> { return; }
 }
--- a/src/@ionic-native/plugins/android-full-screen/index.ts
+++ b/src/@ionic-native/plugins/android-full-screen/index.ts
@@ -1,6 +1,35 @@
 import { Injectable } from '@angular/core';
 import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';

+/**
+ * Bit flag values for setSystemUiVisibility()
+ * @see	https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)
+ */
+export enum AndroidSystemUiFlags {
+  /** View has requested the system UI (status bar) to be visible (the default). SYSTEM_UI_FLAG_VISIBLE */
+  Visible = 0,
+  /** View has requested the system UI to enter an unobtrusive "low profile" mode. SYSTEM_UI_FLAG_LOW_PROFILE */
+  LowProfile = 1,
+  /** View has requested that the system navigation be temporarily hidden. SYSTEM_UI_FLAG_HIDE_NAVIGATION */
+  HideNavigation = 2,
+  /** View has requested to go into the normal fullscreen mode so that its content can take over the screen while still allowing the user to interact with the application. SYSTEM_UI_FLAG_FULLSCREEN */
+  Fullscreen = 4,
+  /** Requests the navigation bar to draw in a mode that is compatible with light navigation bar backgrounds. SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR */
+  LightNavigationBar = 16,
+  /** When using other layout flags, we would like a stable view of the content insets given to fitSystemWindows(Rect). SYSTEM_UI_FLAG_LAYOUT_STABLE */
+  LayoutStable = 256,
+  /** View would like its window to be laid out as if it has requested SYSTEM_UI_FLAG_HIDE_NAVIGATION, even if it currently hasn't. SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION */
+  LayoutHideNavigation = 512,
+  /** View would like its window to be laid out as if it has requested SYSTEM_UI_FLAG_FULLSCREEN, even if it currently hasn't. SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN */
+  LayoutFullscreen = 1024,
+  /** View would like to remain interactive when hiding the navigation bar with SYSTEM_UI_FLAG_HIDE_NAVIGATION. SYSTEM_UI_FLAG_IMMERSIVE */
+  Immersive = 2048,
+  /** View would like to remain interactive when hiding the status bar with SYSTEM_UI_FLAG_FULLSCREEN and/or hiding the navigation bar with SYSTEM_UI_FLAG_HIDE_NAVIGATION. SYSTEM_UI_FLAG_IMMERSIVE_STICKY */
+  ImmersiveSticky = 4096,
+  /** Requests the status bar to draw in a mode that is compatible with light status bar backgrounds. SYSTEM_UI_FLAG_LIGHT_STATUS_BAR */
+  LightStatusBar = 8192
+}
+
 /**
 * @name Android Full Screen
 * @description
@@ -92,4 +121,13 @@ export class AndroidFullScreen extends IonicNativePlugin {
   */
  @Cordova()
  immersiveMode(): Promise<void> { return; }
+
+  /**
+   * Manually set the the system UI to a custom mode. This mirrors the Android method of the same name. (Android 4.4+ only).
+   * @see https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)
+   * @param {AndroidSystemUiFlags} visibility Bitwise-OR of flags in AndroidSystemUiFlags
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> { return; }
 }
--- a/src/@ionic-native/plugins/android-permissions/index.ts
+++ b/src/@ionic-native/plugins/android-permissions/index.ts
@@ -0,0 +1,226 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name Android Permissions
+ * @description
+ * This plugin is designed to support Android new permissions checking mechanism.
+ *
+ * You can find all permissions here: https://developer.android.com/reference/android/Manifest.permission.html
+ *
+ * @usage
+ * ```
+ * import { AndroidPermissions } from '@ionic-native/android-permissions';
+ *
+ *
+ * constructor(private androidPermissions: AndroidPermissions) { }
+ *
+ * ...
+ *
+ * this.androidPermissions.checkPermission(this.androidPermissions.PERMISSION.CAMERA).then(
+ *   success => console.log('Permission granted'),
+ *   err => this.androidPermissions.requestPermission(this.androidPermissions.PERMISSION.CAMERA)
+ * );
+ *
+ * this.androidPermissions.requestPermissions([this.androidPermissions.PERMISSION.CAMERA, this.androidPermissions.PERMISSION.GET_ACCOUNTS]);
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'AndroidPermissions',
+  plugin: 'cordova-plugin-android-permissions',
+  pluginRef: 'cordova.plugins.permissions',
+  repo: 'https://github.com/NeoLSN/cordova-plugin-android-permissions',
+  platforms: ['Android']
+})
+@Injectable()
+export class AndroidPermissions extends IonicNativePlugin {
+
+  PERMISSION: any = {
+    ACCESS_CHECKIN_PROPERTIES: 'android.permission.ACCESS_CHECKIN_PROPERTIES',
+    ACCESS_COARSE_LOCATION: 'android.permission.ACCESS_COARSE_LOCATION',
+    ACCESS_FINE_LOCATION: 'android.permission.ACCESS_FINE_LOCATION',
+    ACCESS_LOCATION_EXTRA_COMMANDS: 'android.permission.ACCESS_LOCATION_EXTRA_COMMANDS',
+    ACCESS_MOCK_LOCATION: 'android.permission.ACCESS_MOCK_LOCATION',
+    ACCESS_NETWORK_STATE: 'android.permission.ACCESS_NETWORK_STATE',
+    ACCESS_SURFACE_FLINGER: 'android.permission.ACCESS_SURFACE_FLINGER',
+    ACCESS_WIFI_STATE: 'android.permission.ACCESS_WIFI_STATE',
+    ACCOUNT_MANAGER: 'android.permission.ACCOUNT_MANAGER',
+    ADD_VOICEMAIL: 'com.android.voicemail.permission.ADD_VOICEMAIL',
+    AUTHENTICATE_ACCOUNTS: 'android.permission.AUTHENTICATE_ACCOUNTS',
+    BATTERY_STATS: 'android.permission.BATTERY_STATS',
+    BIND_ACCESSIBILITY_SERVICE: 'android.permission.BIND_ACCESSIBILITY_SERVICE',
+    BIND_APPWIDGET: 'android.permission.BIND_APPWIDGET',
+    BIND_CARRIER_MESSAGING_SERVICE: 'android.permission.BIND_CARRIER_MESSAGING_SERVICE',
+    BIND_DEVICE_ADMIN: 'android.permission.BIND_DEVICE_ADMIN',
+    BIND_DREAM_SERVICE: 'android.permission.BIND_DREAM_SERVICE',
+    BIND_INPUT_METHOD: 'android.permission.BIND_INPUT_METHOD',
+    BIND_NFC_SERVICE: 'android.permission.BIND_NFC_SERVICE',
+    BIND_NOTIFICATION_LISTENER_SERVICE: 'android.permission.BIND_NOTIFICATION_LISTENER_SERVICE',
+    BIND_PRINT_SERVICE: 'android.permission.BIND_PRINT_SERVICE',
+    BIND_REMOTEVIEWS: 'android.permission.BIND_REMOTEVIEWS',
+    BIND_TEXT_SERVICE: 'android.permission.BIND_TEXT_SERVICE',
+    BIND_TV_INPUT: 'android.permission.BIND_TV_INPUT',
+    BIND_VOICE_INTERACTION: 'android.permission.BIND_VOICE_INTERACTION',
+    BIND_VPN_SERVICE: 'android.permission.BIND_VPN_SERVICE',
+    BIND_WALLPAPER: 'android.permission.BIND_WALLPAPER',
+    BLUETOOTH: 'android.permission.BLUETOOTH',
+    BLUETOOTH_ADMIN: 'android.permission.BLUETOOTH_ADMIN',
+    BLUETOOTH_PRIVILEGED: 'android.permission.BLUETOOTH_PRIVILEGED',
+    BODY_SENSORS: 'android.permission.BODY_SENSORS',
+    BRICK: 'android.permission.BRICK',
+    BROADCAST_PACKAGE_REMOVED: 'android.permission.BROADCAST_PACKAGE_REMOVED',
+    BROADCAST_SMS: 'android.permission.BROADCAST_SMS',
+    BROADCAST_STICKY: 'android.permission.BROADCAST_STICKY',
+    BROADCAST_WAP_PUSH: 'android.permission.BROADCAST_WAP_PUSH',
+    CALL_PHONE: 'android.permission.CALL_PHONE',
+    CALL_PRIVILEGED: 'android.permission.CALL_PRIVILEGED',
+    CAMERA: 'android.permission.CAMERA',
+    CAPTURE_AUDIO_OUTPUT: 'android.permission.CAPTURE_AUDIO_OUTPUT',
+    CAPTURE_SECURE_VIDEO_OUTPUT: 'android.permission.CAPTURE_SECURE_VIDEO_OUTPUT',
+    CAPTURE_VIDEO_OUTPUT: 'android.permission.CAPTURE_VIDEO_OUTPUT',
+    CHANGE_COMPONENT_ENABLED_STATE: 'android.permission.CHANGE_COMPONENT_ENABLED_STATE',
+    CHANGE_CONFIGURATION: 'android.permission.CHANGE_CONFIGURATION',
+    CHANGE_NETWORK_STATE: 'android.permission.CHANGE_NETWORK_STATE',
+    CHANGE_WIFI_MULTICAST_STATE: 'android.permission.CHANGE_WIFI_MULTICAST_STATE',
+    CHANGE_WIFI_STATE: 'android.permission.CHANGE_WIFI_STATE',
+    CLEAR_APP_CACHE: 'android.permission.CLEAR_APP_CACHE',
+    CLEAR_APP_USER_DATA: 'android.permission.CLEAR_APP_USER_DATA',
+    CONTROL_LOCATION_UPDATES: 'android.permission.CONTROL_LOCATION_UPDATES',
+    DELETE_CACHE_FILES: 'android.permission.DELETE_CACHE_FILES',
+    DELETE_PACKAGES: 'android.permission.DELETE_PACKAGES',
+    DEVICE_POWER: 'android.permission.DEVICE_POWER',
+    DIAGNOSTIC: 'android.permission.DIAGNOSTIC',
+    DISABLE_KEYGUARD: 'android.permission.DISABLE_KEYGUARD',
+    DUMP: 'android.permission.DUMP',
+    EXPAND_STATUS_BAR: 'android.permission.EXPAND_STATUS_BAR',
+    FACTORY_TEST: 'android.permission.FACTORY_TEST',
+    FLASHLIGHT: 'android.permission.FLASHLIGHT',
+    FORCE_BACK: 'android.permission.FORCE_BACK',
+    GET_ACCOUNTS: 'android.permission.GET_ACCOUNTS',
+    GET_PACKAGE_SIZE: 'android.permission.GET_PACKAGE_SIZE',
+    GET_TASKS: 'android.permission.GET_TASKS',
+    GET_TOP_ACTIVITY_INFO: 'android.permission.GET_TOP_ACTIVITY_INFO',
+    GLOBAL_SEARCH: 'android.permission.GLOBAL_SEARCH',
+    HARDWARE_TEST: 'android.permission.HARDWARE_TEST',
+    INJECT_EVENTS: 'android.permission.INJECT_EVENTS',
+    INSTALL_LOCATION_PROVIDER: 'android.permission.INSTALL_LOCATION_PROVIDER',
+    INSTALL_PACKAGES: 'android.permission.INSTALL_PACKAGES',
+    INSTALL_SHORTCUT: 'com.android.launcher.permission.INSTALL_SHORTCUT',
+    INTERNAL_SYSTEM_WINDOW: 'android.permission.INTERNAL_SYSTEM_WINDOW',
+    INTERNET: 'android.permission.INTERNET',
+    KILL_BACKGROUND_PROCESSES: 'android.permission.KILL_BACKGROUND_PROCESSES',
+    LOCATION_HARDWARE: 'android.permission.LOCATION_HARDWARE',
+    MANAGE_ACCOUNTS: 'android.permission.MANAGE_ACCOUNTS',
+    MANAGE_APP_TOKENS: 'android.permission.MANAGE_APP_TOKENS',
+    MANAGE_DOCUMENTS: 'android.permission.MANAGE_DOCUMENTS',
+    MASTER_CLEAR: 'android.permission.MASTER_CLEAR',
+    MEDIA_CONTENT_CONTROL: 'android.permission.MEDIA_CONTENT_CONTROL',
+    MODIFY_AUDIO_SETTINGS: 'android.permission.MODIFY_AUDIO_SETTINGS',
+    MODIFY_PHONE_STATE: 'android.permission.MODIFY_PHONE_STATE',
+    MOUNT_FORMAT_FILESYSTEMS: 'android.permission.MOUNT_FORMAT_FILESYSTEMS',
+    MOUNT_UNMOUNT_FILESYSTEMS: 'android.permission.MOUNT_UNMOUNT_FILESYSTEMS',
+    NFC: 'android.permission.NFC',
+    PERSISTENT_ACTIVITY: 'android.permission.PERSISTENT_ACTIVITY',
+    PROCESS_OUTGOING_CALLS: 'android.permission.PROCESS_OUTGOING_CALLS',
+    READ_CALENDAR: 'android.permission.READ_CALENDAR',
+    READ_CALL_LOG: 'android.permission.READ_CALL_LOG',
+    READ_CONTACTS: 'android.permission.READ_CONTACTS',
+    READ_EXTERNAL_STORAGE: 'android.permission.READ_EXTERNAL_STORAGE',
+    READ_FRAME_BUFFER: 'android.permission.READ_FRAME_BUFFER',
+    READ_HISTORY_BOOKMARKS: 'com.android.browser.permission.READ_HISTORY_BOOKMARKS',
+    READ_INPUT_STATE: 'android.permission.READ_INPUT_STATE',
+    READ_LOGS: 'android.permission.READ_LOGS',
+    READ_PHONE_STATE: 'android.permission.READ_PHONE_STATE',
+    READ_PROFILE: 'android.permission.READ_PROFILE',
+    READ_SMS: 'android.permission.READ_SMS',
+    READ_SOCIAL_STREAM: 'android.permission.READ_SOCIAL_STREAM',
+    READ_SYNC_SETTINGS: 'android.permission.READ_SYNC_SETTINGS',
+    READ_SYNC_STATS: 'android.permission.READ_SYNC_STATS',
+    READ_USER_DICTIONARY: 'android.permission.READ_USER_DICTIONARY',
+    READ_VOICEMAIL: 'com.android.voicemail.permission.READ_VOICEMAIL',
+    REBOOT: 'android.permission.REBOOT',
+    RECEIVE_BOOT_COMPLETED: 'android.permission.RECEIVE_BOOT_COMPLETED',
+    RECEIVE_MMS: 'android.permission.RECEIVE_MMS',
+    RECEIVE_SMS: 'android.permission.RECEIVE_SMS',
+    RECEIVE_WAP_PUSH: 'android.permission.RECEIVE_WAP_PUSH',
+    RECORD_AUDIO: 'android.permission.RECORD_AUDIO',
+    REORDER_TASKS: 'android.permission.REORDER_TASKS',
+    RESTART_PACKAGES: 'android.permission.RESTART_PACKAGES',
+    SEND_RESPOND_VIA_MESSAGE: 'android.permission.SEND_RESPOND_VIA_MESSAGE',
+    SEND_SMS: 'android.permission.SEND_SMS',
+    SET_ACTIVITY_WATCHER: 'android.permission.SET_ACTIVITY_WATCHER',
+    SET_ALARM: 'com.android.alarm.permission.SET_ALARM',
+    SET_ALWAYS_FINISH: 'android.permission.SET_ALWAYS_FINISH',
+    SET_ANIMATION_SCALE: 'android.permission.SET_ANIMATION_SCALE',
+    SET_DEBUG_APP: 'android.permission.SET_DEBUG_APP',
+    SET_ORIENTATION: 'android.permission.SET_ORIENTATION',
+    SET_POINTER_SPEED: 'android.permission.SET_POINTER_SPEED',
+    SET_PREFERRED_APPLICATIONS: 'android.permission.SET_PREFERRED_APPLICATIONS',
+    SET_PROCESS_LIMIT: 'android.permission.SET_PROCESS_LIMIT',
+    SET_TIME: 'android.permission.SET_TIME',
+    SET_TIME_ZONE: 'android.permission.SET_TIME_ZONE',
+    SET_WALLPAPER: 'android.permission.SET_WALLPAPER',
+    SET_WALLPAPER_HINTS: 'android.permission.SET_WALLPAPER_HINTS',
+    SIGNAL_PERSISTENT_PROCESSES: 'android.permission.SIGNAL_PERSISTENT_PROCESSES',
+    STATUS_BAR: 'android.permission.STATUS_BAR',
+    SUBSCRIBED_FEEDS_READ: 'android.permission.SUBSCRIBED_FEEDS_READ',
+    SUBSCRIBED_FEEDS_WRITE: 'android.permission.SUBSCRIBED_FEEDS_WRITE',
+    SYSTEM_ALERT_WINDOW: 'android.permission.SYSTEM_ALERT_WINDOW',
+    TRANSMIT_IR: 'android.permission.TRANSMIT_IR',
+    UNINSTALL_SHORTCUT: 'com.android.launcher.permission.UNINSTALL_SHORTCUT',
+    UPDATE_DEVICE_STATS: 'android.permission.UPDATE_DEVICE_STATS',
+    USE_CREDENTIALS: 'android.permission.USE_CREDENTIALS',
+    USE_SIP: 'android.permission.USE_SIP',
+    VIBRATE: 'android.permission.VIBRATE',
+    WAKE_LOCK: 'android.permission.WAKE_LOCK',
+    WRITE_APN_SETTINGS: 'android.permission.WRITE_APN_SETTINGS',
+    WRITE_CALENDAR: 'android.permission.WRITE_CALENDAR',
+    WRITE_CALL_LOG: 'android.permission.WRITE_CALL_LOG',
+    WRITE_CONTACTS: 'android.permission.WRITE_CONTACTS',
+    WRITE_EXTERNAL_STORAGE: 'android.permission.WRITE_EXTERNAL_STORAGE',
+    WRITE_GSERVICES: 'android.permission.WRITE_GSERVICES',
+    WRITE_HISTORY_BOOKMARKS: 'com.android.browser.permission.WRITE_HISTORY_BOOKMARKS',
+    WRITE_PROFILE: 'android.permission.WRITE_PROFILE',
+    WRITE_SECURE_SETTINGS: 'android.permission.WRITE_SECURE_SETTINGS',
+    WRITE_SETTINGS: 'android.permission.WRITE_SETTINGS',
+    WRITE_SMS: 'android.permission.WRITE_SMS',
+    WRITE_SOCIAL_STREAM: 'android.permission.WRITE_SOCIAL_STREAM',
+    WRITE_SYNC_SETTINGS: 'android.permission.WRITE_SYNC_SETTINGS',
+    WRITE_USER_DICTIONARY: 'android.permission.WRITE_USER_DICTIONARY',
+    WRITE_VOICEMAIL: 'com.android.voicemail.permission.WRITE_VOICEMAIL',
+  };
+
+  /**
+   * Check permission
+   * @param permission {string} The name of the permission
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  checkPermission(permission: string): Promise<any> { return; }
+
+  /**
+   * Request permission
+   * @param permission {string} The name of the permission to request
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  requestPermission(permission: string): Promise<any> { return; }
+
+  /**
+   * Request permissions
+   * @param permissions {Array<string>} An array with permissions
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  requestPermissions(permissions: string[]): Promise<any> { return; }
+
+  /**
+   * This function still works now, will not support in the future.
+   * @param permission {string} The name of the permission
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  hasPermission(permission: string): Promise<any> { return; }
+
+}
--- a/src/@ionic-native/plugins/app-minimize/index.ts
+++ b/src/@ionic-native/plugins/app-minimize/index.ts
@@ -0,0 +1,42 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name App Minimize
+ * @description
+ * AppMinimize is a plugin to minimize the application on android devices
+ *
+ * @usage
+ * ```typescript
+ * import { Platfrom } from 'ionic-angular';
+ * import { AppMinimize } from '@ionic-native/app-minimize';
+ *
+ *
+ * constructor(private platform: Platform, private appMinimize: AppMinimize) { }
+ *
+ * ...
+ *
+ * this.platform.registerBackButtonAction(() => {
+ *    this.appMinimize.minimize();
+ * });
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'AppMinimize',
+  plugin: 'cordova-plugin-appminimize',
+  pluginRef: 'plugins.appMinimize',
+  repo: 'https://github.com/tomloprod/cordova-plugin-appminimize',
+  platforms: ['Android']
+})
+@Injectable()
+export class AppMinimize extends IonicNativePlugin {
+
+  /**
+   * Minimizes the application
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  minimize(): Promise<any> { return; }
+
+}
--- a/src/@ionic-native/plugins/app-preferences/index.ts
+++ b/src/@ionic-native/plugins/app-preferences/index.ts
@@ -11,11 +11,12 @@ import { Injectable } from '@angular/core';
 * ```typescript
 * import { AppPreferences } from '@ionic-native/app-preferences';
 *
- * constructor(private appPreferences: AppPreferences) {
+ * constructor(private appPreferences: AppPreferences) { }
 *
- *   this.appPreferences.fetch('key').then((res) => { console.log(res); });
+ * ...
+ *
+ * this.appPreferences.fetch('key').then((res) => { console.log(res); });
 *
- * }
 * ```
 *
 */
@@ -24,7 +25,7 @@ import { Injectable } from '@angular/core';
  plugin: 'cordova-plugin-app-preferences',
  pluginRef: 'plugins.appPreferences',
  repo: 'https://github.com/apla/me.apla.cordova.app-preferences',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'OS X', 'Windows 8', 'Windows Phone']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'macOS', 'Windows 8', 'Windows Phone']
 })
@Injectable()
 export class AppPreferences extends IonicNativePlugin {
@@ -46,13 +47,13 @@ export class AppPreferences extends IonicNativePlugin {
   *
   * @param {string} dict Dictionary for key (OPTIONAL)
   * @param {string} key Key
-   * @param {string} value Value
+   * @param {any} value Value
   * @return {Promise<any>} Returns a promise
   */
  @Cordova({
    callbackOrder: 'reverse'
  })
-  store(dict: string, key: string, value?: string): Promise<any> {
+  store(dict: string, key: string, value?: any): Promise<any> {
    return;
  }

@@ -107,14 +108,16 @@ export class AppPreferences extends IonicNativePlugin {
   * @returns {Object} Custom object, bound to that suite
   */
  @Cordova({
-    platforms: ['Android']
+    platforms: ['Android'],
+    sync: true
  })
-  suite(suiteName: string): Object { return; }
+  suite(suiteName: string): any { return; }

  @Cordova({
-    platforms: ['iOS']
+    platforms: ['iOS'],
+    sync: true
  })
-  iosSuite(suiteName: string): Object { return; }
+  iosSuite(suiteName: string): any { return; }

  /**
   * Return cloud synchronized configuration context
--- a/src/@ionic-native/plugins/app-rate/index.ts
+++ b/src/@ionic-native/plugins/app-rate/index.ts
@@ -1,9 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';

-
-declare var window;
-
 export interface AppRatePreferences {

  /**
@@ -64,6 +61,10 @@ export interface AppRateCallbacks {
   * call back function. called when rate-dialog showing
   */
  onRateDialogShow?: Function;
+  /**
+   * call back function. called when user clicked on negative feedback
+   */
+  handleNegativeFeedback?: Function;

 }

@@ -110,12 +111,24 @@ export interface AppUrls {
 * constructor(private appRate: AppRate) { }
 *
 * ...
+ * // set certain preferences
+ * this.appRate.preferences.storeAppURL = {
+ *   ios: '<app_id>',
+ *   android: 'market://details?id=<package_name>',
+ *   windows: 'ms-windows-store://review/?ProductId=<store_id>'
+ * };
 *
- *  this.appRate.preferences.storeAppURL = {
- *    ios: '<my_app_id>',
+ * this.appRate.promptForRating(true);
+ *
+ * // or, override the whole preferences object
+ * this.appRate.preferences = {
+ *   usesUntilPrompt: 3,
+ *   storeAppURL: {
+ *    ios: '<app_id>',
 *    android: 'market://details?id=<package_name>',
- *    windows: 'ms-windows-store://review/?ProductId=<Store_ID>'
- *  };
+ *    windows: 'ms-windows-store://review/?ProductId=<store_id>'
+ *   }
+ * };
 *
 * this.appRate.promptForRating(false);
 * ```
@@ -131,7 +144,7 @@ export interface AppUrls {
  plugin: 'cordova-plugin-apprate',
  pluginRef: 'AppRate',
  repo: 'https://github.com/pushandplay/cordova-plugin-apprate',
-  platforms: ['Android', 'iOS', 'Windows (experimental)']
+  platforms: ['Android', 'BlackBerry 10', 'iOS', 'Windows']
 })
@Injectable()
 export class AppRate extends IonicNativePlugin {
@@ -150,4 +163,10 @@ export class AppRate extends IonicNativePlugin {
  @Cordova()
  promptForRating(immediately: boolean): void { };

+  /**
+   * Immediately send the user to the app store rating page
+   */
+  @Cordova()
+  navigateToAppStore(): void { };
+
 }
--- a/src/@ionic-native/plugins/app-update/index.ts
+++ b/src/@ionic-native/plugins/app-update/index.ts
@@ -19,7 +19,7 @@ import { Injectable } from '@angular/core';
 *
 * Then use the following code:
 *
- * ```
+ * ```typescript
 * import { AppUpdate } from '@ionic-native/app-update';
 *
 * constructor(private appUpdate: AppUpdate) {
@@ -28,8 +28,6 @@ import { Injectable } from '@angular/core';
 *    this.appUpdate.checkAppUpdate(updateUrl);
 *
 * }
- *
- *
 * ```
 *
 * The plugin will compare the app version and update it automatically if the API has a newer version to install.
@@ -53,4 +51,3 @@ export class AppUpdate extends IonicNativePlugin {
  })
  checkAppUpdate(updateUrl: string): Promise<any> { return; }
 }
-
--- a/src/@ionic-native/plugins/app-version/index.ts
+++ b/src/@ionic-native/plugins/app-version/index.ts
@@ -31,7 +31,7 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
  plugin: 'cordova-plugin-app-version',
  pluginRef: 'cordova.getAppVersion',
  repo: 'https://github.com/whiteoctober/cordova-plugin-app-version',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS', 'Windows']
 })
@Injectable()
 export class AppVersion extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/appodeal/index.ts
+++ b/src/@ionic-native/plugins/appodeal/index.ts
@@ -8,7 +8,7 @@ import { Injectable } from '@angular/core';
 * Plugin to serve ads through native Appodeal SDKs
 *
 * @usage
- * ```
+ * ```typescript
 * import { Appodeal } from '@ionic-native/appodeal';
 *
 * constructor(private appodeal: Appodeal) {
@@ -18,17 +18,14 @@ import { Injectable } from '@angular/core';
 *    appodeal.show(appodeal.AD_TYPES.REWARDED_VIDEO);
 *
 * }
- *
- *
- *
 * ```
 */
@Plugin({
  pluginName: 'Appodeal',
-  plugin: 'https://github.com/appodeal/appodeal-cordova-plugin',
+  plugin: 'https://github.com/appodeal/appodeal-cordova-plugin.git',
  pluginRef: 'Appodeal',
-  repo: 'https://github.com/appodeal/appodeal-cordova-plugin.git',
-  platforms: [ 'iOS', 'Android' ]
+  repo: 'https://github.com/appodeal/appodeal-cordova-plugin',
+  platforms: ['iOS', 'Android']
 })
@Injectable()
 export class Appodeal extends IonicNativePlugin {
@@ -49,7 +46,7 @@ export class Appodeal extends IonicNativePlugin {
   * @param {number} adType
   */
  @Cordova()
-  initialize(appKey: string, adType: number): void {};
+  initialize(appKey: string, adType: number): void { };

  /**
   * check if SDK has been initialized
@@ -76,21 +73,21 @@ export class Appodeal extends IonicNativePlugin {
  showWithPlacement(
    adType: number,
    placement: any
-  ): Promise<any> { return; };
+    ): Promise<any> { return; };

  /**
   * hide ad of specified type
   * @param {number} adType
   */
  @Cordova()
-  hide(adType: number): void {};
+  hide(adType: number): void { };

  /**
   * confirm use of ads of specified type
   * @param {number} adType
   */
  @Cordova()
-  confirm(adType: number): void {};
+  confirm(adType: number): void { };

  /**
   * check if ad of specified type has been loaded
@@ -114,69 +111,69 @@ export class Appodeal extends IonicNativePlugin {
   * @param autoCache
   */
  @Cordova()
-  setAutoCache(adType: number, autoCache: any): void {};
+  setAutoCache(adType: number, autoCache: any): void { };

  /**
   * forcefully cache an ad by type
   * @param {number} adType
   */
  @Cordova()
-  cache(adType: number): void {};
+  cache(adType: number): void { };

  /**
   *
   * @param {boolean} set
   */
  @Cordova()
-  setOnLoadedTriggerBoth(set: boolean): void {};
+  setOnLoadedTriggerBoth(set: boolean): void { };

  /**
   * enable or disable Smart Banners
   * @param {boolean} enabled
   */
  @Cordova()
-  setSmartBanners(enabled: boolean): void {};
+  setSmartBanners(enabled: boolean): void { };

  /**
   * enable or disable banner backgrounds
   * @param {boolean} enabled
   */
  @Cordova()
-  setBannerBackground(enabled: boolean): void {};
+  setBannerBackground(enabled: boolean): void { };

  /**
   * enable or disable banner animations
   * @param {boolean} enabled
   */
  @Cordova()
-  setBannerAnimation(enabled: boolean): void {};
+  setBannerAnimation(enabled: boolean): void { };

  /**
   *
   * @param value
   */
  @Cordova()
-  set728x90Banners(value: any): void {};
+  set728x90Banners(value: any): void { };

  /**
   * enable or disable logging
   * @param {boolean} logging
   */
  @Cordova()
-  setLogging(logging: boolean): void {};
+  setLogging(logging: boolean): void { };

  /**
   * enable or disable testing mode
   * @param {boolean} testing
   */
  @Cordova()
-  setTesting(testing: boolean): void {};
+  setTesting(testing: boolean): void { };

  /**
   * reset device ID
   */
  @Cordova()
-  resetUUID(): void {};
+  resetUUID(): void { };

  /**
   * get version of Appdeal SDK
@@ -190,7 +187,7 @@ export class Appodeal extends IonicNativePlugin {
   * @param {number} adType
   */
  @Cordova()
-  disableNetwork(network?: string, adType?: number): void {};
+  disableNetwork(network?: string, adType?: number): void { };

  /**
   *
@@ -198,54 +195,54 @@ export class Appodeal extends IonicNativePlugin {
   * @param {number} adType
   */
  @Cordova()
-  disableNetworkType(network?: string, adType?: number): void {};
+  disableNetworkType(network?: string, adType?: number): void { };

  /**
   * disable Location permissions for Appodeal SDK
   */
  @Cordova()
-  disableLocationPermissionCheck(): void {};
+  disableLocationPermissionCheck(): void { };

  /**
   * disable Storage permissions for Appodeal SDK
   */
  @Cordova()
-  disableWriteExternalStoragePermissionCheck(): void {};
+  disableWriteExternalStoragePermissionCheck(): void { };

  /**
   * enable event listeners
   * @param {boolean} enabled
   */
  @Cordova()
-  enableInterstitialCallbacks(enabled: boolean): void {};
+  enableInterstitialCallbacks(enabled: boolean): void { };

  /**
   * enable event listeners
   * @param {boolean} enabled
   */
  @Cordova()
-  enableSkippableVideoCallbacks(enabled: boolean): void {};
+  enableSkippableVideoCallbacks(enabled: boolean): void { };

  /**
   * enable event listeners
   * @param {boolean} enabled
   */
  @Cordova()
-  enableNonSkippableVideoCallbacks(enabled: boolean): void {};
+  enableNonSkippableVideoCallbacks(enabled: boolean): void { };

  /**
   * enable event listeners
   * @param {boolean} enabled
   */
  @Cordova()
-  enableBannerCallbacks(enabled: boolean): void {};
+  enableBannerCallbacks(enabled: boolean): void { };

  /**
   * enable event listeners
   * @param {boolean} enabled
   */
  @Cordova()
-  enableRewardedVideoCallbacks(enabled: boolean): void {};
+  enableRewardedVideoCallbacks(enabled: boolean): void { };

  /**
   *
@@ -253,7 +250,7 @@ export class Appodeal extends IonicNativePlugin {
   * @param {boolean} value
   */
  @Cordova()
-  setCustomBooleanRule(name: string, value: boolean): void {};
+  setCustomBooleanRule(name: string, value: boolean): void { };

  /**
   *
@@ -261,7 +258,7 @@ export class Appodeal extends IonicNativePlugin {
   * @param {number} value
   */
  @Cordova()
-  setCustomIntegerRule(name: string, value: number): void {};
+  setCustomIntegerRule(name: string, value: number): void { };

  /**
   * set rule with float value
@@ -269,7 +266,7 @@ export class Appodeal extends IonicNativePlugin {
   * @param {number} value
   */
  @Cordova()
-  setCustomDoubleRule(name: string, value: number): void {};
+  setCustomDoubleRule(name: string, value: number): void { };

  /**
   * set rule with string value
@@ -277,77 +274,77 @@ export class Appodeal extends IonicNativePlugin {
   * @param {string} value
   */
  @Cordova()
-  setCustomStringRule(name: string, value: string): void {};
+  setCustomStringRule(name: string, value: string): void { };

  /**
   * set ID preference in Appodeal for current user
   * @param id
   */
  @Cordova()
-  setUserId(id: any): void {};
+  setUserId(id: any): void { };

  /**
   * set Email preference in Appodeal for current user
   * @param email
   */
  @Cordova()
-  setEmail(email: any): void {};
+  setEmail(email: any): void { };

  /**
   * set Birthday preference in Appodeal for current user
   * @param birthday
   */
  @Cordova()
-  setBirthday(birthday: any): void {};
+  setBirthday(birthday: any): void { };

  /**
   * et Age preference in Appodeal for current user
   * @param age
   */
  @Cordova()
-  setAge(age: any): void {};
+  setAge(age: any): void { };

  /**
   * set Gender preference in Appodeal for current user
   * @param gender
   */
  @Cordova()
-  setGender(gender: any): void {};
+  setGender(gender: any): void { };

  /**
   * set Occupation preference in Appodeal for current user
   * @param occupation
   */
  @Cordova()
-  setOccupation(occupation: any): void {};
+  setOccupation(occupation: any): void { };

  /**
   * set Relation preference in Appodeal for current user
   * @param relation
   */
  @Cordova()
-  setRelation(relation: any): void {};
+  setRelation(relation: any): void { };

  /**
   * set Smoking preference in Appodeal for current user
   * @param smoking
   */
  @Cordova()
-  setSmoking(smoking: any): void {};
+  setSmoking(smoking: any): void { };

  /**
   * set Alcohol preference in Appodeal for current user
   * @param alcohol
   */
  @Cordova()
-  setAlcohol(alcohol: any): void {};
+  setAlcohol(alcohol: any): void { };

  /**
   * set Interests preference in Appodeal for current user
   * @param interests
   */
  @Cordova()
-  setInterests(interests: any): void {};
+  setInterests(interests: any): void { };

  @Cordova({
    eventObservable: true,
--- a/src/@ionic-native/plugins/autostart/index.ts
+++ b/src/@ionic-native/plugins/autostart/index.ts
@@ -0,0 +1,47 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name Autostart
+ * @description
+ * This plugin will start automatically your Android app after the every boot or the auto-update of your application.
+ * You can enable or disable the autostart function in your app.
+ *
+ * @usage
+ * ```typescript
+ * import { Autostart } from '@ionic-native/autostart';
+ *
+ *
+ * constructor(private autostart: Autostart) { }
+ *
+ * ...
+ *
+ * this.autostart.enable();
+ *
+ * this.autostart.disable();
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Autostart',
+  plugin: 'cordova-plugin-autostart',
+  pluginRef: 'cordova.plugins.autoStart',
+  repo: 'https://github.com/ToniKorin/cordova-plugin-autostart',
+  platforms: ['Android']
+})
+@Injectable()
+export class Autostart extends IonicNativePlugin {
+
+  /**
+   * Enable the automatic startup after the boot
+   */
+  @Cordova({ sync: true })
+  enable(): void { }
+
+  /**
+   * Disable the automatic startup after the boot
+   */
+  @Cordova({ sync: true })
+  disable(): void { }
+
+}
--- a/src/@ionic-native/plugins/background-fetch/index.ts
+++ b/src/@ionic-native/plugins/background-fetch/index.ts
@@ -1,9 +1,6 @@
 import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';

-declare var window;
-
-
 export interface BackgroundFetchConfig {

  /**
--- a/src/@ionic-native/plugins/background-geolocation/index.ts
+++ b/src/@ionic-native/plugins/background-geolocation/index.ts
@@ -2,8 +2,6 @@ import { Injectable } from '@angular/core';
 import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';

-declare var window;
-
 export interface BackgroundGeolocationResponse {

  /**
@@ -127,7 +125,7 @@ export interface BackgroundGeolocationConfig {
  startForeground?: boolean;

  /**
-   * ANDROID, WP8 ONLY
+   * ANDROID ONLY
   * When using BackgroundGeolocation.LocationProvider.ANDROID_DISTANCE_FILTER_PROVIDER:
   * The minimum time interval between location updates in milliseconds.
   * @see Android docs (http://developer.android.com/reference/android/location/LocationManager.html#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent))
@@ -266,7 +264,7 @@ export interface BackgroundGeolocationConfig {
 * BackgroundGeolocation must be called within app.ts and or before Geolocation. Otherwise the platform will not ask you for background tracking permission.
 *
 * ```typescript
- * import { BackgroundGeolocation, BackgroundGeolocationConfig } from '@ionic-native/background-geolocation';
+ * import { BackgroundGeolocation, BackgroundGeolocationConfig, BackgroundGeolocationResponse } from '@ionic-native/background-geolocation';
 *
 * constructor(private backgroundGeolocation: BackgroundGeolocation) { }
 *
@@ -308,7 +306,7 @@ export interface BackgroundGeolocationConfig {
  plugin: 'cordova-plugin-mauron85-background-geolocation',
  pluginRef: 'backgroundGeolocation',
  repo: 'https://github.com/mauron85/cordova-plugin-background-geolocation',
-  platforms: ['iOS', 'Android', 'Windows Phone 8']
+  platforms: ['Android', 'iOS']
 })
@Injectable()
 export class BackgroundGeolocation extends IonicNativePlugin {
@@ -393,7 +391,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   * @returns {Promise<any>}
   */
  @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
  })
  finish(): Promise<any> { return; }

@@ -403,7 +401,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   * @returns {Promise<any>}
   */
  @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
  })
  changePace(isMoving: boolean): Promise<any> { return; }

@@ -422,7 +420,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   * @returns {Promise<Location>}
   */
  @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
  })
  getStationaryLocation(): Promise<BackgroundGeolocationResponse> { return; }

@@ -432,7 +430,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   * @returns {Promise<any>}
   */
  @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
  })
  onStationary(): Promise<any> { return; }

@@ -448,13 +446,13 @@ export class BackgroundGeolocation extends IonicNativePlugin {
  /**
   * Display app settings to change permissions
   */
-  @Cordova({sync: true})
+  @Cordova({ sync: true })
  showAppSettings(): void { }

  /**
   * Display device location settings
   */
-  @Cordova({sync: true})
+  @Cordova({ sync: true })
  showLocationSettings(): void { }

  /**
--- a/src/@ionic-native/plugins/background-mode/index.ts
+++ b/src/@ionic-native/plugins/background-mode/index.ts
@@ -19,14 +19,14 @@ export interface BackgroundModeConfiguration {
  text?: String;

  /**
-   * This will look for <icon name>.png in platforms/android/res/drawable|mipmap
+   * This will look for `<icon name>.png` in platforms/android/res/drawable|mipmap
   */
  icon?: string;

  color?: string;

  /**
-   * By default the app will come to foreground when taping on the notification. If false, plugin wont come to foreground when tapped.
+   * By default the app will come to foreground when taping on the notification. If false, plugin won't come to foreground when tapped.
   */
  resume?: boolean;

@@ -50,7 +50,7 @@ export interface BackgroundModeConfiguration {
 * @name Background Mode
 * @description
 * Cordova plugin to prevent the app from going to sleep while in background.
- * Requires Cordova plugin: cordova-plugin-background-mode. For more info about plugin, vist: https://github.com/katzer/cordova-plugin-background-mode
+ * Requires Cordova plugin: cordova-plugin-background-mode. For more info about plugin, visit: https://github.com/katzer/cordova-plugin-background-mode
 *@usage
 * ```typescript
 * import { BackgroundMode } from '@ionic-native/background-mode';
@@ -70,7 +70,7 @@ export interface BackgroundModeConfiguration {
  plugin: 'cordova-plugin-background-mode',
  pluginRef: 'cordova.plugins.backgroundMode',
  repo: 'https://github.com/katzer/cordova-plugin-background-mode',
-  platforms: ['Android', 'iOS', 'Windows Phone 8']
+  platforms: ['AmazonFire OS', 'Android', 'Browser', 'iOS', 'Windows']
 })
@Injectable()
 export class BackgroundMode extends IonicNativePlugin {
@@ -112,7 +112,7 @@ export class BackgroundMode extends IonicNativePlugin {
  /**
   * Override the default title, ticker and text.
   * Available only for Android platform.
-   * @param {Configure} options List of option to configure. See table below
+   * @param {BackgroundModeConfiguration} options List of option to configure. See table below
   */
  @Cordova({
    platforms: ['Android']
@@ -122,12 +122,13 @@ export class BackgroundMode extends IonicNativePlugin {
  /**
   * Modify the displayed information.
   * Available only for Android platform.
-   * @param {Configure} options Any options you want to update. See table below.
+   * @param {BackgroundModeConfiguration} options Any options you want to update. See table below.
   */
  @Cordova({
-    platforms: ['Android']
+    platforms: ['Android'],
+    sync: true
  })
-  configure(options?: BackgroundModeConfiguration): Promise<any> { return; }
+  configure(options?: BackgroundModeConfiguration): void {}

  /**
   * Listen for events that the plugin fires. Available events are `enable`, `disable`, `activate`, `deactivate` and `failure`.
@@ -148,7 +149,16 @@ export class BackgroundMode extends IonicNativePlugin {
    platforms: ['Android'],
    sync: true
  })
-  moveToBackground(): void {}
+  moveToBackground(): void { }
+
+  /**
+   * Enable GPS-tracking in background (Android).
+   */
+  @Cordova({
+    platforms: ['Android'],
+    sync: true
+  })
+  disableWebViewOptimizations (): void { }

  /**
   * Android allows to programmatically move from background to foreground.
@@ -157,7 +167,7 @@ export class BackgroundMode extends IonicNativePlugin {
    platforms: ['Android'],
    sync: true
  })
-  moveToForeground(): void {}
+  moveToForeground(): void { }

  /**
   * Override the back button on Android to go to background instead of closing the app.
@@ -166,16 +176,16 @@ export class BackgroundMode extends IonicNativePlugin {
    platforms: ['Android'],
    sync: true
  })
-  overrideBackButton(): void {}
+  overrideBackButton(): void { }

  /**
-   * Exclude the app from the recent task list works on Android 5.0+.
+   * Exclude the app from the recent task list. Works on Android 5.0+.
   */
  @Cordova({
    platforms: ['Android'],
    sync: true
  })
-  excludeFromTaskList(): void {}
+  excludeFromTaskList(): void { }

  /**
   * The method works async instead of isActive() or isEnabled().
@@ -192,7 +202,7 @@ export class BackgroundMode extends IonicNativePlugin {
    platforms: ['Android'],
    sync: true
  })
-  wakeUp(): void {}
+  wakeUp(): void { }

  /**
   * Turn screen on and show app even locked
@@ -201,6 +211,6 @@ export class BackgroundMode extends IonicNativePlugin {
    platforms: ['Android'],
    sync: true
  })
-  unlock(): void {}
+  unlock(): void { }

 }
--- a/src/@ionic-native/plugins/backlight/index.ts
+++ b/src/@ionic-native/plugins/backlight/index.ts
@@ -9,7 +9,7 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 * This plugin adds turning on/off the device backlight.
 *
 * @usage
- * ```
+ * ```typescript
 * import { Backlight } from '@ionic-native/backlight';
 *
 * constructor(private backlight: Backlight) { }
--- a/src/@ionic-native/plugins/badge/index.ts
+++ b/src/@ionic-native/plugins/badge/index.ts
@@ -27,7 +27,7 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
  plugin: 'cordova-plugin-badge',
  pluginRef: 'cordova.plugins.notification.badge',
  repo: 'https://github.com/katzer/cordova-plugin-badge',
-  platforms: ['Android', 'iOS', 'Browser', 'Windows', 'Amazon FireOS', 'Windows Phone 8']
+  platforms: ['Android', 'Browser', 'iOS', 'Windows']
 })
@Injectable()
 export class Badge extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/barcode-scanner/index.ts
+++ b/src/@ionic-native/plugins/barcode-scanner/index.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';

-
 export interface BarcodeScannerOptions {

  /**
@@ -56,6 +55,12 @@ export interface BarcodeScannerOptions {

 }

+export interface BarcodeScanResult {
+  format: 'QR_CODE' | 'DATA_MATRIX' | 'UPC_E' | 'UPC_A' | 'EAN_8' | 'EAN_13' | 'CODE_128' | 'CODE_39' | 'CODE_93' | 'CODABAR' | 'ITF' | 'RSS14' | 'RSS_EXPANDED' | 'PDF417' | 'AZTEC' | 'MSI';
+  cancelled: boolean;
+  text: string;
+}
+
 /**
 * @name Barcode Scanner
 * @description
@@ -80,13 +85,14 @@ export interface BarcodeScannerOptions {
 * ```
 * @interfaces
 * BarcodeScannerOptions
+ * BarcodeScanResult
 */
@Plugin({
  pluginName: 'BarcodeScanner',
  plugin: 'phonegap-plugin-barcodescanner',
  pluginRef: 'cordova.plugins.barcodeScanner',
  repo: 'https://github.com/phonegap/phonegap-plugin-barcodescanner',
-  platforms: ['Android', 'iOS', 'Windows Phone 8', 'Windows 10', 'Windows 8', 'BlackBerry 10', 'Browser']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'Windows']
 })
@Injectable()
 export class BarcodeScanner extends IonicNativePlugin {
@@ -111,7 +117,7 @@ export class BarcodeScanner extends IonicNativePlugin {
  @Cordova({
    callbackOrder: 'reverse'
  })
-  scan(options?: BarcodeScannerOptions): Promise<any> { return; }
+  scan(options?: BarcodeScannerOptions): Promise<BarcodeScanResult> { return; }

  /**
   * Encodes data into a barcode.
--- a/src/@ionic-native/plugins/base64-to-gallery/index.ts
+++ b/src/@ionic-native/plugins/base64-to-gallery/index.ts
@@ -40,7 +40,7 @@ export class Base64ToGallery extends IonicNativePlugin {
    successIndex: 2,
    errorIndex: 3
  })
-  base64ToGallery(data: string, options?: {prefix?: string; mediaScanner?: boolean}): Promise<any> {
+  base64ToGallery(data: string, options?: { prefix?: string; mediaScanner?: boolean }): Promise<any> {
    return;
  }

--- a/src/@ionic-native/plugins/base64/index.ts
+++ b/src/@ionic-native/plugins/base64/index.ts
@@ -0,0 +1,45 @@
+import { Injectable } from '@angular/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * @beta
+ * @name Base64
+ * @description
+ * This Plugin is used to encode base64 of any file, it uses js code for iOS, but in case of android it uses native code to handle android versions lower than v.3
+ *
+ * @usage
+ * ```typescript
+ * import { Base64 } from '@ionic-native/base64';
+ *
+ * constructor(private base64: Base64) { }
+ *
+ * ...
+ *
+ * let filePath: string = 'file:///...';
+ * this.base64.encodeFile(filePath).then((base64File: string) => {
+ *   console.log(base64File);
+ * }, (err) => {
+ *   console.log(err);
+ * });
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Base64',
+  plugin: 'com-badrit-base64',
+  pluginRef: 'plugins.Base64',
+  repo: 'https://github.com/hazemhagrass/phonegap-base64',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class Base64 extends IonicNativePlugin {
+
+  /**
+   * This function encodes base64 of any file
+   * @param {string} filePath Absolute file path
+   * @return {Promise<string>} Returns a promise that resolves when the file is successfully encoded
+   */
+  @Cordova()
+  encodeFile(filePath: string): Promise<string> { return; }
+
+}
--- a/src/@ionic-native/plugins/battery-status/index.ts
+++ b/src/@ionic-native/plugins/battery-status/index.ts
@@ -49,7 +49,7 @@ export interface BatteryStatusResponse {
  plugin: 'cordova-plugin-battery-status',
  pluginRef: 'navigator.battery',
  repo: 'https://github.com/apache/cordova-plugin-battery-status',
-  platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser']
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows']
 })
@Injectable()
 export class BatteryStatus extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/ble/index.ts
+++ b/src/@ionic-native/plugins/ble/index.ts
@@ -35,59 +35,59 @@ import { Observable } from 'rxjs/Observable';
 *
 * ```typescript
 *   {
- *       "name": "Battery Demo",
- *       "id": "20:FF:D0:FF:D1:C0",
- *       "advertising": [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
- *       "rssi": -55
+ *       'name': 'Battery Demo',
+ *       'id': '20:FF:D0:FF:D1:C0',
+ *       'advertising': [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
+ *       'rssi': -55
 *   }
 * ```
 * After connecting, the peripheral object also includes service, characteristic and descriptor information.
 *
 * ```typescript
 *   {
- *       "name": "Battery Demo",
- *       "id": "20:FF:D0:FF:D1:C0",
- *       "advertising": [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
- *       "rssi": -55,
- *       "services": [
- *           "1800",
- *           "1801",
- *           "180f"
+ *       'name': 'Battery Demo',
+ *       'id': '20:FF:D0:FF:D1:C0',
+ *       'advertising': [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
+ *       'rssi': -55,
+ *       'services': [
+ *           '1800',
+ *           '1801',
+ *           '180f'
 *       ],
- *       "characteristics": [
+ *       'characteristics': [
 *           {
- *               "service": "1800",
- *               "characteristic": "2a00",
- *               "properties": [
- *                   "Read"
+ *               'service': '1800',
+ *               'characteristic': '2a00',
+ *               'properties': [
+ *                   'Read'
 *               ]
 *           },
 *           {
- *               "service": "1800",
- *               "characteristic": "2a01",
- *               "properties": [
- *                   "Read"
+ *               'service': '1800',
+ *               'characteristic': '2a01',
+ *               'properties': [
+ *                   'Read'
 *               ]
 *           },
 *           {
- *               "service": "1801",
- *               "characteristic": "2a05",
- *               "properties": [
- *                   "Read"
+ *               'service': '1801',
+ *               'characteristic': '2a05',
+ *               'properties': [
+ *                   'Read'
 *               ]
 *           },
 *           {
- *               "service": "180f",
- *               "characteristic": "2a19",
- *               "properties": [
- *                   "Read"
+ *               'service': '180f',
+ *               'characteristic': '2a19',
+ *               'properties': [
+ *                   'Read'
 *               ],
- *               "descriptors": [
+ *               'descriptors': [
 *                   {
- *                       "uuid": "2901"
+ *                       'uuid': '2901'
 *                   },
 *                   {
- *                       "uuid": "2904"
+ *                       'uuid': '2904'
 *                   }
 *               ]
 *           }
@@ -104,10 +104,10 @@ import { Observable } from 'rxjs/Observable';
 *
 * ```typescript
 *   {
- *       "name": "demo",
- *       "id": "00:1A:7D:DA:71:13",
- *       "advertising": ArrayBuffer,
- *      "rssi": -37
+ *       'name': 'demo',
+ *       'id': '00:1A:7D:DA:71:13',
+ *       'advertising': ArrayBuffer,
+ *      'rssi': -37
 *  }
 * ```
 *
@@ -119,24 +119,24 @@ import { Observable } from 'rxjs/Observable';
 *
 * ```typescript
 *   {
- *       "name": "demo",
- *       "id": "D8479A4F-7517-BCD3-91B5-3302B2F81802",
- *       "advertising": {
- *           "kCBAdvDataChannel": 37,
- *           "kCBAdvDataServiceData": {
- *               "FED8": {
- *                   "byteLength": 7 // data not shown
+ *       'name': 'demo',
+ *       'id': 'D8479A4F-7517-BCD3-91B5-3302B2F81802',
+ *       'advertising': {
+ *           'kCBAdvDataChannel': 37,
+ *           'kCBAdvDataServiceData': {
+ *               'FED8': {
+ *                   'byteLength': 7 // data not shown
 *               }
 *           },
- *           "kCBAdvDataLocalName": "demo",
- *           "kCBAdvDataServiceUUIDs": ["FED8"],
- *           "kCBAdvDataManufacturerData": {
- *               "byteLength": 7  // data not shown
+ *           'kCBAdvDataLocalName': 'demo',
+ *           'kCBAdvDataServiceUUIDs': ['FED8'],
+ *           'kCBAdvDataManufacturerData': {
+ *               'byteLength': 7  // data not shown
 *           },
- *           "kCBAdvDataTxPowerLevel": 32,
- *           "kCBAdvDataIsConnectable": true
+ *           'kCBAdvDataTxPowerLevel': 32,
+ *           'kCBAdvDataIsConnectable': true
 *       },
- *       "rssi": -53
+ *       'rssi': -53
 *   }
 * ```
 *
@@ -173,7 +173,7 @@ import { Observable } from 'rxjs/Observable';
  plugin: 'cordova-plugin-ble-central',
  pluginRef: 'ble',
  repo: 'https://github.com/don/cordova-plugin-ble-central',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
@Injectable()
 export class BLE extends IonicNativePlugin {
@@ -230,7 +230,7 @@ export class BLE extends IonicNativePlugin {
    clearFunction: 'stopScan',
    clearWithArgs: false
  })
-  startScanWithOptions(services: string[], options: {reportDuplicates?: boolean} | any): Observable<any> { return; }
+  startScanWithOptions(services: string[], options: { reportDuplicates?: boolean } | any): Observable<any> { return; }

  /**
   * Stop a scan started by `startScan`.
@@ -306,14 +306,14 @@ export class BLE extends IonicNativePlugin {
   * // send 1 byte to switch a light on
   * var data = new Uint8Array(1);
   * data[0] = 1;
-   * BLE.write(device_id, "FF10", "FF11", data.buffer);
+   * BLE.write(device_id, 'FF10', 'FF11', data.buffer);
   *
   * // send a 3 byte value with RGB color
   * var data = new Uint8Array(3);
   * data[0] = 0xFF;  // red
   * data[0] = 0x00; // green
   * data[0] = 0xFF; // blue
-   * BLE.write(device_id, "ccc0", "ccc1", data.buffer);
+   * BLE.write(device_id, 'ccc0', 'ccc1', data.buffer);
   *
   * // send a 32 bit integer
   * var data = new Uint32Array(1);
@@ -357,7 +357,7 @@ export class BLE extends IonicNativePlugin {
   *
   * @usage
   * ```
-   * BLE.startNotification(device_id, "FF10", "FF11").subscribe(buffer => {
+   * BLE.startNotification(device_id, 'FF10', 'FF11').subscribe(buffer => {
   *   console.log(String.fromCharCode.apply(null, new Uint8Array(buffer));
   * });
   * ```
@@ -441,7 +441,7 @@ export class BLE extends IonicNativePlugin {
   *@returns {Promise<any>}
   */
  @Cordova()
-  static readRSSI(
+  readRSSI(
    deviceId: string,
  ): Promise<any> { return; }
 }
--- a/src/@ionic-native/plugins/bluetooth-serial/index.ts
+++ b/src/@ionic-native/plugins/bluetooth-serial/index.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable';

 /**
 * @name Bluetooth Serial
- * @description This plugin enables serial communication over Bluetooth. It was written for communicating between Android or iOS and an Arduino.
+ * @description This plugin enables serial communication over Bluetooth. It was written for communicating between Android or iOS and an Arduino (not Android to Android or iOS to iOS).
 * @usage
 * ```typescript
 * import { BluetoothSerial } from '@ionic-native/bluetooth-serial';
@@ -13,7 +13,7 @@ import { Observable } from 'rxjs/Observable';
 *
 *
 * // Write a string
- * this.bluetoothSerial.write("hello world").then(success, failure);
+ * this.bluetoothSerial.write('hello world').then(success, failure);
 *
 * // Array of int or bytes
 * this.bluetoothSerial.write([186, 220, 222]).then(success, failure);
@@ -35,7 +35,7 @@ import { Observable } from 'rxjs/Observable';
  repo: 'https://github.com/don/BluetoothSerial',
  plugin: 'cordova-plugin-bluetooth-serial',
  pluginRef: 'bluetoothSerial',
-  platforms: ['Android', 'iOS', 'Windows Phone', 'Browser']
+  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
@Injectable()
 export class BluetoothSerial extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/brightness/index.ts
+++ b/src/@ionic-native/plugins/brightness/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';

+
 /**
 * @name Brightness
 * @description
--- a/src/@ionic-native/plugins/broadcaster/index.ts
+++ b/src/@ionic-native/plugins/broadcaster/index.ts
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs/Observable';
 * This plugin adds exchanging events between native code and your app.
 *
 * @usage
- * ```
+ * ```typescript
 * import { Broadcaster } from '@ionic-native/broadcaster';
 *
 * constructor(private broadcaster: Broadcaster) { }
@@ -16,7 +16,7 @@ import { Observable } from 'rxjs/Observable';
 * ...
 *
 * // Listen to events from Native
- * this.broadcaster.addEventListener('eventName').then((event) => console.log(event));
+ * this.broadcaster.addEventListener('eventName').subscribe((event) => console.log(event));
 *
 * // Send event to Native
 * this.broadcaster.fireNativeEvent('eventName', {}).then(() => console.log('success'));
--- a/src/@ionic-native/plugins/browser-tab/index.ts
+++ b/src/@ionic-native/plugins/browser-tab/index.ts
@@ -7,7 +7,7 @@ import { Injectable } from '@angular/core';
 * This plugin provides an interface to in-app browser tabs that exist on some mobile platforms, specifically [Custom Tabs](http://developer.android.com/tools/support-library/features.html#custom-tabs) on Android (including the [Chrome Custom Tabs](https://developer.chrome.com/multidevice/android/customtabs) implementation), and [SFSafariViewController](https://developer.apple.com/library/ios/documentation/SafariServices/Reference/SFSafariViewController_Ref/) on iOS.
 *
 * @usage
- * ```
+ * ```typescript
 * import { BrowserTab } from '@ionic-native/browser-tab';
 *
 * constructor(private browserTab: BrowserTab) {
--- a/src/@ionic-native/plugins/calendar/index.ts
+++ b/src/@ionic-native/plugins/calendar/index.ts
@@ -59,7 +59,7 @@ export interface CalendarOptions {
 *
 *
 * @usage
- * ```
+ * ```typescript
 * import { Calendar } from '@ionic-native/calendar';
 *
 * constructor(private calendar: Calendar) { }
--- a/src/@ionic-native/plugins/call-number/index.ts
+++ b/src/@ionic-native/plugins/call-number/index.ts
@@ -4,9 +4,10 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 * @name Call Number
 * @description
 * Call a number directly from your Cordova/Ionic application.
+ * **NOTE**: The iOS Simulator (and maybe Android Simulators) do not provide access to the phone subsystem.
 *
 * @usage
- * ```
+ * ```typescript
 * import { CallNumber } from '@ionic-native/call-number';
 *
 * constructor(private callNumber: CallNumber) { }
@@ -14,7 +15,7 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 * ...
 *
 *
- * this.callNumber.callNumber(18001010101, true)
+ * this.callNumber.callNumber("18001010101", true)
 *   .then(() => console.log('Launched dialer!'))
 *   .catch(() => console.log('Error launching dialer'));
 *
@@ -25,7 +26,7 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
  plugin: 'call-number',
  pluginRef: 'plugins.CallNumber',
  repo: 'https://github.com/Rohfosho/CordovaCallNumberPlugin',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
@Injectable()
 export class CallNumber extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/camera-preview/index.ts
+++ b/src/@ionic-native/plugins/camera-preview/index.ts
@@ -39,12 +39,12 @@ export interface CameraPreviewOptions {
 }

 export interface CameraPreviewPictureOptions {
-    /** The width in pixels, default 0 */
-    width?: number;
-    /** The height in pixels, default 0 */
-    height?: number;
-    /** The picture quality, 0 - 100, default 85 */
-    quality?: number;
+  /** The width in pixels, default 0 */
+  width?: number;
+  /** The height in pixels, default 0 */
+  height?: number;
+  /** The picture quality, 0 - 100, default 85 */
+  quality?: number;
 }

 /**
@@ -57,7 +57,7 @@ export interface CameraPreviewPictureOptions {
 *
 * @usage
 * ```typescript
- * import { CameraPreview, PictureOptions, CameraPreviewOptions, CameraPreviewDimensions } from '@ionic-native/camera-preview';
+ * import { CameraPreview, CameraPreviewPictureOptions, CameraPreviewOptions, CameraPreviewDimensions } from '@ionic-native/camera-preview';
 *
 * constructor(private cameraPreview: CameraPreview) { }
 *
@@ -93,7 +93,7 @@ export interface CameraPreviewPictureOptions {
 *
 *
 * // picture options
- * const pictureOpts: PictureOptions = {
+ * const pictureOpts: CameraPreviewPictureOptions = {
 *   width: 1280,
 *   height: 1280,
 *   quality: 85
@@ -134,7 +134,18 @@ export interface CameraPreviewPictureOptions {
@Injectable()
 export class CameraPreview extends IonicNativePlugin {

-  EXPOSURE_MODES = {
+  FOCUS_MODE = {
+    FIXED: 'fixed',
+    AUTO: 'auto',
+    CONTINUOUS: 'continuous', // IOS Only
+    CONTINUOUS_PICTURE: 'continuous-picture', // Android Only
+    CONTINUOUS_VIDEO: 'continuous-video', // Android Only
+    EDOF: 'edof', // Android Only
+    INFINITY: 'infinity', // Android Only
+    MACRO: 'macro' // Android Only
+  };
+
+  EXPOSURE_MODE = {
    LOCK: 'lock', // IOS Only
    AUTO: 'auto', // IOS Only
    CONTINUOUS: 'continuous',
@@ -240,10 +251,10 @@ export class CameraPreview extends IonicNativePlugin {
  })
  setZoom(zoom?: number): Promise<any> { return; }

-/**
-   * Get the maximum zoom (Android)
-   * @return {Promise<any>}
-   */
+  /**
+     * Get the maximum zoom (Android)
+     * @return {Promise<any>}
+     */
  @Cordova()
  getMaxZoom(): Promise<any> { return; }

@@ -265,6 +276,38 @@ export class CameraPreview extends IonicNativePlugin {
  })
  setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> { return; }

+  /**
+   * Get focus mode
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getFocusMode(): Promise<any> { return; }
+
+  /**
+   * Set the focus mode
+   * @param [focusMode] {string} 'fixed', 'auto', 'continuous-picture', 'continuous-video' (iOS & Android), 'edof', 'infinity', 'macro' (Android Only)
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  setFocusMode(focusMode?: string): Promise<any> { return; }
+
+  /**
+   * Get supported focus modes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getSupportedFocusModes(): Promise<any> { return; }
+
+  /**
+   * Get the current flash mode
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getFlashMode(): Promise<any> { return; }
+
  /**
   * Set the flashmode
   * @param [flashMode] {string} 'off' (iOS & Android), 'on' (iOS & Android), 'auto' (iOS & Android), 'torch' (Android)
@@ -276,13 +319,6 @@ export class CameraPreview extends IonicNativePlugin {
  })
  setFlashMode(flashMode?: string): Promise<any> { return; }

-  /**
-   * Get supported picture sizes
-   * @return {Promise<any>}
-   */
-  @Cordova()
-  getSupportedPictureSizes(): Promise<any> { return; }
-
  /**
   * Get supported flash modes
   * @return {Promise<any>}
@@ -290,6 +326,13 @@ export class CameraPreview extends IonicNativePlugin {
  @Cordova()
  getSupportedFlashModes(): Promise<any> { return; }

+  /**
+   * Get supported picture sizes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getSupportedPictureSizes(): Promise<any> { return; }
+
  /**
   * Get exposure mode
   * @return {Promise<any>}
@@ -340,4 +383,13 @@ export class CameraPreview extends IonicNativePlugin {
  @Cordova()
  getExposureCompensationRange(): Promise<any> { return; }

+  /**
+   * Set specific focus point. Note, this assumes the camera is full-screen.
+   * @param xPoint {number}
+   * @param yPoint {number}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  tapToFocus(xPoint: number, yPoint: number): Promise<any> { return; }
+
 }
--- a/src/@ionic-native/plugins/camera/index.ts
+++ b/src/@ionic-native/plugins/camera/index.ts
@@ -85,6 +85,42 @@ export interface CameraPopoverOptions {
  arrowDir: number;
 }

+export enum DestinationType {
+  DATA_URL = 0,
+  FILE_URL,
+  NATIVE_URI
+}
+
+export enum EncodingType {
+  JPEG = 0,
+  PNG
+}
+
+export enum MediaType {
+  PICTURE = 0,
+  VIDEO,
+  ALLMEDIA
+}
+
+export enum PictureSourceType {
+  PHOTOLIBRARY = 0,
+  CAMERA,
+  SAVEDPHOTOALBUM
+}
+
+export enum PopoverArrowDirection {
+  ARROW_UP = 1,
+  ARROW_DOWN,
+  ARROW_LEFT,
+  ARROW_RIGHT,
+  ARROW_ANY
+}
+
+export enum Direction {
+  BACK = 0,
+  FRONT
+}
+
 /**
 * @name Camera
 * @description
@@ -125,7 +161,7 @@ export interface CameraPopoverOptions {
  plugin: 'cordova-plugin-camera',
  pluginRef: 'navigator.camera',
  repo: 'https://github.com/apache/cordova-plugin-camera',
-  platforms: ['Android', 'BlackBerry', 'Browser', 'Firefox', 'FireOS', 'iOS', 'Windows', 'Windows Phone 8', 'Ubuntu']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone 8']
 })
@Injectable()
 export class Camera extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/card-io/index.ts
+++ b/src/@ionic-native/plugins/card-io/index.ts
@@ -133,7 +133,12 @@ export interface CardIOResponse {
 * @name Card IO
 * @description
 * @usage
- * ```
+ * Note: For use with iOS 10 + When building your app with the iOS 10 SDK +, you have to add some info to the info.plist file. This is due to increased security in iOS 10. Go to your app directory and search for the <your app name>Info.plist file. Add the following lines in the main <dict> element.
+ * ```xml
+ *<key>NSCameraUsageDescription</key>
+ *<string>To scan credit cards.</string>
+ *```
+ * ```typescript
 * import { CardIO } from '@ionic-native/card-io';
 *
 * constructor(private cardIO: CardIO) { }
@@ -147,7 +152,7 @@ export interface CardIOResponse {
 *       if(res){
 *         let options = {
 *           requireExpiry: true,
- *           requireCCV: false,
+ *           requireCVV: false,
 *           requirePostalCode: false
 *         };
 *         CardIO.scan(options);
@@ -164,7 +169,7 @@ export interface CardIOResponse {
  plugin: 'card.io.cordova.mobilesdk',
  pluginRef: 'CardIO',
  repo: 'https://github.com/card-io/card.io-Cordova-Plugin',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
@Injectable()
 export class CardIO extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/clipboard/index.ts
+++ b/src/@ionic-native/plugins/clipboard/index.ts
@@ -5,8 +5,6 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 * @description
 * Clipboard management plugin for Cordova that supports iOS, Android, and Windows Phone 8.
 *
- * Requires Cordova plugin: https://github.com/VersoSolutions/CordovaClipboard
- * For more info, please see the [Clipboard plugin docs](https://github.com/VersoSolutions/CordovaClipboard.git).
 *
 * @usage
 * ```typescript
@@ -31,10 +29,10 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 */
@Plugin({
  pluginName: 'Clipboard',
-  plugin: 'https://github.com/VersoSolutions/CordovaClipboard.git',
+  plugin: 'cordova-clipboard',
  pluginRef: 'cordova.plugins.clipboard',
-  repo: 'https://github.com/VersoSolutions/CordovaClipboard',
-  platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser']
+  repo: 'https://github.com/ihadeed/cordova-clipboard',
+  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
@Injectable()
 export class Clipboard extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/code-push/index.ts
+++ b/src/@ionic-native/plugins/code-push/index.ts
@@ -109,8 +109,8 @@ interface LocalPackage_Static {
 }
 /* tslint:enable */

-declare var RemotePackage: RemotePackage_Static;
-declare var LocalPackage: LocalPackage_Static;
+declare const RemotePackage: RemotePackage_Static;
+declare const LocalPackage: LocalPackage_Static;

 /**
 * Defines the JSON format of the current package information file.
--- a/src/@ionic-native/plugins/contacts/index.ts
+++ b/src/@ionic-native/plugins/contacts/index.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { CordovaInstance, InstanceProperty, Plugin, getPromise, InstanceCheck, checkAvailability, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';

-declare var window: any,
+declare const window: any,
  navigator: any;

 export type ContactFieldType = '*' | 'addresses' | 'birthday' | 'categories' | 'country' | 'department' | 'displayName' | 'emails' | 'familyName' | 'formatted' | 'givenName' | 'honorificPrefix' | 'honorificSuffix' | 'id' | 'ims' | 'locality' | 'middleName' | 'name' | 'nickname' | 'note' | 'organizations' | 'phoneNumbers' | 'photos' | 'postalCode' | 'region' | 'streetAddress' | 'title' | 'urls';
@@ -49,6 +49,7 @@ export interface IContactProperties {

  /** An array of web pages associated with the contact. */
  urls?: IContactField[];
+
 }

 /**
@@ -71,6 +72,8 @@ export class Contact implements IContactProperties {
  @InstanceProperty categories: IContactField[];
  @InstanceProperty urls: IContactField[];

+  [key: string]: any;
+
  constructor() {
    if (checkAvailability('navigator.contacts', 'create', 'Contacts') === true) {
      this._objectInstance = navigator.contacts.create();
@@ -79,7 +82,7 @@ export class Contact implements IContactProperties {

  @InstanceCheck()
  clone(): Contact {
-    let newContact = new Contact();
+    let newContact: any = new Contact();
    for (let prop in this) {
      if (prop === 'id') return;
      newContact[prop] = this[prop];
@@ -92,8 +95,8 @@ export class Contact implements IContactProperties {

  @InstanceCheck()
  save(): Promise<any> {
-    return getPromise((resolve, reject) => {
-      this._objectInstance.save((contact) => {
+    return getPromise((resolve: Function, reject: Function) => {
+      this._objectInstance.save((contact: any) => {
        this._objectInstance = contact;
        resolve(this);
      }, reject);
@@ -114,7 +117,7 @@ export interface IContactError {
 /**
 * @hidden
 */
-export declare var ContactError: {
+export declare const ContactError: {
  new (code: number): IContactError;
  UNKNOWN_ERROR: number;
  INVALID_ARGUMENT_ERROR: number;
@@ -145,16 +148,16 @@ export interface IContactName {
 */
 export class ContactName implements IContactName {
  constructor(public formatted?: string,
-              public familyName?: string,
-              public givenName?: string,
-              public middleName?: string,
-              public honorificPrefix?: string,
-              public honorificSuffix?: string) {}
+    public familyName?: string,
+    public givenName?: string,
+    public middleName?: string,
+    public honorificPrefix?: string,
+    public honorificSuffix?: string) { }
 }

 export interface IContactField {
  /** A string that indicates what type of field this is, home for example. */
-    type?: string;
+  type?: string;
  /** The value of the field, such as a phone number or email address. */
  value?: string;
  /** Set to true if this ContactField contains the user's preferred value. */
@@ -166,15 +169,15 @@ export interface IContactField {
 */
 export class ContactField implements IContactField {
  constructor(public type?: string,
-              public value?: string,
-              public pref?: boolean) {}
+    public value?: string,
+    public pref?: boolean) { }
 }

 export interface IContactAddress {
  /** Set to true if this ContactAddress contains the user's preferred value. */
  pref?: boolean;
  /** A string indicating what type of field this is, home for example. */
-    type?: string;
+  type?: string;
  /** The full address formatted for display. */
  formatted?: string;
  /** The full street address. */
@@ -194,20 +197,20 @@ export interface IContactAddress {
 */
 export class ContactAddress implements IContactAddress {
  constructor(public pref?: boolean,
-              public type?: string,
-              public formatted?: string,
-              public streetAddress?: string,
-              public locality?: string,
-              public region?: string,
-              public postalCode?: string,
-              public country?: string) {}
+    public type?: string,
+    public formatted?: string,
+    public streetAddress?: string,
+    public locality?: string,
+    public region?: string,
+    public postalCode?: string,
+    public country?: string) { }
 }

 export interface IContactOrganization {
  /** Set to true if this ContactOrganization contains the user's preferred value. */
  pref?: boolean;
  /** A string that indicates what type of field this is, home for example. */
-    type?: string;
+  type?: string;
  /** The name of the organization. */
  name?: string;
  /** The department the contract works for. */
@@ -226,7 +229,7 @@ export class ContactOrganization implements IContactOrganization {
    public department?: string,
    public title?: string,
    public pref?: boolean
-  ) {}
+  ) { }
 }

 /** Search options to filter navigator.contacts.  */
@@ -248,9 +251,9 @@ export interface IContactFindOptions {
 */
 export class ContactFindOptions implements IContactFindOptions {
  constructor(public filter?: string,
-              public multiple?: boolean,
-              public desiredFields?: string[],
-              public hasPhoneNumber?: boolean) {}
+    public multiple?: boolean,
+    public desiredFields?: string[],
+    public hasPhoneNumber?: boolean) { }
 }

 /**
@@ -291,7 +294,7 @@ export class ContactFindOptions implements IContactFindOptions {
  plugin: 'cordova-plugin-contacts',
  pluginRef: 'navigator.contacts',
  repo: 'https://github.com/apache/cordova-plugin-contacts',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows 8', 'Windows Phone']
+  platforms: ['Android', 'BlackBerry 10', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone 8']
 })
@Injectable()
 export class Contacts extends IonicNativePlugin {
@@ -312,8 +315,8 @@ export class Contacts extends IonicNativePlugin {
   */
  @CordovaCheck()
  find(fields: ContactFieldType[], options?: IContactFindOptions): Promise<Contact[]> {
-    return getPromise((resolve, reject) => {
-      navigator.contacts.find(fields, (contacts) => {
+    return getPromise((resolve: Function, reject: Function) => {
+      navigator.contacts.find(fields, (contacts: any[]) => {
        resolve(contacts.map(processContact));
      }, reject, options);
    });
@@ -325,8 +328,8 @@ export class Contacts extends IonicNativePlugin {
   */
  @CordovaCheck()
  pickContact(): Promise<Contact> {
-    return getPromise((resolve, reject) => {
-      navigator.contacts.pickContact((contact) => resolve(processContact(contact)), reject);
+    return getPromise((resolve: Function, reject: Function) => {
+      navigator.contacts.pickContact((contact: any) => resolve(processContact(contact)), reject);
    });
  }

@@ -335,7 +338,7 @@ export class Contacts extends IonicNativePlugin {
 /**
 * @hidden
 */
-function processContact(contact) {
+function processContact(contact: any) {
  let newContact = new Contact();
  for (let prop in contact) {
    if (typeof contact[prop] === 'function') continue;
--- a/src/@ionic-native/plugins/couchbase-lite/index.ts
+++ b/src/@ionic-native/plugins/couchbase-lite/index.ts
@@ -8,22 +8,61 @@ import { Injectable } from '@angular/core';
 * Plugin to install Couchbase Lite in your PhoneGap app on iOS or Android
 *
 * @usage
- * ```
+ * ```typescript
 * import { CouchbaseLite } from '@ionic-native/couchbase-lite';
- *
- * constructor(private couchbase: CouchbaseLite) {
- *
- *   couchbase.getURL()
- *     .then(url => console.log(url))
- *     .catch(error => console.error(error));
- *
+ * import { Http } from '@angular/http';
+ * import { Observable } from 'rxjs/Observable'
+ * constructor(private couchbase: CouchbaseLite, private platform:Platform,private _http:Http) {
+ *    this.initMethod();
 * }
+ * url:string;
+ * initMethod() {
+ *    this.couchbase.getURL().then((url)=> {
+ *        this.url = url;
+ *    })
+ * }
+ * getUrl() {
+ *      return this.url;
+ * }
+ * // DATABASES //
+ * createDatabase(database_name:string) {
+ *      let url = this.getUrl();
+ *      url = url+database_name;
+ *      return this._http
+ *        .put(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *         })
+ *  }
+ * deleteDatabase(database_name:string) {
+ *      let url = this.getUrl();
+ *      url = url+database_name;
+ *      return this._http
+ *        .delete(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })
+ * }
+ *
+ * getAllDbs() {
+ *      let url = this.getUrl();
+ *      url = url+'_all_dbs';
+ *      return this._http
+ *        .get(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })
+ * }
+ *
 *
 * ```
 */
@Plugin({
  pluginName: 'CouchbaseLite',
-  plugin: 'https://github.com/couchbaselabs/Couchbase-Lite-PhoneGap-Plugin',
+  plugin: 'couchbase-lite-phonegap-plugin',
  pluginRef: 'cblite',
  repo: 'https://github.com/couchbaselabs/Couchbase-Lite-PhoneGap-Plugin',
  platforms: ['Android', 'iOS']
@@ -38,6 +77,6 @@ export class CouchbaseLite extends IonicNativePlugin {
  @Cordova({
    callbackStyle: 'node'
  })
-  getURL(): Promise<any> { return;  }
+  getURL(): Promise<any> { return; }

 }
--- a/src/@ionic-native/plugins/crop/index.ts
+++ b/src/@ionic-native/plugins/crop/index.ts
@@ -5,7 +5,7 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 * @name Crop
 * @description Crops images
 * @usage
- * ```
+ * ```typescript
 * import { Crop } from '@ionic-native/crop';
 *
 * constructor(private crop: Crop) { }
@@ -14,8 +14,8 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 *
 * this.crop.crop('path/to/image.jpg', {quality: 75})
 *   .then(
- *     newImage => console.log("new image path is: " + newImage),
- *     error => console.error("Error cropping image", error)
+ *     newImage => console.log('new image path is: ' + newImage),
+ *     error => console.error('Error cropping image', error)
 *   );
 * ```
 */
@@ -38,6 +38,6 @@ export class Crop extends IonicNativePlugin {
  @Cordova({
    callbackOrder: 'reverse'
  })
-  crop(pathToImage: string, options?: {quality: number}): Promise<string> { return; }
+  crop(pathToImage: string, options?: { quality: number }): Promise<string> { return; }

 }
--- a/src/@ionic-native/plugins/db-meter/index.ts
+++ b/src/@ionic-native/plugins/db-meter/index.ts
@@ -39,7 +39,7 @@ import { Observable } from 'rxjs/Observable';
  plugin: 'cordova-plugin-dbmeter',
  pluginRef: 'DBMeter',
  repo: 'https://github.com/akofman/cordova-plugin-dbmeter',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
@Injectable()
 export class DBMeter extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/deeplinks/index.ts
+++ b/src/@ionic-native/plugins/deeplinks/index.ts
@@ -49,7 +49,7 @@ export interface DeeplinkMatch {
 *    });
 * ```
 *
- * Alternatively, if you're using Ionic 2, there's a convenience method that takes a reference to a `NavController` and handles
+ * Alternatively, if you're using Ionic, there's a convenience method that takes a reference to a `NavController` and handles
 * the actual navigation for you:
 *
 * ```typescript
@@ -67,7 +67,7 @@ export interface DeeplinkMatch {
 *   });
 * ```
 *
- * See the [Ionic 2 Deeplinks Demo](https://github.com/driftyco/ionic2-deeplinks-demo/blob/master/app/app.ts) for an example of how to
+ * See the [Ionic Deeplinks Demo](https://github.com/ionic-team/ionic2-deeplinks-demo/blob/master/app/app.ts) for an example of how to
 * retrieve the `NavController` reference at runtime.
 *
 * @interfaces
@@ -77,10 +77,10 @@ export interface DeeplinkMatch {
  pluginName: 'Deeplinks',
  plugin: 'ionic-plugin-deeplinks',
  pluginRef: 'IonicDeeplink',
-  repo: 'https://github.com/driftyco/ionic-plugin-deeplinks',
-  platforms: ['iOS', 'Android', 'Browser'],
-  install: 'ionic plugin add ionic-plugin-deeplinks --variable URL_SCHEME=myapp --variable DEEPLINK_SCHEME=https --variable DEEPLINK_HOST=example.com --variable ANDROID_PATH_PREFIX=/',
-  installVariables: ['URL_SCHEME', 'DEEPLINK_SCHEME', 'DEEPLINK_HOST', 'ANDROID_PATH_PREFIX']
+  repo: 'https://github.com/ionic-team/ionic-plugin-deeplinks',
+  install: 'ionic cordova plugin add ionic-plugin-deeplinks --variable URL_SCHEME=myapp --variable DEEPLINK_SCHEME=https --variable DEEPLINK_HOST=example.com --variable ANDROID_PATH_PREFIX=/',
+  installVariables: ['URL_SCHEME', 'DEEPLINK_SCHEME', 'DEEPLINK_HOST', 'ANDROID_PATH_PREFIX'],
+  platforms: ['Android', 'Browser', 'iOS']
 })
@Injectable()
 export class Deeplinks extends IonicNativePlugin {
@@ -88,7 +88,7 @@ export class Deeplinks extends IonicNativePlugin {
  /**
   * Define a set of paths to match against incoming deeplinks.
   *
-   * @param {paths} Define a set of paths to match against incoming deeplinks.
+   * @param {paths} paths Define a set of paths to match against incoming deeplinks.
   * paths takes an object of the form { 'path': data }. If a deeplink
   * matches the path, the resulting path-data pair will be returned in the
   * promise result which you can then use to navigate in the app as you see fit.
@@ -98,29 +98,31 @@ export class Deeplinks extends IonicNativePlugin {
  @Cordova({
    observable: true
  })
-  route(paths): Observable<DeeplinkMatch> { return; }
+  route(paths: any): Observable<DeeplinkMatch> { return; }

  /**
   *
   * This is a convenience version of `route` that takes a reference to a NavController
-   * from Ionic 2, or a custom class that conforms to this protocol:
+   * from Ionic, or a custom class that conforms to this protocol:
   *
   * NavController.push = function(View, Params){}
   *
   * This handler will automatically navigate when a route matches. If you need finer-grained
   * control over the behavior of a matching deeplink, use the plain `route` method.
   *
-   * @param {paths} Define a set of paths to match against incoming deeplinks.
+   * @param {Nav} navController Define a set of paths to match against incoming deeplinks.
   * paths takes an object of the form { 'path': data }. If a deeplink
   * matches the path, the resulting path-data pair will be returned in the
   * promise result which you can then use to navigate in the app as you see fit.
   *
+   * @param {Object} paths
+   *
   * @returns {Observable<DeeplinkMatch>} Returns an Observable that resolves each time a deeplink comes through, and
   * errors if a deeplink comes through that does not match a given path.
   */
  @Cordova({
    observable: true
  })
-  routeWithNavController(navController, paths): Observable<DeeplinkMatch> { return; }
+  routeWithNavController(navController: any, paths: any): Observable<DeeplinkMatch> { return; }

 }
--- a/src/@ionic-native/plugins/device-accounts/index.ts
+++ b/src/@ionic-native/plugins/device-accounts/index.ts
@@ -22,9 +22,9 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 */
@Plugin({
  pluginName: 'DeviceAccounts',
-  plugin: 'https://github.com/loicknuchel/cordova-device-accounts.git',
+  plugin: 'cordova-device-accounts',
  pluginRef: 'plugins.DeviceAccounts',
-  repo: 'https://github.com/loicknuchel/cordova-device-accounts',
+  repo: 'https://github.com/danielsogl/cordova-device-accounts',
  platforms: ['Android']
 })
@Injectable()
--- a/src/@ionic-native/plugins/device-feedback/index.ts
+++ b/src/@ionic-native/plugins/device-feedback/index.ts
@@ -7,7 +7,7 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 * Plugin that lets you provide haptic or acoustic feedback on Android devices.
 *
 * @usage
- * ```
+ * ```typescript
 * import { DeviceFeedback } from '@ionic-native/device-feedback';
 *
 * constructor(private deviceFeedback: DeviceFeedback) { }
--- a/src/@ionic-native/plugins/device-motion/index.ts
+++ b/src/@ionic-native/plugins/device-motion/index.ts
@@ -72,7 +72,7 @@ export interface DeviceMotionAccelerometerOptions {
  plugin: 'cordova-plugin-device-motion',
  pluginRef: 'navigator.accelerometer',
  repo: 'https://github.com/apache/cordova-plugin-device-motion',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone 8']
 })
@Injectable()
 export class DeviceMotion extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/device-orientation/index.ts
+++ b/src/@ionic-native/plugins/device-orientation/index.ts
@@ -77,7 +77,7 @@ export interface DeviceOrientationCompassOptions {
  plugin: 'cordova-plugin-device-orientation',
  pluginRef: 'navigator.compass',
  repo: 'https://github.com/apache/cordova-plugin-device-orientation',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
@Injectable()
 export class DeviceOrientation extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/device/index.ts
+++ b/src/@ionic-native/plugins/device/index.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';

-declare var window: any;
+declare const window: any;

 /**
 * @name Device
@@ -24,7 +24,7 @@ declare var window: any;
  plugin: 'cordova-plugin-device',
  pluginRef: 'device',
  repo: 'https://github.com/apache/cordova-plugin-device',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'OS X', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'macOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
@Injectable()
 export class Device extends IonicNativePlugin {
--- a/src/@ionic-native/plugins/diagnostic/index.ts
+++ b/src/@ionic-native/plugins/diagnostic/index.ts
@@ -144,10 +144,12 @@ export class Diagnostic extends IonicNativePlugin {
  /**
   * Checks if the device has a camera. On Android this returns true if the device has a camera. On iOS this returns true if both the device has a camera AND the application is authorized to use it. On Windows 10 Mobile this returns true if both the device has a rear-facing camera AND the
   * application is authorized to use it.
+   * @param {boolean} [externalStorage] Android only: If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.   
   * @returns {Promise<any>}
   */
-  @Cordova()
-  isCameraAvailable(): Promise<any> { return; }
+  @Cordova({ callbackOrder: 'reverse' })
+  isCameraAvailable( externalStorage?: boolean ): Promise<any> { return; }

  /**
   * Checks if the device has Bluetooth capabilities and if so that Bluetooth is switched on (same on Android, iOS and Windows 10 Mobile)
@@ -251,24 +253,30 @@ export class Diagnostic extends IonicNativePlugin {
  /**
   * Checks if the application is authorized to use the camera.
   * Note for Android: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will always return TRUE as permissions are already granted at installation time.
+   * @param {boolean} [externalStorage] Android only: If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
   * @returns {Promise<any>}
   */
-  @Cordova({ platforms: ['Android', 'iOS'] })
-  isCameraAuthorized(): Promise<any> { return; }
+  @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
+  isCameraAuthorized( externalStorage?: boolean ): Promise<any> { return; }

  /**
   * Returns the camera authorization status for the application.
+   * @param {boolean} [externalStorage] Android only: If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
   * @returns {Promise<any>}
   */
-  @Cordova({ platforms: ['Android', 'iOS'] })
-  getCameraAuthorizationStatus(): Promise<any> { return; }
+  @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
+  getCameraAuthorizationStatus( externalStorage?: boolean ): Promise<any> { return; }

  /**
   * Requests camera authorization for the application.
+   * @param {boolean} [externalStorage] Android only: If true, requests permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
   * @returns {Promise<any>}
   */
-  @Cordova({ platforms: ['Android', 'iOS'] })
-  requestCameraAuthorization(): Promise<any> { return; }
+  @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
+  requestCameraAuthorization( externalStorage?: boolean ): Promise<any> { return; }

  /**
   * Checks if the application is authorized to use the microphone.
@@ -614,10 +622,10 @@ export class Diagnostic extends IonicNativePlugin {

  /**
   * Returns the authorization status for the application to use the Camera Roll in Photos app.
-   * @returns {Promise<boolean>}
+   * @returns {Promise<string>}
   */
  @Cordova({ platforms: ['iOS'] })
-  getCameraRollAuthorizationStatus(): Promise<boolean> { return; }
+  getCameraRollAuthorizationStatus(): Promise<string> { return; }

  /**
   * Requests camera roll authorization for the application.
--- a/src/@ionic-native/plugins/dialogs/index.ts
+++ b/src/@ionic-native/plugins/dialogs/index.ts
@@ -45,8 +45,8 @@ export interface DialogsPromptCallback {
  pluginName: 'Dialogs',
  plugin: 'cordova-plugin-dialogs',
  pluginRef: 'navigator.notification',
-  repo: 'https://github.com/apache/cordova-plugin-dialogs.git',
-  platforms: ['Android', 'BlackBerry 10', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
+  repo: 'https://github.com/apache/cordova-plugin-dialogs',
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
@Injectable()
 export class Dialogs extends IonicNativePlugin {
@@ -69,13 +69,13 @@ export class Dialogs extends IonicNativePlugin {
   * @param {string} message Dialog message.
   * @param {string} title Dialog title. (Optional, defaults to Confirm)
   * @param {Array<string>} buttonLabels Array of strings specifying button labels. (Optional, defaults to [OK,Cancel])
-   * @returns {Promise<number>} Returns a promise that resolves the button index that was clicked. Note that the index use one-based indexing.
+   * @returns {Promise<number>} Returns a promise that resolves the button index that was clicked, or 0 if the user has dismissed the dialog by clicking outside the dialog box. Note that the index use one-based indexing.
   */
  @Cordova({
    successIndex: 1,
    errorIndex: 4
  })
-  confirm(message, title?: string, buttonLabels?: string[]): Promise<number> { return; }
+  confirm(message: string, title?: string, buttonLabels?: string[]): Promise<number> { return; }

  /**
   * Displays a native dialog box that is more customizable than the browser's prompt function.
--- a/src/@ionic-native/plugins/document-viewer/index.ts
+++ b/src/@ionic-native/plugins/document-viewer/index.ts
@@ -0,0 +1,102 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+export interface DocumentViewerOptions {
+  title?: string;
+  documentView?: {
+    closeLabel: string;
+  };
+  navigationView?: {
+    closeLabel: string;
+  };
+  email?: {
+    enabled: boolean;
+  };
+  print?: {
+    enabled: boolean;
+  };
+  openWith?: {
+    enabled: boolean;
+  };
+  bookmarks?: {
+    enabled: boolean;
+  };
+  search?: {
+    enabled: boolean;
+  };
+  autoClose?: {
+    onPause: boolean;
+  };
+}
+
+/**
+ * @name Document Viewer
+ * @description
+ * This plugin offers a slim API to view PDF files which are either stored in the apps assets folder (/www/*) or in any other file system directory available via the cordova file plugin.
+ *
+ * @usage
+ * ```typescript
+ * import { DocumentViewer } from '@ionic-native/document-viewer';
+ *
+ *
+ * constructor(private document: DocumentViewer) { }
+ *
+ * ...
+ * const options: DocumentViewerOptions = {
+ *   title: 'My PDF'
+ * }
+ *
+ * this.document.viewDocument('assets/myFile.pdf', 'application/pdf', options)
+ *
+ * ```
+ *
+ * @interfaces
+ * DocumentViewerOptions
+ */
+@Plugin({
+  pluginName: 'Document Viewer',
+  plugin: 'cordova-plugin-document-viewer',
+  pluginRef: 'SitewaertsDocumentViewer',
+  repo: 'https://github.com/sitewaerts/cordova-plugin-document-viewer',
+  platforms: ['Android', 'iOS', 'Windows']
+})
+@Injectable()
+export class DocumentViewer extends IonicNativePlugin {
+
+  /**
+   * Displays the email composer pre-filled with data.
+   *
+   * @returns {Promise<any>} Resolves promise when the EmailComposer has been opened
+   */
+  @Cordova()
+  getSupportInfo(): Promise<any> { return; }
+
+  /**
+   * Check if the document can be shown
+   *
+   * @param url {string} Url to the file
+   * @param contentType {string} Content type of the file
+   * @param options {Array<DocumentViewerOptions>} options
+   * @param [onPossible] {Function}
+   * @param [onMissingApp] {Function}
+   * @param [onImpossible] {Function}
+   * @param [onError] {Function}
+   */
+  @Cordova({ sync: true })
+  canViewDocument(url: string, contentType: string, options: DocumentViewerOptions, onPossible?: Function, onMissingApp?: Function, onImpossible?: Function, onError?: Function): void { }
+
+  /**
+   * Opens the file
+   *
+   * @param url {string} Url to the file
+   * @param contentType {string} Content type of the file
+   * @param options {DocumentViewerOptions} options
+   * @param [onShow] {Function}
+   * @param [onClose] {Function}
+   * @param [onMissingApp] {Function}
+   * @param [onError] {Function}
+   */
+  @Cordova({ sync: true })
+  viewDocument(url: string, contentType: string, options: DocumentViewerOptions, onShow?: Function, onClose?: Function, onMissingApp?: Function, onError?: Function): void { }
+
+}
--- a/src/@ionic-native/plugins/email-composer/index.ts
+++ b/src/@ionic-native/plugins/email-composer/index.ts
@@ -1,38 +1,57 @@
 import { Injectable } from '@angular/core';
 import { Cordova, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';

-declare var cordova: any;
-
 export interface EmailComposerOptions {

+  /**
+   * App to send the email with
+   */
  app?: string;

+  /**
+   * Email address(es) for To field
+   */
  to?: string | Array<string>;

+  /**
+   * Email address(es) for CC field
+   */
  cc?: string | Array<string>;

+  /**
+   * Email address(es) for BCC field
+   */
  bcc?: string | Array<string>;

-  attachments?: Array<any>;
+  /**
+   * File paths or base64 data streams
+   */
+  attachments?: string[];

+  /**
+   * Subject of the email
+   */
  subject?: string;

+  /**
+   * Email body (for HTML, set isHtml to true)
+   */
  body?: string;

+  /**
+   * Indicates if the body is HTML or plain text
+   */
  isHtml?: boolean;

 }


 /**
- * @beta
 * @name Email Composer
 * @description
 *
 * Requires Cordova plugin: cordova-plugin-email-composer. For more info, please see the [Email Composer plugin docs](https://github.com/hypery2k/cordova-email-plugin).
 *
- * DISCLAIMER: This plugin is experiencing issues with the latest versions of Cordova. Use at your own risk. Functionality is not guaranteed. Please stay tuned for a more stable version.
- * A good alternative to this plugin is the social sharing plugin.
 *
 * @usage
 * ```typescript
@@ -66,17 +85,28 @@ export interface EmailComposerOptions {
 *
 * // Send a text message using default options
 * this.emailComposer.open(email);
+ * ```
 *
+ * You can also assign aliases to email apps
+ * ```ts
+ * // add alias
+ * this.email.addAlias('gmail', 'com.google.android.gm');
+ *
+ * // then use alias when sending email
+ * this.email.open({
+ *   app: 'gmail',
+ *   ...
+ * });
 * ```
 * @interfaces
 * EmailComposerOptions
 */
@Plugin({
  pluginName: 'EmailComposer',
-  plugin: 'cordova-plugin-email',
+  plugin: 'cordova-plugin-email-composer',
  pluginRef: 'cordova.plugins.email',
-  repo: 'https://github.com/hypery2k/cordova-email-plugin',
-  platforms: ['Android', 'iOS']
+  repo: 'https://github.com/katzer/cordova-plugin-email-composer',
+  platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Windows']
 })
@Injectable()
 export class EmailComposer extends IonicNativePlugin {
@@ -91,7 +121,7 @@ export class EmailComposer extends IonicNativePlugin {
  isAvailable(app?: string): Promise<any> {
    return new Promise<boolean>((resolve, reject) => {
      if (app) {
-        cordova.plugins.email.isAvailable(app, (isAvailable) => {
+        EmailComposer.getPlugin().isAvailable(app, (isAvailable: boolean) => {
          if (isAvailable) {
            resolve();
          } else {
@@ -99,7 +129,7 @@ export class EmailComposer extends IonicNativePlugin {
          }
        });
      } else {
-        cordova.plugins.email.isAvailable((isAvailable) => {
+        EmailComposer.getPlugin().isAvailable((isAvailable: boolean) => {
          if (isAvailable) {
            resolve();
          } else {
@@ -110,6 +140,26 @@ export class EmailComposer extends IonicNativePlugin {
    });
  }

+  /**
+   * Request permission to access email accounts information
+   * @return {Promise<boolean>} returns a promise that resolves with a boolean that indicates if the permission was granted
+   */
+  @Cordova({
+    successIndex: 0,
+    errorIndex: 2
+  })
+  requestPermission(): Promise<boolean> { return; }
+
+  /**
+   * Checks if the app has a permission to access email accounts information
+   * @return {Promise<boolean>} returns a promise that resolves with a boolean that indicates if the permission was granted
+   */
+  @Cordova({
+    successIndex: 0,
+    errorIndex: 2
+  })
+  hasPermission(): Promise<boolean> { return; }
+
  /**
   * Adds a new mail app alias.
   *
--- a/src/@ionic-native/plugins/estimote-beacons/index.ts
+++ b/src/@ionic-native/plugins/estimote-beacons/index.ts
@@ -44,7 +44,7 @@ export interface EstimoteBeaconRegion {
  plugin: 'cordova-plugin-estimote',
  pluginRef: 'estimote.beacons',
  repo: 'https://github.com/evothings/phonegap-estimotebeacons',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
@Injectable()
 export class EstimoteBeacons extends IonicNativePlugin {
@@ -512,4 +512,3 @@ export class EstimoteBeacons extends IonicNativePlugin {
  writeConnectedMinor(minor: number): Promise<any> { return; }

 }
-
--- a/src/@ionic-native/plugins/extended-device-information/index.ts
+++ b/src/@ionic-native/plugins/extended-device-information/index.ts
@@ -0,0 +1,49 @@
+import { Injectable } from '@angular/core';
+import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * @name Extended Device Information
+ * @description
+ * Retrieves additional device information that is not provided by other plugins
+ *
+ * @usage
+ * ```typescript
+ * import { ExtendedDeviceInformation } from '@ionic-native/extended-device-information';
+ *
+ *
+ * constructor(private extendedDeviceInformation: ExtendedDeviceInformation) { }
+ *
+ * ...
+ *
+ * console.log('The Memory is: ' + this.extendedDeviceInformation.memory);
+ * ```
+ */
+@Plugin({
+  pluginName: 'ExtendedDeviceInformation',
+  plugin: 'cordova-plugin-extended-device-information',
+  pluginRef: 'extended-device-information',
+  repo: 'https://github.com/danielehrhardt/cordova-plugin-extended-device-information',
+  platforms: ['Android']
+})
+@Injectable()
+export class ExtendedDeviceInformation extends IonicNativePlugin {
+
+  /**
+   * Get the device's memory size
+   */
+  @CordovaProperty
+  memory: number;
+
+  /**
+   * Get the device's CPU mhz
+   */
+  @CordovaProperty
+  cpumhz: string;
+
+  /**
+   * Get the total storage
+   */
+  @CordovaProperty
+  totalstorage: string;
+
+}
--- a/src/@ionic-native/plugins/facebook/index.ts
+++ b/src/@ionic-native/plugins/facebook/index.ts
@@ -43,7 +43,7 @@ export interface FacebookLoginResponse {
 * Then type in the following command in your Terminal, where APP_ID and APP_NAME are the values from the Facebook Developer portal.
 *
 * ```bash
- *  ionic plugin add cordova-plugin-facebook4 --save --variable APP_ID="123456789" --variable APP_NAME="myApplication"
+ *  ionic cordova plugin add cordova-plugin-facebook4 --variable APP_ID="123456789" --variable APP_NAME="myApplication"
 * ```
 *
 * After, you'll need to add the native platforms you'll be using to your app in the Facebook Developer portal under your app's Settings:
@@ -104,6 +104,8 @@ export interface FacebookLoginResponse {
 *   .catch(e => console.log('Error logging into Facebook', e));
 *
 *
+ * this.fb.logEvent(this.fb.EVENTS.EVENT_NAME_ADDED_TO_CART);
+ *
 * ```
 *
 */
@@ -112,13 +114,48 @@ export interface FacebookLoginResponse {
  plugin: 'cordova-plugin-facebook4',
  pluginRef: 'facebookConnectPlugin',
  repo: 'https://github.com/jeduan/cordova-plugin-facebook4',
-  install: 'ionic plugin add cordova-plugin-facebook4 --variable APP_ID="123456789" --variable APP_NAME="myApplication"',
+  install: 'ionic cordova plugin add cordova-plugin-facebook4 --variable APP_ID="123456789" --variable APP_NAME="myApplication"',
  installVariables: ['APP_ID', 'APP_NAME'],
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS', 'Browser']
 })
@Injectable()
 export class Facebook extends IonicNativePlugin {

+  EVENTS: {
+    EVENT_NAME_ACTIVATED_APP: 'fb_mobile_activate_app',
+    EVENT_NAME_DEACTIVATED_APP: 'fb_mobile_deactivate_app',
+    EVENT_NAME_SESSION_INTERRUPTIONS: 'fb_mobile_app_interruptions',
+    EVENT_NAME_TIME_BETWEEN_SESSIONS: 'fb_mobile_time_between_sessions',
+    EVENT_NAME_COMPLETED_REGISTRATION: 'fb_mobile_complete_registration',
+    EVENT_NAME_VIEWED_CONTENT: 'fb_mobile_content_view',
+    EVENT_NAME_SEARCHED: 'fb_mobile_search',
+    EVENT_NAME_RATED: 'fb_mobile_rate',
+    EVENT_NAME_COMPLETED_TUTORIAL: 'fb_mobile_tutorial_completion',
+    EVENT_NAME_PUSH_TOKEN_OBTAINED: 'fb_mobile_obtain_push_token',
+    EVENT_NAME_ADDED_TO_CART: 'fb_mobile_add_to_cart',
+    EVENT_NAME_ADDED_TO_WISHLIST: 'fb_mobile_add_to_wishlist',
+    EVENT_NAME_INITIATED_CHECKOUT: 'fb_mobile_initiated_checkout',
+    EVENT_NAME_ADDED_PAYMENT_INFO: 'fb_mobile_add_payment_info',
+    EVENT_NAME_PURCHASED: 'fb_mobile_purchase',
+    EVENT_NAME_ACHIEVED_LEVEL: 'fb_mobile_level_achieved',
+    EVENT_NAME_UNLOCKED_ACHIEVEMENT: 'fb_mobile_achievement_unlocked',
+    EVENT_NAME_SPENT_CREDITS: 'fb_mobile_spent_credits',
+    EVENT_PARAM_CURRENCY: 'fb_currency',
+    EVENT_PARAM_REGISTRATION_METHOD: 'fb_registration_method',
+    EVENT_PARAM_CONTENT_TYPE: 'fb_content_type',
+    EVENT_PARAM_CONTENT_ID: 'fb_content_id',
+    EVENT_PARAM_SEARCH_STRING: 'fb_search_string',
+    EVENT_PARAM_SUCCESS: 'fb_success',
+    EVENT_PARAM_MAX_RATING_VALUE: 'fb_max_rating_value',
+    EVENT_PARAM_PAYMENT_INFO_AVAILABLE: 'fb_payment_info_available',
+    EVENT_PARAM_NUM_ITEMS: 'fb_num_items',
+    EVENT_PARAM_LEVEL: 'fb_level',
+    EVENT_PARAM_DESCRIPTION: 'fb_description',
+    EVENT_PARAM_SOURCE_APPLICATION: 'fb_mobile_launch_source',
+    EVENT_PARAM_VALUE_YES: '1',
+    EVENT_PARAM_VALUE_NO: '0'
+  };
+
  /**
   * Browser wrapper
   * @param {number} appId Your Facebook AppID from their dashboard
@@ -135,16 +172,17 @@ export class Facebook extends IonicNativePlugin {
   *
   * ```typescript
   * {
-   *   status: "connected",
+   *   status: 'connected',
   *   authResponse: {
   *     session_key: true,
-   *     accessToken: "kgkh3g42kh4g23kh4g2kh34g2kg4k2h4gkh3g4k2h4gk23h4gk2h34gk234gk2h34AndSoOn",
+   *     accessToken: 'kgkh3g42kh4g23kh4g2kh34g2kg4k2h4gkh3g4k2h4gk23h4gk2h34gk234gk2h34AndSoOn',
   *     expiresIn: 5183979,
-   *     sig: "...",
-   *     secret: "...",
-   *     userID: "634565435"
+   *     sig: '...',
+   *     secret: '...',
+   *     userID: '634565435'
   *   }
   * }
+   *
   * ```
   *
   * @param {string[]}  permissions List of [permissions](https://developers.facebook.com/docs/facebook-login/permissions) this app has upon logging in.
@@ -174,13 +212,13 @@ export class Facebook extends IonicNativePlugin {
   * ```
   * {
   *   authResponse: {
-   *     userID: "12345678912345",
-   *     accessToken: "kgkh3g42kh4g23kh4g2kh34g2kg4k2h4gkh3g4k2h4gk23h4gk2h34gk234gk2h34AndSoOn",
+   *     userID: '12345678912345',
+   *     accessToken: 'kgkh3g42kh4g23kh4g2kh34g2kg4k2h4gkh3g4k2h4gk23h4gk2h34gk234gk2h34AndSoOn',
   *     session_Key: true,
-   *     expiresIn: "5183738",
-   *     sig: "..."
+   *     expiresIn: '5183738',
+   *     sig: '...'
   *   },
-   *   status: "connected"
+   *   status: 'connected'
   * }
   * ```
   *
@@ -204,10 +242,10 @@ export class Facebook extends IonicNativePlugin {
   *
   * ```
   * {
-   *   method: "share",
-   *   href: "http://example.com",
-   *   caption: "Such caption, very feed.",
-   *   description: "Much description",
+   *   method: 'share',
+   *   href: 'http://example.com',
+   *   caption: 'Such caption, very feed.',
+   *   description: 'Much description',
   *   picture: 'http://example.com/image.png'
   * }
   * ```
--- a/src/@ionic-native/plugins/fcm/index.ts
+++ b/src/@ionic-native/plugins/fcm/index.ts
@@ -0,0 +1,118 @@
+import { Plugin, IonicNativePlugin, Cordova } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+
+export interface NotificationData {
+
+  /**
+   * Determines whether the notification was pressed or not
+   */
+
+  wasTapped: boolean;
+
+  /**
+   * Notification data hash item
+   */
+
+  [name: string]: any;
+
+}
+
+/**
+ * @name FCM
+ * @description
+ * Provides basic functionality for Firebase Cloud Messaging
+ *
+ * @usage
+ * ```typescript
+ * import { FCM } from '@ionic-native/fcm';
+ *
+ * constructor(private fcm: FCM) {}
+ *
+ * ...
+ *
+ * fcm.subscribeToTopic('marketing');
+ *
+ * fcm.getToken().then(token=>{
+ *   backend.registerToken(token);
+ * })
+ *
+ * fcm.onNotification().subscribe(data=>{
+ *   if(data.wasTapped){
+ *     console.log("Received in background");
+ *   } else {
+ *     console.log("Received in foreground");
+ *   };
+ * })
+ *
+ * fcm.onTokenRefresh().subscribe(token=>{
+ *   backend.registerToken(token);
+ * })
+ *
+ * fcm.unsubscribeFromTopic('marketing');
+ *
+ * ```
+ * @interfaces
+ * NotificationData
+ */
+@Plugin({
+  pluginName: 'FCM',
+  plugin: 'cordova-plugin-fcm',
+  pluginRef: 'FCMPlugin',
+  repo: 'https://github.com/fechanique/cordova-plugin-fcm',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class FCM extends IonicNativePlugin {
+
+  /**
+   * Get's device's current registration id
+   *
+   * @returns {Promise<string>} Returns a Promise that resolves with the registration id token
+   */
+  @Cordova()
+  getToken(): Promise<string> { return; }
+
+  /**
+   * Event firing on the token refresh
+   *
+   * @returns {Observable<string>} Returns an Observable that notifies with the change of device's registration id
+   */
+  @Cordova({
+    observable: true
+  })
+  onTokenRefresh(): Observable<string> { return; }
+
+  /**
+   * Subscribes you to a [topic](https://firebase.google.com/docs/notifications/android/console-topics)
+   *
+   * @param {string} topic Topic to be subscribed to
+   *
+   * @returns {Promise<any>} Returns a promise resolving in result of subscribing to a topic
+   */
+  @Cordova()
+  subscribeToTopic(topic: string): Promise<any> { return; }
+
+  /**
+   * Unubscribes you from a [topic](https://firebase.google.com/docs/notifications/android/console-topics)
+   *
+   * @param {string} topic Topic to be unsubscribed from
+   *
+   * @returns {Promise<any>} Returns a promise resolving in result of unsubscribing from a topic
+   */
+  @Cordova()
+  unsubscribeFromTopic(topic: string): Promise<any> { return; }
+
+  /**
+   * Watch for incoming notifications
+   *
+   * @returns {Observable<any>} returns an object with data from the notification
+   */
+  @Cordova({
+    observable: true,
+    successIndex: 0,
+    errorIndex: 2
+  })
+  onNotification(): Observable<NotificationData> { return; }
+
+}
--- a/src/@ionic-native/plugins/file-chooser/index.ts
+++ b/src/@ionic-native/plugins/file-chooser/index.ts
@@ -8,7 +8,7 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 * Opens the file picker on Android for the user to select a file, returns a file URI.
 *
 * @usage
- * ```
+ * ```typescript
 * import { FileChooser } from '@ionic-native/file-chooser';
 *
 * constructor(private fileChooser: FileChooser) { }
@@ -23,9 +23,9 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 */
@Plugin({
  pluginName: 'FileChooser',
-  plugin: 'http://github.com/don/cordova-filechooser.git',
+  plugin: 'cordova-plugin-filechooser',
  pluginRef: 'fileChooser',
-  repo: 'https://github.com/don/cordova-filechooser',
+  repo: 'https://github.com/ihadeed/cordova-filechooser',
  platforms: ['Android']
 })
@Injectable()
--- a/src/@ionic-native/plugins/file-encryption/index.ts
+++ b/src/@ionic-native/plugins/file-encryption/index.ts
@@ -0,0 +1,52 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name File Encryption
+ * @description
+ * Simple file encryption for Cordova.
+ *
+ * @usage
+ * ```typescript
+ * import { FileEncryption } from '@ionic-native/file-encryption';
+ *
+ *
+ * constructor(private fileEncryption: FileEncryption) { }
+ *
+ * ...
+ *
+ * this.fileEncryption.decrypt('assets/json/topSecret.json', 'secretKey');
+ *
+ * this.fileEncryption.encrypt('assets/json/topSecret.json', 'secretKey');
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'FileEncryption',
+  plugin: 'cordova-safe',
+  pluginRef: 'cordova.plugins.disusered',
+  repo: 'https://github.com/disusered/cordova-safe',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class FileEncryption extends IonicNativePlugin {
+
+  /**
+   * Enrcypt a file
+   * @param file {string} A string representing a local URI
+   * @param key {string} A key for the crypto operations
+   * @return {Promise<any>} Returns a promise that resolves when something happens
+   */
+  @Cordova()
+  encrypt(file: string, key: string): Promise<any> { return; }
+
+  /**
+   * Decrypt a file
+   * @param file {string} A string representing a local URI
+   * @param key {string} A key for the crypto operations
+   * @return {Promise<any>} Returns a promise that resolves when something happens
+   */
+  @Cordova()
+  decrypt(file: string, key: string): Promise<any> { return; }
+
+}
--- a/src/@ionic-native/plugins/file-opener/index.ts
+++ b/src/@ionic-native/plugins/file-opener/index.ts
@@ -7,7 +7,7 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 * This plugin will open a file on your device file system with its default application.
 *
 * @usage
- * ```
+ * ```typescript
 * import { FileOpener } from '@ionic-native/file-opener';
 *
 * constructor(private fileOpener: FileOpener) { }
@@ -41,7 +41,7 @@ export class FileOpener extends IonicNativePlugin {
    successName: 'success',
    errorName: 'error'
  })
-  open(filePath: string, fileMIMEType: string): Promise<any> {return; }
+  open(filePath: string, fileMIMEType: string): Promise<any> { return; }

  /**
   * Uninstalls a package
@@ -53,7 +53,7 @@ export class FileOpener extends IonicNativePlugin {
    successName: 'success',
    errorName: 'error'
  })
-  uninstall(packageId: string): Promise<any> {return; }
+  uninstall(packageId: string): Promise<any> { return; }

  /**
   * Check if an app is already installed
@@ -65,6 +65,6 @@ export class FileOpener extends IonicNativePlugin {
    successName: 'success',
    errorName: 'error'
  })
-  appIsInstalled(packageId: string): Promise<any> {return; }
+  appIsInstalled(packageId: string): Promise<any> { return; }

 }
--- a/src/@ionic-native/plugins/file-path/index.ts
+++ b/src/@ionic-native/plugins/file-path/index.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';

-declare var window: any;
+declare const window: any;

 /**
 * @name File Path
@@ -10,7 +10,7 @@ declare var window: any;
 * This plugin allows you to resolve the native filesystem path for Android content URIs and is based on code in the aFileChooser library.
 *
 * @usage
- * ```
+ * ```typescript
 * import { FilePath } from '@ionic-native/file-path';
 *
 * constructor(private filePath: FilePath) { }
@@ -39,6 +39,6 @@ export class FilePath extends IonicNativePlugin {
   * @returns {Promise<string>}
   */
  @Cordova()
-  resolveNativePath(path: string): Promise<string> {return; }
+  resolveNativePath(path: string): Promise<string> { return; }

 }
--- a/src/@ionic-native/plugins/file-transfer/index.ts
+++ b/src/@ionic-native/plugins/file-transfer/index.ts
@@ -1,8 +1,6 @@
 import { Injectable } from '@angular/core';
 import { CordovaInstance, Plugin, InstanceCheck, checkAvailability, IonicNativePlugin } from '@ionic-native/core';

-declare var FileTransfer;
-
 export interface FileUploadOptions {

  /**
@@ -109,21 +107,21 @@ export interface FileTransferError {
 }

 /**
- * @name Transfer
+ * @name File Transfer
 *
 * @description
 * This plugin allows you to upload and download files.
 *
 * @usage
 * ```typescript
- * import { Transfer, FileUploadOptions, TransferObject } from '@ionic-native/transfer';
+ * import { FileTransfer, FileUploadOptions, FileTransferObject } from '@ionic-native/file-transfer';
 * import { File } from '@ionic-native/file';
 *
- * constructor(private transfer: Transfer, private file: File) { }
+ * constructor(private transfer: FileTransfer, private file: File) { }
 *
 * ...
 *
- * const fileTransfer: TransferObject = this.transfer.create();
+ * const fileTransfer: FileTransferObject = this.transfer.create();
 *
 * // Upload a file:
 * fileTransfer.upload(..).then(..).catch(..);
@@ -170,16 +168,17 @@ export interface FileTransferError {
 * FileUploadResult
 * FileTransferError
 * @classes
- * TransferObject
+ * FileTransferObject
 */
@Plugin({
  pluginName: 'FileTransfer',
  plugin: 'cordova-plugin-file-transfer',
  pluginRef: 'FileTransfer',
-  repo: 'https://github.com/apache/cordova-plugin-file-transfer'
+  repo: 'https://github.com/apache/cordova-plugin-file-transfer',
+  platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
 })
@Injectable()
-export class Transfer extends IonicNativePlugin {
+export class FileTransfer extends IonicNativePlugin {

  /**
   * Error code rejected from upload with FileTransferError
@@ -201,10 +200,10 @@ export class Transfer extends IonicNativePlugin {

  /**
   * Creates a new FileTransfer object
-   * @return {TransferObject}
+   * @return {FileTransferObject}
   */
-  create(): TransferObject {
-    return new TransferObject();
+  create(): FileTransferObject {
+    return new FileTransferObject();
  }

 }
@@ -216,12 +215,12 @@ export class Transfer extends IonicNativePlugin {
  plugin: 'cordova-plugin-file-transfer',
  pluginName: 'FileTransfer'
 })
-export class TransferObject {
+export class FileTransferObject {
  private _objectInstance: any;

  constructor() {
-    if (checkAvailability('FileTransfer', null, 'FileTransfer') === true) {
-      this._objectInstance = new FileTransfer();
+    if (checkAvailability(FileTransfer.getPluginRef(), null, FileTransfer.getPluginName()) === true) {
+      this._objectInstance = new (FileTransfer.getPlugin())();
    }
  }

@@ -238,15 +237,13 @@ export class TransferObject {
    successIndex: 2,
    errorIndex: 3
  })
-  upload(fileUrl: string, url: string, options?: FileUploadOptions, trustAllHosts?: boolean): Promise<FileUploadResult> {
-    return;
-  }
+  upload(fileUrl: string, url: string, options?: FileUploadOptions, trustAllHosts?: boolean): Promise<FileUploadResult> { return; }

  /**
   * Downloads a file from server.
   *
   * @param {string} source  URL of the server to download the file, as encoded by encodeURI().
-   * @param {stirng} target  Filesystem url representing the file on the device. For backwards compatibility, this can also be the full path of the file on the device.
+   * @param {string} target  Filesystem url representing the file on the device. For backwards compatibility, this can also be the full path of the file on the device.
   * @param {boolean} trustAllHosts  Optional parameter, defaults to false. If set to true, it accepts all security certificates. This is useful because Android rejects self-signed security certificates. Not recommended for production use. Supported on Android and iOS.
   * @param {object} Optional parameters, currently only supports headers (such as Authorization (Basic Authentication), etc).
   * @returns {Promise<any>} Returns a Promise that resolves to a FileEntry object.
@@ -255,9 +252,7 @@ export class TransferObject {
    successIndex: 2,
    errorIndex: 3
  })
-  download(source: string, target: string, trustAllHosts?: boolean, options?: { [s: string]: any; }): Promise<any> {
-    return;
-  }
+  download(source: string, target: string, trustAllHosts?: boolean, options?: { [s: string]: any; }): Promise<any> { return; }

  /**
   * Registers a listener that gets called whenever a new chunk of data is transferred.
@@ -275,5 +270,5 @@ export class TransferObject {
  @CordovaInstance({
    sync: true
  })
-  abort(): void { }
+  abort(): void {}
 }
--- a/src/@ionic-native/plugins/file/index.ts
+++ b/src/@ionic-native/plugins/file/index.ts
--- a/src/@ionic-native/plugins/fingerprint-aio/index.ts
+++ b/src/@ionic-native/plugins/fingerprint-aio/index.ts
@@ -17,10 +17,19 @@ export interface FingerprintOptions {
   * Disable 'use backup' option. Only for android (optional)
   */
  disableBackup?: boolean;
+
+  /**
+   * Title of fallback button. Only for iOS
+   */
+  localizedFallbackTitle?: string;
+
+  /**
+   * Description in authentication dialogue. Only for iOS
+   */
+  localizedReason?: string;
 }

 /**
- * @beta
 * @name Fingerprint AIO
 * @description
 * Use simple fingerprint authentication on Android and iOS.
@@ -35,9 +44,11 @@ export interface FingerprintOptions {
 * ...
 *
 * this.faio.show({
- *     clientId: "Fingerprint-Demo",
- *     clientSecret: "password", //Only necessary for Android
- *     disableBackup:true  //Only for Android(optional)
+ *     clientId: 'Fingerprint-Demo',
+ *     clientSecret: 'password', //Only necessary for Android
+ *     disableBackup:true,  //Only for Android(optional)
+ *     localizedFallbackTitle: 'Use Pin', //Only for iOS
+ *     localizedReason: 'Please authenticate' //Only for iOS
 * })
 * .then((result: any) => console.log(result))
 * .catch((error: any) => console.log(error));
--- a/src/@ionic-native/plugins/firebase-analytics/index.ts
+++ b/src/@ionic-native/plugins/firebase-analytics/index.ts
@@ -0,0 +1,85 @@
+import { Injectable } from '@angular/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * @beta
+ * @name Firebase Analytics
+ * @description
+ * Cordova plugin for Firebase Analytics
+ *
+ * Go to firebase console and export google-services.json and GoogleService-Info.plist. Put those files into the root of your cordova app folder.
+ *
+ * NOTE: on iOS in order to collect demographic, age, gender data etc. you should additionally include AdSupport.framework into your project.
+ *
+ * @usage
+ * ```typescript
+ * import { FirebaseAnalytics } from '@ionic-native/firebase-analytics';
+ *
+ *
+ * constructor(private firebaseAnalytics: FirebaseAnalytics) { }
+ *
+ * ...
+ *
+ * this.firebaseAnalytics.logEvent('page_view', {page: "dashboard"})
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'FirebaseAnalytics',
+  plugin: 'cordova-plugin-firebase-analytics',
+  pluginRef: 'cordova.plugins.firebase.analytics',
+  repo: 'https://github.com/chemerisuk/cordova-plugin-firebase-analytics',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class FirebaseAnalytics extends IonicNativePlugin {
+
+  /**
+   * Logs an app event.
+   * Be aware of automatically collected events.
+   * @param name {string} The name of the event
+   * @param params {any} Some param to configure something
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  logEvent(name: string, params: any): Promise<any> { return; }
+
+  /**
+   * Sets the user ID property.
+   * This feature must be used in accordance with Google's Privacy Policy.
+   * @param id {string} The user ID
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  setUserId(id: string): Promise<any> { return; }
+
+  /**
+   * This feature must be used in accordance with Google's Privacy Policy.
+   * Be aware of automatically collected user properties.
+   * @param name {string} The property name
+   * @param value {string} The property value
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  setUserProperty(name: string, value: string): Promise<any> { return; }
+
+  /**
+   * Sets whether analytics collection is enabled for this app on this device.
+   * @param enabled {boolean}
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  setEnabled(enabled: boolean): Promise<any> { return; }
+
+  /**
+   * Sets the current screen name, which specifies the current visual context in your app.
+   * This helps identify the areas in your app where users spend their time and how they interact with your app.
+   * @param name {string} The name of the screen
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  setCurrentScreen(name: string): Promise<any> { return; }
+
+}
--- a/src/@ionic-native/plugins/firebase-dynamic-links/index.ts
+++ b/src/@ionic-native/plugins/firebase-dynamic-links/index.ts
@@ -0,0 +1,91 @@
+import { Injectable } from '@angular/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
+export interface DynamicLinksOptions {
+  title: string;
+  message: string;
+  deepLink?: string;
+  callToActionText?: string;
+}
+
+/**
+ * @beta
+ * @name Firebase Dynamic Links
+ * @description
+ * Cordova plugin for Firebase Invites and Firebase Dynamic Links
+ *
+ * Variables APP_DOMAIN and APP_PATH specify web URL where your app will start an activity to handle the link. They also used to setup support for App Indexing.
+ * Variable REVERSED_CLIENT_ID can be found in your GoogleService-Info.plist under the same key name.
+ * Variable PHOTO_LIBRARY_USAGE_DESCRIPTION specifies required value for NSPhotoLibraryUsageDescription on iOS.
+ * Go to firebase console and export google-services.json and GoogleService-Info.plist. Put those files into the root of your cordova app folder.
+ *
+ * Preferences:
+ *
+ * Preferences GoogleIOSClientId and GoogleAndroidClientId are used to setup dynamic links when you have an app for several platforms.
+ * You can find values at your GoogleService-Info.plist (key ANDROID_CLIENT_ID) and google-services.json (key client[0].oauth_client[0].client_id).
+ *
+ *config.xml:
+ * ```xml
+ * <platform name="android">
+ *     <preference name="GoogleIOSClientId" value="..." />
+ * </platform>
+ * <platform name="ios">
+ *     <preference name="GoogleAndroidClientId" value="..." />
+ * </platform>
+ * ```
+ * @usage
+ * ```typescript
+ * import { FirebaseDynamicLinks } from '@ionic-native/firebase-dynamic-links';
+ *
+ *
+ * constructor(private firebaseDynamicLinks: FirebaseDynamicLinks) { }
+ *
+ * ...
+ * // The deepLink and callToActionText properties are optional
+ * const options: DynamicLinksOptions = {
+ *   title: 'My Title';
+ *   message: 'My message';
+ *   deepLink: 'http://example.com/';
+ *   callToActionText: 'Message on button';
+ * }
+ *
+ * this.firebaseDynamicLinks.sendInvitation(options)
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
+ * this.firebaseDynamicLinks.onDynamicLink()
+ *   .then((res: any) => console.log(res)) //Handle the logic here after opening the app with the Dynamic link
+ *   .catch((error:any) => console.log(error));
+ * ```
+ *
+ * @interfaces
+ * DynamicLinksOptions
+ */
+@Plugin({
+  pluginName: 'FirebaseDynamicLinks',
+  plugin: ' cordova-plugin-firebase-dynamiclinks',
+  pluginRef: 'cordova.plugins.firebase.dynamiclinks',
+  repo: 'https://github.com/chemerisuk/cordova-plugin-firebase-dynamiclinks',
+  install: 'ionic cordova plugin add cordova-plugin-firebase-dynamiclinks --save --variable APP_DOMAIN="example.com" --variable APP_PATH="/"',
+  installVariables: ['APP_DOMAIN', 'APP_PATH'],
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class FirebaseDynamicLinks extends IonicNativePlugin {
+
+  /**
+   * Registers callback that is triggered on each dynamic link click.
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  onDynamicLink(): Promise<any> { return; }
+
+  /**
+   * Display invitation dialog.
+   * @param options {DynamicLinksOptions} Some param to configure something
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  sendInvitation(options: DynamicLinksOptions): Promise<any> { return; }
+
+}
--- a/src/@ionic-native/plugins/firebase/index.ts
+++ b/src/@ionic-native/plugins/firebase/index.ts
@@ -3,12 +3,13 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';

 /**
+ * @beta
 * @name Firebase
 * @description
 * This plugin brings push notifications, analytics, event tracking, crash reporting and more from Google Firebase to your Cordova project! Android and iOS supported (including iOS 10).
 *
 * @usage
- * ```
+ * ```typescript
 * import { Firebase } from '@ionic-native/firebase';
 *
 * constructor(private firebase: Firebase) { }
@@ -60,7 +61,7 @@ export class Firebase extends IonicNativePlugin {
  onNotificationOpen(): Observable<any> { return; }

  /**
-   * Grant permission to recieve push notifications
+   * Grant permission to receive push notifications
   * @return {Promise<any>}
   */
  @Cordova({
@@ -68,14 +69,12 @@ export class Firebase extends IonicNativePlugin {
  })
  grantPermission(): Promise<any> { return; }

-    /**
-   * Check permission to recieve push notifications
-   * @return {Promise<any>}
-   */
-  @Cordova({
-    platforms: ['iOS']
-  })
-  hasPermission(): Promise<any> { return; }
+  /**
+ * Check permission to receive push notifications
+ * @return {Promise<{isEnabled: boolean}>}
+ */
+  @Cordova()
+  hasPermission(): Promise<{isEnabled: boolean}> { return; }

  /**
   * Set icon badge number. Set to 0 to clear the badge.
@@ -108,6 +107,13 @@ export class Firebase extends IonicNativePlugin {
  @Cordova()
  unsubscribe(topic: string): Promise<any> { return; }

+  /**
+   * Unregister from firebase, used to stop receiving push notifications.
+   * Call this when you logout user from your app.
+   */
+  @Cordova()
+  unregister(): Promise<any> { return; }
+
  /**
   * Log an event using Analytics
   * @param type {string}
@@ -117,6 +123,14 @@ export class Firebase extends IonicNativePlugin {
  @Cordova()
  logEvent(type: string, data: any): Promise<any> { return; }

+  /**
+   * Log an Error using FirebaseCrash
+   * @param message {string}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  logError(message: string): Promise<any> { return; }
+
  /**
   * Set the name of the current screen in Analytics
   * @param name {string} Screen name
@@ -148,7 +162,6 @@ export class Firebase extends IonicNativePlugin {
   * @return {Promise<any>}
   */
  @Cordova({
-    platforms: ['Android'],
    successIndex: 1,
    errorIndex: 2
  })
@@ -158,9 +171,7 @@ export class Firebase extends IonicNativePlugin {
   * Activate the Remote Config fetched config
   * @return {Promise<any>}
   */
-  @Cordova({
-    platforms: ['Android']
-  })
+  @Cordova()
  activateFetched(): Promise<any> { return; }

  /**
@@ -170,7 +181,6 @@ export class Firebase extends IonicNativePlugin {
   * @return {Promise<any>}
   */
  @Cordova({
-    platforms: ['Android'],
    successIndex: 2,
    errorIndex: 3
  })
--- a/src/@ionic-native/plugins/flashlight/index.ts
+++ b/src/@ionic-native/plugins/flashlight/index.ts
@@ -17,14 +17,13 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 *
 * this.flashlight.switchOn();
 *
- *
 * ```
 */
@Plugin({
  pluginName: 'Flashlight',
  plugin: 'cordova-plugin-flashlight',
  pluginRef: 'window.plugins.flashlight',
-  repo: 'https://github.com/EddyVerbruggen/Flashlight-PhoneGap-Plugin.git',
+  repo: 'https://github.com/EddyVerbruggen/Flashlight-PhoneGap-Plugin',
  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
@Injectable()
--- a/Show More
+++ b/Show More