chore(): update changelog

2.3.2
fix(googlemaps): fix GoogleMapsLaLngBounds
2026-02-04 00:06:19 +08:00 · 2017-01-23 22:20:09 -05:00 · 2017-01-23 22:19:48 -05:00 · 2017-01-23 22:02:31 -05:00 · 2017-01-22 17:37:04 -05:00 · 2017-01-22 17:34:13 -05:00
109 changed files with 4583 additions and 1571 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,200 @@
+<a name="2.3.2"></a>
+## [2.3.2](https://github.com/driftyco/ionic-native/compare/v2.3.1...v2.3.2) (2017-01-24)
+
+
+### Bug Fixes
+
+* **googlemaps:** fix GoogleMapsLaLngBounds ([c3127d3](https://github.com/driftyco/ionic-native/commit/c3127d3)), closes [#972](https://github.com/driftyco/ionic-native/issues/972)
+
+
+
+<a name="2.3.1"></a>
+## [2.3.1](https://github.com/driftyco/ionic-native/compare/v2.3.0...v2.3.1) (2017-01-22)
+
+
+### Bug Fixes
+
+* add clearAllNotifications() ([8c021bc](https://github.com/driftyco/ionic-native/commit/8c021bc))
+* **battery-status:** add missing pluginRef ([3da0efe](https://github.com/driftyco/ionic-native/commit/3da0efe))
+* **core:** fix exception in CordovaProperty ([#998](https://github.com/driftyco/ionic-native/issues/998)) ([cb29363](https://github.com/driftyco/ionic-native/commit/cb29363)), closes [#992](https://github.com/driftyco/ionic-native/issues/992)
+* **core:** fix plugin check ([da7a370](https://github.com/driftyco/ionic-native/commit/da7a370))
+* **plugin:** adds subscribe() and unsubscribe() ([94025a7](https://github.com/driftyco/ionic-native/commit/94025a7))
+
+
+### Features
+
+* **core:** add PluginConfig interface ([b983de2](https://github.com/driftyco/ionic-native/commit/b983de2)), closes [#996](https://github.com/driftyco/ionic-native/issues/996)
+* **google-maps:** add base class functions ([#993](https://github.com/driftyco/ionic-native/issues/993)) ([9f98f8e](https://github.com/driftyco/ionic-native/commit/9f98f8e))
+
+
+
+<a name="2.3.0"></a>
+# [2.3.0](https://github.com/driftyco/ionic-native/compare/v2.2.17...v2.3.0) (2017-01-20)
+
+
+### Bug Fixes
+
+* **native-geocoder:** fix callback order ([dbf95ea](https://github.com/driftyco/ionic-native/commit/dbf95ea))
+
+
+### Features
+
+* **backlight:** add Backlight plugin ([#973](https://github.com/driftyco/ionic-native/issues/973)) ([1279114](https://github.com/driftyco/ionic-native/commit/1279114))
+* **broadcaster:** add Broadcaster plugin ([#877](https://github.com/driftyco/ionic-native/issues/877)) ([1e38a6c](https://github.com/driftyco/ionic-native/commit/1e38a6c))
+* **fingerprint-aio:** add cordova-plugin-fingerprint-aio ([#845](https://github.com/driftyco/ionic-native/issues/845)) ([1615b74](https://github.com/driftyco/ionic-native/commit/1615b74))
+* **firebase:** add firebase plugin ([#914](https://github.com/driftyco/ionic-native/issues/914)) ([8e98481](https://github.com/driftyco/ionic-native/commit/8e98481)), closes [#608](https://github.com/driftyco/ionic-native/issues/608)
+* **launch-review:** add LaunchReview plugin ([#949](https://github.com/driftyco/ionic-native/issues/949)) ([9c75a06](https://github.com/driftyco/ionic-native/commit/9c75a06))
+* **nativegeocoder:** add NativeGeocoder plugin ([#800](https://github.com/driftyco/ionic-native/issues/800)) ([911537b](https://github.com/driftyco/ionic-native/commit/911537b))
+* **navigationbar:** add NavigationBar plugin ([#826](https://github.com/driftyco/ionic-native/issues/826)) ([70c15c3](https://github.com/driftyco/ionic-native/commit/70c15c3))
+* **rollbar:** add Rollbar plugin ([#832](https://github.com/driftyco/ionic-native/issues/832)) ([229f550](https://github.com/driftyco/ionic-native/commit/229f550))
+* **serial:** add Serial plugin ([#952](https://github.com/driftyco/ionic-native/issues/952)) ([ac748ab](https://github.com/driftyco/ionic-native/commit/ac748ab))
+* **speech-recognition:** add SpeechRecognition plugin ([#897](https://github.com/driftyco/ionic-native/issues/897)) ([7c30718](https://github.com/driftyco/ionic-native/commit/7c30718))
+* **stripe:** add stripe plugin ([#913](https://github.com/driftyco/ionic-native/issues/913)) ([0ec46b0](https://github.com/driftyco/ionic-native/commit/0ec46b0))
+
+
+
+<a name="2.2.17"></a>
+## [2.2.17](https://github.com/driftyco/ionic-native/compare/v2.2.16...v2.2.17) (2017-01-20)
+
+
+### Bug Fixes
+
+* **app-rate:** onRateDialogShow callback ([#985](https://github.com/driftyco/ionic-native/issues/985)) ([ab681cc](https://github.com/driftyco/ionic-native/commit/ab681cc))
+* **core:** increase deviceready timeout for sanity ([0ab14a0](https://github.com/driftyco/ionic-native/commit/0ab14a0))
+
+
+### Features
+
+* **barcodescanner:** add missing options ([#966](https://github.com/driftyco/ionic-native/issues/966)) ([e902856](https://github.com/driftyco/ionic-native/commit/e902856)), closes [#965](https://github.com/driftyco/ionic-native/issues/965)
+
+
+
+<a name="2.2.16"></a>
+## [2.2.16](https://github.com/driftyco/ionic-native/compare/v2.2.15...v2.2.16) (2017-01-11)
+
+
+
+<a name="2.2.15"></a>
+## [2.2.15](https://github.com/driftyco/ionic-native/compare/v2.2.14...v2.2.15) (2017-01-11)
+
+
+### Bug Fixes
+
+* **apprate:** captialize URL in storeAppURL property ([b98fa28](https://github.com/driftyco/ionic-native/commit/b98fa28))
+* **ble:** stopScan takes no args when used as clear function ([#944](https://github.com/driftyco/ionic-native/issues/944)) ([6ddd2aa](https://github.com/driftyco/ionic-native/commit/6ddd2aa))
+* **onesignal:** OSNotification.app_id is optional ([#946](https://github.com/driftyco/ionic-native/issues/946)) ([ebf0716](https://github.com/driftyco/ionic-native/commit/ebf0716))
+
+
+
+<a name="2.2.14"></a>
+## [2.2.14](https://github.com/driftyco/ionic-native/compare/v2.2.13...v2.2.14) (2017-01-07)
+
+
+### Bug Fixes
+
+* **google-analytics:** fix startTrackerWithId when interval is not provided ([49fe24d](https://github.com/driftyco/ionic-native/commit/49fe24d))
+* **google-plus:** fixes login without options ([ca14bf6](https://github.com/driftyco/ionic-native/commit/ca14bf6)), closes [#932](https://github.com/driftyco/ionic-native/issues/932)
+* **inappbrowser:** fix insertCSS method name ([de07df6](https://github.com/driftyco/ionic-native/commit/de07df6)), closes [#921](https://github.com/driftyco/ionic-native/issues/921)
+* **mixpanel:** fix issue when not passing eventProperties ([#927](https://github.com/driftyco/ionic-native/issues/927)) ([bbf75bc](https://github.com/driftyco/ionic-native/commit/bbf75bc))
+* **nfc:** add missing param for addMimeTypeListener ([#937](https://github.com/driftyco/ionic-native/issues/937)) ([ca60c5b](https://github.com/driftyco/ionic-native/commit/ca60c5b))
+* **push:** fix typing for additionalData ([0d6997c](https://github.com/driftyco/ionic-native/commit/0d6997c)), closes [#868](https://github.com/driftyco/ionic-native/issues/868)
+
+
+### Features
+
+* **background-geolocation:** add altitudeAccuracy into response typings ([#922](https://github.com/driftyco/ionic-native/issues/922)) ([8eb656c](https://github.com/driftyco/ionic-native/commit/8eb656c))
+* **market:** add search method, return promises ([d62779a](https://github.com/driftyco/ionic-native/commit/d62779a))
+
+
+
+<a name="2.2.13"></a>
+## [2.2.13](https://github.com/driftyco/ionic-native/compare/v2.2.12...v2.2.13) (2016-12-27)
+
+
+### Bug Fixes
+
+* **admob:** add adId prop to AdMobOptions ([d5dfdf8](https://github.com/driftyco/ionic-native/commit/d5dfdf8))
+* **background-mode:** isEnabled and isActive return booleans ([ba77fd7](https://github.com/driftyco/ionic-native/commit/ba77fd7)), closes [#908](https://github.com/driftyco/ionic-native/issues/908)
+* **diagnostic:** add missing types ([1841220](https://github.com/driftyco/ionic-native/commit/1841220)), closes [#905](https://github.com/driftyco/ionic-native/issues/905)
+* **diagnostic:** add permissionStatus types ([#890](https://github.com/driftyco/ionic-native/issues/890)) ([3385c1b](https://github.com/driftyco/ionic-native/commit/3385c1b))
+
+
+### Features
+
+* **android-fingerprint-auth:** update to v1.2.1 ([#910](https://github.com/driftyco/ionic-native/issues/910)) ([a1b0f88](https://github.com/driftyco/ionic-native/commit/a1b0f88))
+* **nfc:** add new functions ([#853](https://github.com/driftyco/ionic-native/issues/853)) ([c44fb75](https://github.com/driftyco/ionic-native/commit/c44fb75))
+* **onesignal:** improve typings ([#888](https://github.com/driftyco/ionic-native/issues/888)) ([56e8eae](https://github.com/driftyco/ionic-native/commit/56e8eae))
+* **sim:** add new methods ([#894](https://github.com/driftyco/ionic-native/issues/894)) ([0c36988](https://github.com/driftyco/ionic-native/commit/0c36988))
+
+
+
+<a name="2.2.12"></a>
+## [2.2.12](https://github.com/driftyco/ionic-native/compare/v2.2.11...v2.2.12) (2016-12-16)
+
+
+### Bug Fixes
+
+* **camera-preview:** parameter size is optional ([#871](https://github.com/driftyco/ionic-native/issues/871)) ([61dc8aa](https://github.com/driftyco/ionic-native/commit/61dc8aa))
+* **diagnostic:** permissionStatus gets values from plugin in runtime ([9986e0d](https://github.com/driftyco/ionic-native/commit/9986e0d)), closes [#872](https://github.com/driftyco/ionic-native/issues/872)
+* **network:** update API ([ec5e27b](https://github.com/driftyco/ionic-native/commit/ec5e27b))
+* **sms:** fix callback index when omitting options param ([114a74d](https://github.com/driftyco/ionic-native/commit/114a74d)), closes [#858](https://github.com/driftyco/ionic-native/issues/858)
+
+
+### Features
+
+* **admob:** update api and docs ([6ba1d49](https://github.com/driftyco/ionic-native/commit/6ba1d49))
+
+
+
+<a name="2.2.11"></a>
+## [2.2.11](https://github.com/driftyco/ionic-native/compare/v2.2.10...v2.2.11) (2016-12-06)
+
+
+### Bug Fixes
+
+* **cordova-property:** fixes static properties of classes ([7ae6e10](https://github.com/driftyco/ionic-native/commit/7ae6e10))
+* **device:** fixes device plugin ([d918844](https://github.com/driftyco/ionic-native/commit/d918844))
+
+
+### BREAKING CHANGES
+
+* device: device property no longer exists
+
+
+
+<a name="2.2.10"></a>
+## [2.2.10](https://github.com/driftyco/ionic-native/compare/v2.2.9...v2.2.10) (2016-12-04)
+
+
+### Bug Fixes
+
+* **contacts:** fix few bugs in Contacts ([#846](https://github.com/driftyco/ionic-native/issues/846)) ([b19f6d1](https://github.com/driftyco/ionic-native/commit/b19f6d1))
+* **sqlite:** add static constructor, and fix resolve type ([#697](https://github.com/driftyco/ionic-native/issues/697)) ([9082c5e](https://github.com/driftyco/ionic-native/commit/9082c5e))
+
+
+### Features
+
+* **actionsheet:** add ActionSheetOptions interface ([f211da7](https://github.com/driftyco/ionic-native/commit/f211da7))
+* **googlemap:** add disableAutoPan to GoogleMapsMarkerOptions ([cf75a53](https://github.com/driftyco/ionic-native/commit/cf75a53)), closes [#844](https://github.com/driftyco/ionic-native/issues/844)
+* **googlemaps:** add markerClick and infoClick to MarkerOptions ([6f7171d](https://github.com/driftyco/ionic-native/commit/6f7171d))
+
+
+
+<a name="2.2.9"></a>
+## [2.2.9](https://github.com/driftyco/ionic-native/compare/v2.2.8...v2.2.9) (2016-12-01)
+
+
+
 <a name="2.2.8"></a>
 ## [2.2.8](https://github.com/driftyco/ionic-native/compare/v2.2.7...v2.2.8) (2016-12-01)


 ### Bug Fixes

+* add return ([3fdc4a8](https://github.com/driftyco/ionic-native/commit/3fdc4a8))
 * **card-io:** fix typo in options ([e6700a3](https://github.com/driftyco/ionic-native/commit/e6700a3))
 * **globalization:** add missing parameter to numberToString function ([1072ab1](https://github.com/driftyco/ionic-native/commit/1072ab1)), closes [#835](https://github.com/driftyco/ionic-native/issues/835)
+* **headercolor:** solve typo in usage and chore ([bab2971](https://github.com/driftyco/ionic-native/commit/bab2971))


 ### Features
@@ -37,6 +226,7 @@
 * **camera-preview:** add disable method ([6ad54ec](https://github.com/driftyco/ionic-native/commit/6ad54ec))
 * **google-analytics:** new interval period parameter ([abd910d](https://github.com/driftyco/ionic-native/commit/abd910d)), closes [#816](https://github.com/driftyco/ionic-native/issues/816)
 * **google-map:** add get and set methods to Marker class ([51ab03d](https://github.com/driftyco/ionic-native/commit/51ab03d)), closes [#798](https://github.com/driftyco/ionic-native/issues/798)
+* **headercolor:** add HeaderColor plugin ([93696d5](https://github.com/driftyco/ionic-native/commit/93696d5)), closes [#760](https://github.com/driftyco/ionic-native/issues/760)



--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ionic-native",
-  "version": "2.2.8",
+  "version": "2.3.2",
  "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
  "main": "dist/es5/index.js",
  "module": "dist/esm/index.js",
@@ -9,40 +9,40 @@
    "dist"
  ],
  "dependencies": {
-    "rxjs": "^5.0.0-beta.6"
+    "rxjs": "5.0.0-beta.12"
  },
  "devDependencies": {
-    "browserify": "^13.0.1",
+    "browserify": "^13.3.0",
    "canonical-path": "0.0.2",
    "conventional-changelog-cli": "^1.2.0",
    "conventional-github-releaser": "^1.1.3",
-    "cpr": "^1.0.0",
-    "cz-conventional-changelog": "^1.1.6",
+    "cpr": "^2.0.2",
+    "cz-conventional-changelog": "^1.2.0",
    "decamelize": "^1.2.0",
    "dgeni": "^0.4.2",
    "dgeni-packages": "^0.10.18",
-    "es6-shim": "~0.35.1",
-    "glob": "^6.0.4",
+    "es6-shim": "~0.35.2",
+    "glob": "^7.1.1",
    "gulp": "^3.9.1",
    "gulp-rename": "^1.2.2",
    "gulp-replace": "^0.5.4",
    "gulp-tslint": "^6.1.2",
-    "gulp-uglify": "^1.5.4",
-    "jasmine-core": "~2.5.0",
-    "karma": "~1.2.0",
+    "gulp-uglify": "^2.0.0",
+    "jasmine-core": "~2.5.2",
+    "karma": "~1.3.0",
    "karma-browserify": "~5.1.0",
-    "karma-jasmine": "~1.0.2",
+    "karma-jasmine": "~1.1.0",
    "karma-phantomjs-launcher": "~1.0.2",
-    "lodash": "3.10.1",
+    "lodash": "4.17.4",
    "minimist": "^1.1.3",
    "mkdirp": "^0.5.1",
    "node-html-encoder": "0.0.2",
    "q": "1.4.1",
-    "semver": "^5.0.1",
-    "tsify": "~1.0.4",
+    "semver": "^5.3.0",
+    "tsify": "~3.0.0",
    "tslint": "^3.15.1",
-    "tslint-ionic-rules": "0.0.5",
-    "typescript": "^2.0.1",
+    "tslint-ionic-rules": "0.0.7",
+    "typescript": "~2.0.10",
    "watchify": "~3.7.0"
  },
  "scripts": {
@@ -50,7 +50,6 @@
    "test:watch": "npm test -- --watch",
    "start": "npm run test:watch",
    "lint": "gulp lint",
-    "watch": "tsc -w",
    "build": "npm run lint && npm run build:js && npm run build:esm && npm run build:bundle && npm run build:minify",
    "build:js": "tsc -p tsconfig-es5.json",
    "build:esm": "tsc -p tsconfig-esm.json",
--- a/scripts/config.json
+++ b/scripts/config.json
@@ -1,5 +1,5 @@
 {
  "sitePath": "../ionic-site",
  "v2DocsDir": "docs/v2/native",
-  "docsDest": "../ionic-site/docs/v2/native"
+  "docsDest": "../ionic-site/content/docs/v2/native"
 }
--- a/scripts/docs/dgeni-config.js
+++ b/scripts/docs/dgeni-config.js
@@ -76,7 +76,7 @@ module.exports = function(currentVersion) {

  versions = [];
  // new version, add it to the versions list
-  if (currentVersion != 'nightly' && !_.contains(versions, currentVersion)) {
+  if (currentVersion != 'nightly' && !_.includes(versions, currentVersion)) {
    versions.unshift(currentVersion);
  }
  //First semver valid version is latest
@@ -85,7 +85,7 @@ module.exports = function(currentVersion) {
    // We don't separate by versions so always put the docs in the root
    var folder = '';
    return {
-      href: path.join('/' + config.v2DocsDir, folder),
+      href: '/' + config.v2DocsDir.replace('content/',''),
      folder: folder,
      name: version
    };
@@ -99,12 +99,11 @@ module.exports = function(currentVersion) {

  renderDocsProcessor.extraData.version = versionData;
  renderDocsProcessor.extraData.versionInfo = versionInfo;
-
  computePathsProcessor.pathTemplates = [{
    docTypes: ['class', 'var', 'function', 'let'],
    getOutputPath: function(doc) {
      var docPath = doc.name + '/index.md';
-      var path = config.v2DocsDir + '/' +  docPath;
+      var path = 'content/' + config.v2DocsDir + '/' +  docPath;

      return path;
    }
--- a/scripts/docs/prepare.sh
+++ b/scripts/docs/prepare.sh
@@ -30,7 +30,7 @@ function run {
    git pull origin master
  fi

-  git rm -rf docs/v2/native/*/
+  git rm -rf content/docs/v2/native/*/ || true

 }

--- a/scripts/docs/processors/collect-inputs-outputs.js
+++ b/scripts/docs/processors/collect-inputs-outputs.js
@@ -5,6 +5,15 @@ module.exports = function collectInputsOutputs() {
    $process: function(docs) {
      docs.forEach(function(doc) {

+        if (doc.statics && doc.statics.length) {
+          for (var i in doc.statics) {
+            // identify properties to differentiate from methods
+            if (typeof doc.statics[i].parameters == 'undefined') {
+              doc.statics[i].isProperty = true;
+            }
+          }
+        }
+
        if (doc.members && doc.members.length) {
          var members = [];
          var inputs = [];
--- a/scripts/docs/processors/jekyll.js
+++ b/scripts/docs/processors/jekyll.js
@@ -19,14 +19,17 @@ module.exports = function jekyll(renderDocsProcessor) {
      docs.forEach(function(doc, i) {
        doc.outputPath = doc.outputPath.toLowerCase().replace(' ', '-');
        docs[i].URL = doc.outputPath.replace('docs/v2//', 'docs/v2/')
-                                    .replace('/index.md', '');
+                                    .replace('/index.md', '')
+                                    .replace('content/', '');
+
+        docs[i].demo = !!docs[i].demo;
      });

      docs.push({
        docType: 'native_menu-menu',
        id: 'native_menu-menu',
        template: 'native_menu.template.html',
-        outputPath: '_includes/v2_fluid/native_menu.html'
+        outputPath: 'content/_includes/v2_fluid/native_menu.html'
      });

      // returning docs will replace docs object in the next process
--- a/scripts/docs/processors/latest-version.js
+++ b/scripts/docs/processors/latest-version.js
@@ -12,7 +12,7 @@ module.exports = function latestVersion(renderDocsProcessor) {
    $process: function(docs) {
      var versionData = renderDocsProcessor.extraData.version;

-      var docsBase = 'dist/ionic-site/docs/v2/';
+      var docsBase = 'dist/ionic-site/content/docs/v2/';
      var versionDir = path.resolve(docsBase, versionData.latest.name);
      var latestDir = path.resolve(docsBase, 'api');

--- a/scripts/docs/tag-defs/tag-defs.js
+++ b/scripts/docs/tag-defs/tag-defs.js
@@ -1,6 +1,10 @@
 module.exports = [
  {'name': 'advanced'},
  {'name': 'demo'},
+  {'name': 'beta', transforms: function(doc, tag, value) {
+    // make the value true or undefined instead of '' or undefined
+    return typeof value !== 'undefined';
+  }},
  {'name': 'usage'},
  {'name': 'classes'}, // related classes
  {'name': 'interfaces'} // related interfaces
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -1,7 +1,7 @@
 ---
 layout: "v2_fluid/docs_base"
 version: "<$ version.current.name $>"
-versionHref: "<$ version.current.href $>"
+versionHref: "<$ version.current.href.replace('content/','') $>"
 path: "<$ doc.path $>"
 category: native
 id: "<$ doc.name|lower|replace(' ','-') $>"
@@ -30,7 +30,7 @@ docType: "<$ doc.docType $>"
      <@ if param.optional @><div><em>(optional)</em></div><@ endif @>
    </td>
    <td>
-      <$ param.returnType | escape $>
+      <code><$ param.returnType | escape $></code>
    </td>
    <td>
      <$ param.description | marked $>
@@ -200,7 +200,9 @@ docType: "<$ doc.docType $>"
    Delegate: <$ doc.delegate $>
  </small>
  <@ endif @>
-
+  <@- if doc.beta == true -@>
+    <span class="beta" title="beta">&beta;</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 $>">
@@ -213,6 +215,15 @@ docType: "<$ doc.docType $>"
 <@- if doc.decorators @>

 <@ for prop in doc.decorators[0].argumentInfo @>
+
+<@ if doc.beta == true @>
+<p class="beta-notice">
+  This plugin is still in beta stage and may not work as expected. Please
+  submit any issues to the <a target="_blank"
+  href="<$ prop.repo $>/issues">plugin repo</a>.
+</p>
+<@ endif @>
+
 <pre><code>$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plugin $><@ endif -@></code></pre>
 <p>Repo:
  <a href="<$ prop.repo $>">
@@ -244,7 +255,7 @@ docType: "<$ doc.docType $>"
 <!-- @platforms tag end -->
 <@ endif @>
 <@ endfor @>
-<@ endif -@>
+<@ endif -@><!-- if doc.decorators -->

 <!-- @usage tag -->
 <@ if doc.usage @>
@@ -308,13 +319,13 @@ docType: "<$ doc.docType $>"
 <!-- other classes -->
 <@ for tag in doc.tags.tags -@>
 <@ if tag.tagName == 'classes' -@>
-<h2><a class="anchor" name="related-classes" href="#related-classes"></a>Related Classes</h2>
+<!--<h2><a class="anchor" name="related-classes" href="#related-classes"></a>Related Classes</h2>-->
 <@ set classes = tag.description.split('\n') @>
 <@ for item in classes -@>
 <@ if item.length > 1 @>
 <@ for export in doc.moduleDoc.exports -@>
 <@ if export.name == item @>
-<h3><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h3>
+<h2><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h2>
 <$ documentClass(export) $>
 <@ endif @>
 <@- endfor @>
@@ -327,11 +338,11 @@ docType: "<$ doc.docType $>"
 <!-- interfaces -->
 <@ for tag in doc.tags.tags -@>
 <@ if tag.tagName == 'interfaces' @>
-<h2><a class="anchor" name="interfaces" href="#interfaces"></a>Interfaces</h2>
+<!--<h2><a class="anchor" name="interfaces" href="#interfaces"></a>Interfaces</h2>-->
 <@ set interfaces = tag.description.split('\n') @>
 <@ for item in interfaces -@>
 <@ if item.length > 1 @>
-<h3><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h3>
+<h2><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h2>
 <$ interfaceTable(item) $>
 <@ endif @>
 <@- endfor @>
--- a/scripts/docs/templates/native_menu.template.html
+++ b/scripts/docs/templates/native_menu.template.html
@@ -1,4 +1,9 @@
-<@ for doc in docs @><@ if doc.URL and doc.private != true @>
+<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
 <li class="capitalize {% if page.id == '<$ doc.name|lower|replace(' ','-') $>' %}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|replace(' ','-') $>' %}active{% endif %}">
+  <a href="/<$ doc.URL $>"><$ doc.name $> <span class="beta">&beta;</span></a>
+</li><@ endif @><@ endfor @>
--- a/scripts/docs/update_docs.sh
+++ b/scripts/docs/update_docs.sh
@@ -24,7 +24,9 @@ function run {
  cd $SITE_DIR

  # if no changes, don't commit
-  if [[ `git status --porcelain` ]]; then
+  CHANGED=$(git diff-index --name-only HEAD --)
+  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"
  else
@@ -37,7 +39,7 @@ function run {
    git fetch
    git rebase

-    git push origin master
+    git push origin master || :

    echo "-- Updated docs for $VERSION_NAME succesfully!"
  fi
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,6 @@
 import { initAngular1 } from './ng1';

-const DEVICE_READY_TIMEOUT = 2000;
+const DEVICE_READY_TIMEOUT = 5000;

 declare var window;

@@ -13,12 +13,14 @@ import { AppVersion } from './plugins/appversion';
 import { Badge } from './plugins/badge';
 import { BackgroundGeolocation } from './plugins/background-geolocation';
 import { BackgroundMode } from './plugins/backgroundmode';
+import { Backlight } from './plugins/backlight';
 import { BarcodeScanner } from './plugins/barcodescanner';
 import { Base64ToGallery } from './plugins/base64togallery';
 import { BatteryStatus } from './plugins/batterystatus';
 import { Brightness } from './plugins/brightness';
 import { BLE } from './plugins/ble';
 import { BluetoothSerial } from './plugins/bluetoothserial';
+import { Broadcaster } from './plugins/broadcaster';
 import { Calendar } from './plugins/calendar';
 import { CallNumber } from './plugins/call-number';
 import { Camera } from './plugins/camera';
@@ -46,6 +48,8 @@ import { FileChooser } from './plugins/file-chooser';
 import { FileOpener } from './plugins/file-opener';
 import { FilePath } from './plugins/filepath';
 import { Transfer } from './plugins/filetransfer';
+import { FingerprintAIO } from './plugins/fingerprint-aio';
+import { Firebase } from './plugins/firebase';
 import { Flashlight } from './plugins/flashlight';
 import { Geofence } from './plugins/geofence';
 import { Geolocation } from './plugins/geolocation';
@@ -53,6 +57,7 @@ import { Globalization } from './plugins/globalization';
 import { GooglePlus } from './plugins/google-plus';
 import { GoogleMap } from './plugins/googlemap';
 import { GoogleAnalytics } from './plugins/googleanalytics';
+import { HeaderColor } from './plugins/headercolor';
 import { Hotspot } from  './plugins/hotspot';
 import { HTTP } from  './plugins/http';
 import { Httpd } from './plugins/httpd';
@@ -66,12 +71,15 @@ import { Instagram } from './plugins/instagram';
 import { IsDebug } from './plugins/is-debug';
 import { Keyboard } from './plugins/keyboard';
 import { LaunchNavigator } from './plugins/launchnavigator';
+import { LaunchReview } from './plugins/launch-review';
 import { LocalNotifications } from './plugins/localnotifications';
 import { LocationAccuracy } from './plugins/location-accuracy';
 import { MediaCapture } from './plugins/media-capture';
 import { NativeAudio } from './plugins/native-audio';
+import { NativeGeocoder } from './plugins/native-geocoder';
 import { NativePageTransitions } from './plugins/native-page-transitions';
 import { NativeStorage } from './plugins/nativestorage';
+import { NavigationBar } from './plugins/navigationbar';
 import { Market } from './plugins/market';
 import { MediaPlugin } from './plugins/media';
 import { Mixpanel } from './plugins/mixpanel';
@@ -86,19 +94,23 @@ import { PinDialog } from './plugins/pin-dialog';
 import { PowerManagement } from './plugins/power-management';
 import { Printer } from './plugins/printer';
 import { Push } from './plugins/push';
+import { Rollbar } from './plugins/rollbar';
 import { SafariViewController } from './plugins/safari-view-controller';
 import { Screenshot } from './plugins/screenshot';
 import { SecureStorage } from './plugins/securestorage';
+import { Serial } from './plugins/serial';
 import { Shake } from './plugins/shake';
 import { Sim } from './plugins/sim';
 import { SMS } from './plugins/sms';
 import { SocialSharing } from './plugins/socialsharing';
+import { SpeechRecognition } from './plugins/speech-recognition';
 import { SpinnerDialog } from './plugins/spinnerdialog';
 import { Splashscreen } from './plugins/splashscreen';
 import { SQLite } from './plugins/sqlite';
 import { StatusBar } from './plugins/statusbar';
 import { Stepcounter } from './plugins/stepcounter';
 import { StreamingMedia } from './plugins/streaming-media';
+import { Stripe } from './plugins/stripe';
 import { ThreeDeeTouch } from './plugins/3dtouch';
 import { Toast } from './plugins/toast';
 import { TouchID } from './plugins/touchid';
@@ -121,6 +133,7 @@ export * from './plugins/apprate';
 export * from './plugins/appversion';
 export * from './plugins/background-geolocation';
 export * from './plugins/backgroundmode';
+export * from './plugins/backlight';
 export * from './plugins/badge';
 export * from './plugins/barcodescanner';
 export * from './plugins/base64togallery';
@@ -128,6 +141,7 @@ export * from './plugins/batterystatus';
 export * from './plugins/ble';
 export * from './plugins/bluetoothserial';
 export * from './plugins/brightness';
+export * from './plugins/broadcaster';
 export * from './plugins/calendar';
 export * from './plugins/call-number';
 export * from './plugins/camera';
@@ -154,7 +168,9 @@ export * from './plugins/file';
 export * from './plugins/file-chooser';
 export * from './plugins/file-opener';
 export * from './plugins/filetransfer';
+export * from './plugins/firebase';
 export * from './plugins/filepath';
+export * from './plugins/fingerprint-aio';
 export * from './plugins/flashlight';
 export * from './plugins/geofence';
 export * from './plugins/geolocation';
@@ -162,6 +178,7 @@ export * from './plugins/globalization';
 export * from './plugins/google-plus';
 export * from './plugins/googleanalytics';
 export * from './plugins/googlemap';
+export * from './plugins/headercolor';
 export * from './plugins/hotspot';
 export * from './plugins/http';
 export * from './plugins/httpd';
@@ -175,6 +192,7 @@ export * from './plugins/instagram';
 export * from './plugins/is-debug';
 export * from './plugins/keyboard';
 export * from './plugins/launchnavigator';
+export * from './plugins/launch-review';
 export * from './plugins/localnotifications';
 export * from './plugins/location-accuracy';
 export * from './plugins/market';
@@ -183,8 +201,10 @@ export * from './plugins/media-capture';
 export * from './plugins/mixpanel';
 export * from './plugins/music-controls';
 export * from './plugins/native-audio';
+export * from './plugins/native-geocoder';
 export * from './plugins/native-page-transitions';
 export * from './plugins/nativestorage';
+export * from './plugins/navigationbar';
 export * from './plugins/network';
 export * from './plugins/nfc';
 export * from './plugins/onesignal';
@@ -195,20 +215,24 @@ export * from './plugins/plugin';
 export * from './plugins/power-management';
 export * from './plugins/printer';
 export * from './plugins/push';
+export * from './plugins/rollbar';
 export * from './plugins/safari-view-controller';
 export * from './plugins/screen-orientation';
 export * from './plugins/screenshot';
 export * from './plugins/securestorage';
+export * from './plugins/serial';
 export * from './plugins/shake';
 export * from './plugins/sim';
 export * from './plugins/sms';
 export * from './plugins/socialsharing';
+export * from './plugins/speech-recognition';
 export * from './plugins/spinnerdialog';
 export * from './plugins/splashscreen';
 export * from './plugins/sqlite';
 export * from './plugins/statusbar';
 export * from './plugins/stepcounter';
 export * from './plugins/streaming-media';
+export * from './plugins/stripe';
 export * from './plugins/text-to-speech';
 export * from './plugins/themeable-browser';
 export * from './plugins/toast';
@@ -233,12 +257,14 @@ window['IonicNative'] = {
  Badge,
  BackgroundGeolocation,
  BackgroundMode,
+  Backlight,
  BarcodeScanner,
  Base64ToGallery,
  BatteryStatus,
  Brightness,
  BLE,
  BluetoothSerial,
+  Broadcaster,
  Calendar,
  CallNumber,
  Camera,
@@ -265,13 +291,16 @@ window['IonicNative'] = {
  FileChooser,
  FileOpener,
  FilePath,
+  FingerprintAIO,
  Flashlight,
+  Firebase,
  Geofence,
  Geolocation,
  Globalization,
  GooglePlus,
  GoogleMap,
  GoogleAnalytics,
+  HeaderColor,
  Hotspot,
  HTTP,
  Httpd,
@@ -285,6 +314,7 @@ window['IonicNative'] = {
  IsDebug,
  Keyboard,
  LaunchNavigator,
+  LaunchReview,
  LocalNotifications,
  LocationAccuracy,
  Market,
@@ -293,8 +323,10 @@ window['IonicNative'] = {
  Mixpanel,
  MusicControls,
  NativeAudio,
+  NativeGeocoder,
  NativePageTransitions,
  NativeStorage,
+  NavigationBar,
  Network,
  PayPal,
  NFC,
@@ -305,9 +337,11 @@ window['IonicNative'] = {
  ScreenOrientation,
  PinDialog,
  PowerManagement,
+  Rollbar,
  SafariViewController,
  Screenshot,
  SecureStorage,
+  Serial,
  Shake,
  Sim,
  SMS,
@@ -316,8 +350,10 @@ window['IonicNative'] = {
  Splashscreen,
  SQLite,
  StatusBar,
+  SpeechRecognition,
  Stepcounter,
  StreamingMedia,
+  Stripe,
  ThreeDeeTouch,
  Toast,
  TouchID,
--- a/src/plugins/3dtouch.ts
+++ b/src/plugins/3dtouch.ts
@@ -1,9 +1,61 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
 declare var window: any;

+export interface ThreeDeeTouchQuickAction {
+
+  /**
+   * Type that can be used in the onHomeIconPressed callback
+   */
+  type?: string;
+
+  /**
+   * Title
+   */
+  title: string;
+
+  /**
+   * Subtitle
+   */
+  subtitle?: string;
+
+  /**
+   * Icon type. Case insensitive
+   */
+  iconType?: string;
+
+  /**
+   * Icon template
+   */
+  iconTemplate?: string;
+
+}
+
+export interface ThreeDeeTouchForceTouch {
+
+  /**
+   * Touch force
+   */
+  force: number;
+
+  /**
+   * Timestamp of action
+   */
+  timestamp: number;
+
+  /**
+   * X coordinate of action
+   */
+  x: number;
+
+  /**
+   * Y coordinate of action
+   */
+  y: number;
+
+}
+
 /**
 * @name 3DTouch
 * @description
@@ -63,6 +115,9 @@ declare var window: any;
 *  }
 * )
 * ```
+ * @interfaces
+ * ThreeDeeTouchQuickAction
+ * ThreeDeeTouchForceTouch
 */
@Plugin({
  pluginName: 'ThreeDeeTouch',
@@ -135,18 +190,3 @@ export class ThreeDeeTouch {
  static disableLinkPreview(): void { }

 }
-
-export interface ThreeDeeTouchQuickAction {
-  type?: string;
-  title: string;
-  subtitle?: string;
-  iconType?: string;
-  iconTemplate?: string;
-}
-
-export interface ThreeDeeTouchForceTouch {
-  force: number;
-  timestamp: number;
-  x: number;
-  y: number;
-}
--- a/src/plugins/actionsheet.ts
+++ b/src/plugins/actionsheet.ts
@@ -1,5 +1,48 @@
 import { Cordova, Plugin } from './plugin';

+export interface ActionSheetOptions {
+
+  /**
+   * The labels for the buttons. Uses the index x
+   */
+  buttonLabels: string[];
+
+  /**
+   * The title for the actionsheet
+   */
+  title?: string;
+
+  /**
+   * Theme to be used on Android
+   */
+  androidTheme?: number;
+
+  /**
+   * Enable a cancel on Android
+   */
+  androidEnableCancelButton?: boolean;
+
+  /**
+   * Enable a cancel on Windows Phone
+   */
+  winphoneEnableCancelButton?: boolean;
+
+  /**
+   * Add a cancel button with text
+   */
+  addCancelButtonWithLabel?: string;
+
+  /**
+   * Add a destructive button with text
+   */
+  addDestructiveButtonWithLabel?: string;
+
+  /**
+   * On an iPad, set the X,Y position
+   */
+  position?: number[];
+
+}

 /**
 * @name Action Sheet
@@ -12,7 +55,6 @@ import { Cordova, Plugin } from './plugin';
 * ```typescript
 * import { ActionSheet } from 'ionic-native';
 *
- *
 * let buttonLabels = ['Share via Facebook', 'Share via Twitter'];
 * ActionSheet.show({
 *   'title': 'What do you want with this image?',
@@ -23,22 +65,8 @@ import { Cordova, Plugin } from './plugin';
 *   console.log('Button pressed: ' + buttonIndex);
 * });
 * ```
- *
- * @advanced
- * ActionSheet options
- *
- * | Option                        | Type      | Description                                  |
- * |-------------------------------|-----------|----------------------------------------------|
- * | title                         |`string`   | The title for the actionsheet                |
- * | buttonLabels                  |`string[]` | the labels for the buttons. Uses the index x |
- * | androidTheme                  |`number`   | Theme to be used on Android                  |
- * | androidEnableCancelButton     |`boolean`  | Enable a cancel on Android                   |
- * | winphoneEnableCancelButton    |`boolean`  | Enable a cancel on Windows Phone             |
- * | addCancelButtonWithLabel      |`string`   | Add a cancel button with text                |
- * | addDestructiveButtonWithLabel |`string`   | Add a destructive button with text           |
- * | position                      |`number[]` | On an iPad, set the X,Y position             |
- *
- *
+ * @interfaces
+ * ActionSheetOptions
 */
@Plugin({
  pluginName: 'ActionSheet',
@@ -51,21 +79,12 @@ export class ActionSheet {

  /**
   * Show a native ActionSheet component. See below for options.
-   * @param {options} Options See table below
+   * @param options {ActionSheetOptions} Options See table below
   * @returns {Promise<any>} Returns a Promise that resolves with the index of the
   *   button pressed (1 based, so 1, 2, 3, etc.)
   */
  @Cordova()
-  static show(options?: {
-    buttonLabels: string[],
-    title?: string,
-    androidTheme?: number,
-    androidEnableCancelButton?: boolean,
-    winphoneEnableCancelButton?: boolean,
-    addCancelButtonWithLabel?: string,
-    addDestructiveButtonWithLabel?: string,
-    position?: number[]
-  }): Promise<any> { return; }
+  static show(options?: ActionSheetOptions): Promise<any> { return; }


  /**
--- a/src/plugins/admob.ts
+++ b/src/plugins/admob.ts
@@ -1,25 +1,111 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

+export type AdMobAdSize = 'SMART_BANNER' | 'BANNER' | 'MEDIUM_RECTANGLE' | 'FULL_BANNER' | 'LEADERBOARD' | 'SKYSCRAPER' | 'CUSTOM';
+
+export interface AdMobOptions {
+
+  /**
+   * Banner ad ID
+   */
+  adId?: string;
+
+  /**
+   * Banner Ad Size, defaults to `SMART_BANNER`. IT can be: `SMART_BANNER`, `BANNER`, `MEDIUM_RECTANGLE`, `FULL_BANNER`, `LEADERBOARD`, `SKYSCRAPER`, or `CUSTOM`
+   */
+  adSize?: AdMobAdSize;
+
+  /**
+   * Banner width, valid when `adSize` is set to `CUSTOM`
+   */
+  width?: number;
+
+  /**
+   * Banner height, valid when `adSize` is set to `CUSTOM`
+   */
+  height?: number;
+
+  /**
+   * Allow banner to overlap webview, or else it will push webview up or down to avoid overlap. Defaults to false.
+   */
+  overlap?: boolean;
+
+  /**
+   * Position of banner ad. Defaults to `TOP_CENTER`. You can use the `AdMob.AD_POSITION` property to select other values.
+   */
+  position?: number;
+
+  /**
+   * X in pixels. Valid when `position` is set to `POS_XY`
+   */
+  x?: number;
+
+  /**
+   * Y in pixels. Valid when `position` is set to `POS_XY`
+   */
+  y?: number;
+
+  /**
+   * Set to true to receive test ad for testing purposes
+   */
+  isTesting?: boolean;
+
+  /**
+   * Auto show interstitial ad when loaded. Set to false if hope to control the show timing with prepareInterstitial/showInterstitial
+   */
+  autoShow?: boolean;
+
+  /**
+   * Re-create the banner on web view orientation change (not screen orientation), or else just move the banner. Default:true.
+   */
+  orientationRenew?: boolean;
+
+  /**
+   * Set extra color style for Ad
+   */
+  adExtras?: AdMobAdExtras;
+
+}
+
+export interface AdMobAdExtras {
+
+  color_bg: string;
+
+  color_bg_top: string;
+
+  color_border: string;
+
+  color_link: string;
+
+  color_text: string;
+
+  color_url: string;
+
+}
+
 /**
 * @name AdMob
- * @description Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
+ * @description
+ * Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
 * @usage
 * ```typescript
 * import { AdMob } from 'ionic-native';
- * 
+ *
 * ionViewDidLoad() {
- *   AdMob.onBannerDismiss()
- *     .subscribe(() => { console.log('User returned from interstitial'); });
+ *   AdMob.onAdDismiss()
+ *     .subscribe(() => { console.log('User dismissed ad'); });
 * }
- * 
- * public onClick() {
+ *
+ * onClick() {
 *   AdMob.prepareInterstitial('YOUR_ADID')
 *     .then(() => { AdMob.showInterstitial(); });
 * }
 *
 * ```
- * Please refer the the plugin's original repository for detailed usage.
+ *
+ * @interfaces
+ * AdMobOptions
+ * AdMobAdExtras
 */
@Plugin({
  pluginName: 'AdMob',
@@ -30,18 +116,33 @@ import { Observable } from 'rxjs/Observable';
 })
 export class AdMob {

-  // Static Methods
+  /**
+   * @private
+   */
+  static AD_POSITION = {
+    NO_CHANGE: 0,
+    TOP_LEFT: 1,
+    TOP_CENTER: 2,
+    TOP_RIGHT: 3,
+    LEFT: 4,
+    CENTER: 5,
+    RIGHT: 6,
+    BOTTOM_LEFT: 7,
+    BOTTOM_CENTER: 8,
+    BOTTOM_RIGHT: 9,
+    POS_XY: 10
+  };

  /**
-   *
-   * @param adIdOrOptions
+   * Create a banner
+   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
   * @returns {Promise<any>} Returns a Promise that resolves when the banner is created
   */
  @Cordova()
-  static createBanner(adIdOrOptions: any): Promise<any> { return; }
+  static createBanner(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }

  /**
-   *
+   * Destroy the banner, remove it from screen.
   */
  @Cordova({
    sync: true
@@ -49,18 +150,18 @@ export class AdMob {
  static removeBanner(): void { }

  /**
-   *
-   * @param position
+   * Show banner at position
+   * @param position {number} Position. Use `AdMob.AD_POSITION` to set values.
   */
  @Cordova({
    sync: true
  })
-  static showBanner(position: any): void { }
+  static showBanner(position: number): void { }

  /**
-   *
-   * @param x
-   * @param y
+   * Show banner at custom position
+   * @param x {number} Offset from screen left.
+   * @param y {number} Offset from screen top.
   */
  @Cordova({
    sync: true
@@ -68,7 +169,7 @@ export class AdMob {
  static showBannerAtXY(x: number, y: number): void { }

  /**
-   *
+   * Hide the banner, remove it from screen, but can show it later
   */
  @Cordova({
    sync: true
@@ -76,35 +177,28 @@ export class AdMob {
  static hideBanner(): void { }

  /**
-   *
-   * @param adIdOrOptions
+   * Prepare interstitial banner
+   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
   * @returns {Promise<any>} Returns a Promise that resolves when interstitial is prepared
   */
  @Cordova()
-  static prepareInterstitial(adIdOrOptions: any): Promise<any> { return; }
+  static prepareInterstitial(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }

  /**
-   * Show interstitial
+   * Show interstitial ad when it's ready
   */
  @Cordova({
    sync: true
  })
  static showInterstitial(): void { }

-  /**
-   *
-   * @returns {Promise<any>} Returns a Promise that resolves when the interstitial is ready
-   */
-  @Cordova()
-  static isInterstitialReady(): Promise<boolean> { return; }
-
  /**
   * Prepare a reward video ad
-   * @param adIdOrOptions
+   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
   * @returns {Promise<any>} Returns a Promise that resolves when the ad is prepared
   */
  @Cordova()
-  static prepareRewardVideoAd(adIdOrOptions: any): Promise<any> { return; }
+  static prepareRewardVideoAd(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }

  /**
   * Show a reward video ad
@@ -116,11 +210,11 @@ export class AdMob {

  /**
   * Sets the values for configuration and targeting
-   * @param options Returns a promise that resolves if the options are set successfully
+   * @param options {AdMobOptions} Options
   * @returns {Promise<any>} Returns a Promise that resolves when the options have been set
   */
  @Cordova()
-  static setOptions(options: any): Promise<any> { return; }
+  static setOptions(options: AdMobOptions): Promise<any> { return; }

  /**
   * Get user ad settings
@@ -129,71 +223,54 @@ export class AdMob {
  @Cordova()
  static getAdSettings(): Promise<any> { return; }

-  // Events
-
+  /**
+   * Triggered when failed to receive Ad
+   * @returns {Observable<any>}
+   */
  @Cordova({
    eventObservable: true,
-    event: 'onBannerFailedToReceive'
+    event: 'onAdFailLoad'
  })
-  static onBannerFailedToReceive(): Observable<any> { return; }
+  static onAdFailLoad(): Observable<any> { return; }

+  /**
+   * Triggered when Ad received
+   * @returns {Observable<any>}
+   */
  @Cordova({
    eventObservable: true,
-    event: 'onBannerReceive'
+    event: 'onAdLoaded'
  })
-  static onBannerReceive(): Observable<any> { return; }
+  static onAdLoaded(): Observable<any> { return; }

+  /**
+   * Triggered when Ad will be showed on screen
+   * @returns {Observable<any>}
+   */
  @Cordova({
    eventObservable: true,
-    event: 'onBannerPresent'
+    event: 'onAdPresent'
  })
-  static onBannerPresent(): Observable<any> { return; }
+  static onAdPresent(): Observable<any> { return; }

+  /**
+   * Triggered when user click the Ad, and will jump out of your App
+   * @returns {Observable<any>}
+   */
  @Cordova({
    eventObservable: true,
-    event: 'onBannerLeaveApp'
+    event: 'onAdLeaveApp'
  })
-  static onBannerLeaveApp(): Observable<any> { return; }
+  static onAdLeaveApp(): Observable<any> { return; }

+  /**
+   * Triggered when dismiss the Ad and back to your App
+   * @returns {Observable<any>}
+   */
  @Cordova({
    eventObservable: true,
-    event: 'onBannerDismiss'
+    event: 'onAdDismiss'
  })
-  static onBannerDismiss(): Observable<any> { return; }
-
-
-  @Cordova({
-    eventObservable: true,
-    event: 'onInterstitialFailedToReceive'
-  })
-  static onInterstitialFailedToReceive(): Observable<any> { return; }
-
-
-  @Cordova({
-    eventObservable: true,
-    event: 'onInterstitialReceive'
-  })
-  static onInterstitialReceive(): Observable<any> { return; }
-
-
-  @Cordova({
-    eventObservable: true,
-    event: 'onInterstitialPresent'
-  })
-  static onInterstitialPresent(): Observable<any> { return; }
-
-
-  @Cordova({
-    eventObservable: true,
-    event: 'onInterstitialLeaveApp'
-  })
-  static onInterstitialLeaveApp(): Observable<any> { return; }
-
-
-  @Cordova({
-    eventObservable: true,
-    event: 'onInterstitialDismiss'
-  })
-  static onInterstitialDismiss(): Observable<any> { return; }
+  static onAdDismiss(): Observable<any> { return; }

 }
--- a/src/plugins/android-fingerprint-auth.ts
+++ b/src/plugins/android-fingerprint-auth.ts
@@ -1,4 +1,68 @@
 import { Cordova, Plugin } from './plugin';
+
+export interface AndroidFingerprintAuthOptions {
+
+  /**
+   * Required
+   * Used as the alias for your key in the Android Key Store.
+   */
+  clientId: string;
+
+  /**
+   * Used to create credential string for encrypted token and as alias to retrieve the cipher.
+   */
+  username?: string;
+
+  /**
+   * Used to create credential string for encrypted token
+   */
+  password?: string;
+
+  /**
+   * Required for decrypt()
+   * Encrypted user credentials to decrypt upon successful authentication.
+   */
+  token?: string;
+
+  /**
+   * Set to true to remove the "USE BACKUP" button
+   */
+  disableBackup?: boolean;
+
+  /**
+   * Change the language. (en_US or es)
+   */
+  locale?: string;
+
+  /**
+   * The device max is 5 attempts. Set this parameter if you want to allow fewer than 5 attempts.
+   */
+  maxAttempts?: number;
+
+  /**
+   * Require the user to authenticate with a fingerprint to authorize every use of the key.
+   * New fingerprint enrollment will invalidate key and require backup authenticate to
+   * re-enable the fingerprint authentication dialog.
+   */
+  userAuthRequired?: boolean;
+
+  /**
+   * Set the title of the fingerprint authentication dialog.
+   */
+  dialogTitle?: string;
+
+  /**
+   * Set the message of the fingerprint authentication dialog.
+   */
+  dialogMessage?: string;
+
+  /**
+   * Set the hint displayed by the fingerprint icon on the fingerprint authentication dialog.
+   */
+  dialogHint?: string;
+
+}
+
 /**
 * @name Android Fingerprint Auth
 * @description
@@ -12,15 +76,20 @@ import { Cordova, Plugin } from './plugin';
 *     if(result.isAvailable){
 *       // it is available
 *
- *       AndroidFingerprintAuth.show({ clientId: "myAppName", clientSecret: "so_encrypted_much_secure_very_secret" })
+ *       AndroidFingerprintAuth.encrypt({ clientId: "myAppName", username: "myUsername", password: "myPassword" })
 *         .then(result => {
- *            if(result.withFingerprint) {
- *              console.log('Successfully authenticated with fingerprint!');
- *            } else if(result.withPassword) {
+ *            if (result.withFingerprint) {
+ *                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 => console.error(error));
+ *         .catch(error => {
+ *            if (error === "Cancelled") {
+ *              console.log("Fingerprint authentication cancelled");
+ *            } else console.error(error)
+ *         });
 *
 *     } else {
 *       // fingerprint auth isn't available
@@ -28,6 +97,8 @@ import { Cordova, Plugin } from './plugin';
 *   })
 *   .catch(error => console.error(error));
 * ```
+ * @interfaces
+ * AndroidFingerprintAuthOptions
 */
@Plugin({
  pluginName: 'AndroidFingerprintAuth',
@@ -36,37 +107,48 @@ import { Cordova, Plugin } from './plugin';
  repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth'
 })
 export class AndroidFingerprintAuth {
+
  /**
   * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
-   * @param params {any}
+   * @param options {AndroidFingerprintAuthOptions} Options
+   * @returns {Promise<any>}
   */
  @Cordova()
-  static show(params: {
+  static encrypt(options: AndroidFingerprintAuthOptions): Promise<{
    /**
-     * Used as the alias for your key in the Android Key Store.
+     * Biometric authentication
     */
-    clientId: string;
+    withFingerprint: boolean;
    /**
-     * Used to encrypt the token returned upon successful fingerprint authentication.
+     * Authentication using backup credential activity
     */
-    clientSecret: string;
+    withBackup: boolean;
    /**
-     * Set to true to remove the "USE BACKUP" button
+     * base64encoded string representation of user credentials
     */
-    disableBackup?: boolean;
+    token: string;
+  }> {return; }
+
+  /**
+   * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
+   * @param options {AndroidFingerprintAuthOptions} Options
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  static decrypt(options: AndroidFingerprintAuthOptions): Promise<{
    /**
-     * Change the language. (en_US or es)
+     * Biometric authentication
     */
-    locale?: string
-  }): Promise<{
+    withFingerprint: boolean;
    /**
-     * Base64 encoded string
+     * Authentication using backup credential activity
     */
-    withFingerprint: string;
+    withBackup: boolean;
    /**
-     *
+     * FingerprintAuth.CipherMode.DECRYPT
+     * Decrypted password
     */
-    withPassword: boolean;
+    password: string;
  }> {return; }

  /**
@@ -74,6 +156,12 @@ export class AndroidFingerprintAuth {
   * @returns {Promise<any>} Returns a Promise that resolves if fingerprint auth is available on the device
   */
  @Cordova()
-  static isAvailable(): Promise<{isAvailable: boolean}> {return; }
+  static isAvailable(): Promise<{isAvailable: 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()
+  static delete(options: {clientId: string; username: string; }): Promise<{deleted: boolean}> { return; }
 }
--- a/src/plugins/appavailability.ts
+++ b/src/plugins/appavailability.ts
@@ -9,14 +9,14 @@ import { Cordova, Plugin } from './plugin';
 *
 * @usage
 * ```typescript
- * import { AppAvailability } from 'ionic-native';
+ * import { AppAvailability, Device } from 'ionic-native';
 *
 *
 * let app;
 *
- * if (device.platform === 'iOS') {
+ * if (Device.platform === 'iOS') {
 *   app = 'twitter://';
- * } else if (device.platform === 'Android') {
+ * } else if (Device.platform === 'Android') {
 *   app = 'com.twitter.android';
 * }
 *
--- a/src/plugins/apprate.ts
+++ b/src/plugins/apprate.ts
@@ -1,8 +1,94 @@
 import { Cordova, CordovaProperty, Plugin } from './plugin';

-
 declare var window;

+export interface AppRatePreferences {
+
+  /**
+   * Custom BCP 47 language tag
+   */
+  useLanguage?: string;
+
+  /**
+   * Custom application title
+   */
+  displayAppName?: string;
+
+  /**
+   * Show dialog again when application version will be updated. Defaults to `true`
+   */
+  promptAgainForEachNewVersion?: boolean;
+
+  /**
+   * count of runs of application before dialog will be displayed. Defaults to `3`
+   */
+  usesUntilPrompt?: number;
+
+  /**
+   * leave app or no when application page opened in app store (now supported only for iOS). Defaults to `false`
+   */
+  openStoreInApp?: boolean;
+
+  /**
+   * use custom view for rate dialog. Defaults to `false`
+   */
+  useCustomRateDialog?: boolean;
+
+  /**
+   * Custom locale object
+   */
+  customLocale?: any;
+
+  /**
+   * Callbacks for events
+   */
+  callbacks?: AppRateCallbacks;
+
+  /**
+   * App Store URLS
+   */
+  storeAppURL?: AppRateStoreAppUrls;
+
+}
+
+export interface AppRateCallbacks {
+
+  /**
+   * call back function. called when user clicked on rate-dialog buttons
+   */
+  onButtonClicked?: Function;
+
+  /**
+   * call back function. called when rate-dialog showing
+   */
+  onRateDialogShow?: Function;
+
+}
+
+export interface AppRateStoreAppUrls {
+
+  /**
+   * application id in AppStore
+   */
+  ios?: string;
+
+  /**
+   * application URL in GooglePlay
+   */
+  android?: string;
+
+  /**
+   * application URL in AppWorld
+   */
+  blackberry?: string;
+
+  /**
+   * application URL in WindowsStore
+   */
+  windows8?: string;
+
+}
+
 /**
 * @name App Rate
 * @description
@@ -22,26 +108,11 @@ declare var window;
 * AppRate.promptForRating(false);
 * ```
 *
- * @advanced
+ * @interfaces
+ * AppRatePreferences
+ * AppRateStoreAppUrls
+ * AppRateCallbacks
 *
- * Rating dialog preferences
- *
- * | Option                       | Type       | Default | Description                                                                            |
- * |------------------------------|------------|---------|----------------------------------------------------------------------------------------|
- * | useLanguage                  | `String`   | null    | custom BCP 47 language tag                                                             |
- * | displayAppName               | `String`   | ''      | custom application title                                                               |
- * | promptAgainForEachNewVersion | `Boolean`  | true    | show dialog again when application version will be updated                             |
- * | usesUntilPrompt              | `Integer`  | 3       | count of runs of application before dialog will be displayed                           |
- * | openStoreInApp               | `Boolean`  | false   | leave app or no when application page opened in app store (now supported only for iOS) |
- * | useCustomRateDialog          | `Boolean`  | false   | use custom view for rate dialog                                                        |
- * | callbacks.onButtonClicked    | `Function` | null    | call back function. called when user clicked on rate-dialog buttons                    |
- * | callbacks.onRateDialogShow   | `Function` | null    | call back function. called when rate-dialog showing                                    |
- * | storeAppURL.ios              | `String`   | null    | application id in AppStore                                                             |
- * | storeAppURL.android          | `String`   | null    | application URL in GooglePlay                                                          |
- * | storeAppURL.blackberry       | `String`   | null    | application URL in AppWorld                                                            |
- * | storeAppURL.windows8         | `String`   | null    | application URL in WindowsStore                                                        |
- * | customLocale                 | `Object`   | null    | custom locale object                                                                   |
-
 */
@Plugin({
  pluginName: 'AppRate',
@@ -57,7 +128,7 @@ export class AppRate {
   * See table below for options
   */
  @CordovaProperty
-  static get preferences() { return window.AppRate.preferences; }
+  static preferences: AppRatePreferences;

  /**
   * Prompts the user for rating
--- a/src/plugins/appversion.ts
+++ b/src/plugins/appversion.ts
@@ -26,6 +26,7 @@ import { Cordova, Plugin } from './plugin';
  platforms: ['Android', 'iOS']
 })
 export class AppVersion {
+
  /**
   * Returns the name of the app
   * @returns {Promise<any>}
--- a/src/plugins/background-geolocation.ts
+++ b/src/plugins/background-geolocation.ts
@@ -2,7 +2,7 @@ import {Cordova, Plugin} from './plugin';

 declare var window;

-export interface Location {
+export interface BackgroundGeolocationResponse {

  /**
   * ID of location as stored in DB (or null)
@@ -49,6 +49,11 @@ export interface Location {
   */
  altitude: number;

+  /**
+    * accuracy of the altitude if available.
+    */
+  altitudeAccuracy: number;
+
  /**
   * bearing, in degrees.
   */
@@ -65,7 +70,7 @@ export interface Location {
  timestamp: number;
 }

-export interface Config {
+export interface BackgroundGeolocationConfig {

  /**
   * Desired accuracy in meters. Possible values [0, 10, 100, 1000]. The lower
@@ -268,8 +273,8 @@ export interface Config {
 *
 * ```
 * @interfaces
- * Location
- * Config
+ * BackgroundGeolocationResponse
+ * BackgroundGeolocationConfig
 */
@Plugin({
  pluginName: 'BackgroundGeolocation',
@@ -341,7 +346,7 @@ export class BackgroundGeolocation {
  @Cordova({
    sync: true
  })
-  static configure(callback: Function, errorCallback: Function, options: Config): any { return; }
+  static configure(callback: Function, errorCallback: Function, options: BackgroundGeolocationConfig): any { return; }

  /**
   * Turn ON the background-geolocation system.
@@ -379,7 +384,7 @@ export class BackgroundGeolocation {
  @Cordova({
    callbackOrder: 'reverse'
  })
-  static setConfig(options: Config): Promise<any> { return; }
+  static setConfig(options: BackgroundGeolocationConfig): Promise<any> { return; }

  /**
   * Returns current stationaryLocation if available. null if not
@@ -387,7 +392,7 @@ export class BackgroundGeolocation {
   * @returns {Promise<Location>}
   */
  @Cordova()
-  static getStationaryLocation(): Promise<Location> { return; }
+  static getStationaryLocation(): Promise<BackgroundGeolocationResponse> { return; }

  /**
   * Add a stationary-region listener. Whenever the devices enters "stationary-mode",
@@ -498,4 +503,5 @@ export class BackgroundGeolocation {
   */
  @Cordova()
  static getLogEntries(limit: number): Promise<any> { return; }
+
 }
--- a/src/plugins/backgroundmode.ts
+++ b/src/plugins/backgroundmode.ts
@@ -2,6 +2,38 @@ import { Cordova, CordovaFunctionOverride, Plugin } from './plugin';

 import { Observable } from 'rxjs/Observable';

+/**
+ * Configurations items that can be updated.
+ */
+export interface BackgroundModeConfiguration {
+
+  /**
+   * Title of the background task
+   */
+  title?: String;
+
+  /**
+   * The text that scrolls itself on statusbar
+   */
+  ticker?: String;
+
+  /**
+   * Description of background task
+   */
+  text?: String;
+
+  /**
+   * if true plugin will not display a notification. Default is false.
+   */
+  silent?: boolean;
+
+  /**
+   * By default the app will come to foreground when taping on the notification. If false, plugin wont come to foreground when tapped.
+   */
+  resume?: boolean;
+
+}
+
 /**
 * @name Background Mode
 * @description
@@ -13,19 +45,9 @@ import { Observable } from 'rxjs/Observable';
 *
 * BackgroundMode.enable();
 * ```
-*
-* @advanced
-*
-* Configuration options
-*
-* | Property | Type      | Description                                                                  |
-* |----------|-----------|------------------------------------------------------------------------------|
-* | title    | `string`  | Title of the background task. Optional                                       |
-* | ticker   | `string`  | The text that scrolls itself on the statusbar. Optional                      |
-* | text     | `string`  | Description of the background task. Optional                                 |
-* | silent   | `boolean` | If the plugin will display a notification or not. Default is false. Optional |
-* | resume   | `boolean` | Bring the app into the foreground if the notification is tapped. Optional    |
-*
+ *
+ * @interfaces
+ * BackgroundModeConfiguration
 */
@Plugin({
  pluginName: 'BackgroundMode',
@@ -35,6 +57,7 @@ import { Observable } from 'rxjs/Observable';
  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 export class BackgroundMode {
+
  /**
  * Enable the background mode.
  * Once called, prevents the app from being paused while in background.
@@ -53,17 +76,21 @@ export class BackgroundMode {

  /**
  * Checks if background mode is enabled or not.
-  * @returns {Promise<boolean>} returns a promise that resolves with boolean that indicates if the background mode is enabled.
+  * @returns {boolean} returns a boolean that indicates if the background mode is enabled.
  */
-  @Cordova()
-  static isEnabled(): Promise<boolean> { return; }
+  @Cordova({
+    sync: true
+  })
+  static isEnabled(): boolean { return; }

  /**
  * Can be used to get the information if the background mode is active.
-  * @returns {Promise<boolean>} returns a promise that resolves with boolean that indicates if the background mode is active.
+  * @returns {boolean} returns a boolean that indicates if the background mode is active.
  */
-  @Cordova()
-  static isActive(): Promise<boolean> { return; }
+  @Cordova({
+    sync: true
+  })
+  static isActive(): boolean { return; }

  /**
  * Override the default title, ticker and text.
@@ -73,7 +100,7 @@ export class BackgroundMode {
  @Cordova({
    platforms: ['Android']
  })
-  static setDefaults(options?: Configure): Promise<any> { return; }
+  static setDefaults(options?: BackgroundModeConfiguration): Promise<any> { return; }

  /**
  * Modify the displayed information.
@@ -83,7 +110,7 @@ export class BackgroundMode {
  @Cordova({
    platforms: ['Android']
  })
-  static configure(options?: Configure): Promise<any> { return; }
+  static configure(options?: BackgroundModeConfiguration): Promise<any> { return; }

  /**
  * Called when background mode is activated.
@@ -107,34 +134,3 @@ export class BackgroundMode {
  static onfailure(): Observable<any> { return; };

 }
-
-/**
-* Configurations items that can be updated.
-*/
-export interface Configure {
-  /**
-  *Title of the background task
-  */
-  title?: String;
-
-  /**
-  *The text that scrolls itself on statusbar
-  */
-  ticker?: String;
-
-  /**
-  *Description of background task
-  */
-  text?: String;
-
-  /**
-  *Boolean, if true plugin will not display a notification. Default is false.
-  */
-  silent?: boolean;
-
-  /**
-  *Boolean. By default the app will come to foreground when taping on the notification. If false, plugin wont come to foreground when tapped.
-  */
-  resume?: boolean;
-
-}
--- a/src/plugins/backlight.ts
+++ b/src/plugins/backlight.ts
@@ -0,0 +1,44 @@
+import { Plugin, Cordova } from './plugin';
+
+/**
+ * @beta
+ * @name Backlight
+ * @description
+ * This plugin adds turning on/off the device backlight.
+ *
+ * @usage
+ * ```
+ * import { Backlight } from 'ionic-native';
+ *
+ * // Turn backlight on
+ * Backlight.on().then(() => console.log('backlight on'));
+ *
+ * // Turn backlight off
+ * Backlight.off().then(() => console.log('backlight off'));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Backlight',
+  plugin: 'cordova-plugin-backlight',
+  pluginRef: 'cordova.plugins.Backlight',
+  repo: 'https://github.com/mebibou/cordova-plugin-backlight',
+  platforms: ['Android']
+})
+export class Backlight {
+
+  /**
+   * This function turns backlight on
+   * @return {Promise<any>} Returns a promise that resolves when the backlight is on
+   */
+  @Cordova()
+  static on(): Promise<any> { return; }
+
+  /**
+   * This function turns backlight off
+   * @return {Promise<any>} Returns a promise that resolves when the backlight is off
+   */
+  @Cordova()
+  static off(): Promise<any> { return; }
+
+}
--- a/src/plugins/barcodescanner.ts
+++ b/src/plugins/barcodescanner.ts
@@ -1,5 +1,54 @@
 import { Cordova, Plugin } from './plugin';

+export interface BarcodeScannerOptions {
+
+  /**
+   * Prefer front camera. Supported on iOS and Android.
+   */
+  preferFrontCamera?: boolean;
+
+  /**
+   * Show flip camera button. Supported on iOS and Android.
+   */
+  showFlipCameraButton?: boolean;
+
+  /**
+   * Show torch button. Supported on iOS and Android.
+   */
+  showTorchButton?: boolean;
+
+  /**
+   * Disable animations. Supported on iOS only.
+   */
+  disableAnimations?: boolean;
+
+  /**
+   * Prompt text. Supported on Android only.
+   */
+  prompt?: string;
+
+  /**
+   * Formats separated by commas. Defaults to all formats except `PDF_417` and `RSS_EXPANDED`.
+   */
+  formats?: string;
+
+  /**
+   * Orientation. Supported on Android only. Can be set to `portrait` or `landscape`. Defaults to none so the user can rotate the phone and pick an orientation.
+   */
+  orientation?: string;
+
+  /**
+   * Launch with the torch switched on (if available). Supported on Android only.
+   */
+  torchOn?: boolean;
+
+  /**
+   * Display scanned text for X ms. 0 suppresses it entirely, default 1500. Supported on Android only.
+   */
+  resultDisplayDuration?: number;
+
+}
+
 /**
 * @name Barcode Scanner
 * @description
@@ -18,6 +67,8 @@ import { Cordova, Plugin } from './plugin';
 * 	// An error occurred
 * });
 * ```
+ * @interfaces
+ * BarcodeScannerOptions
 */
@Plugin({
  pluginName: 'BarcodeScanner',
@@ -37,15 +88,16 @@ export class BarcodeScanner {
    PHONE_TYPE: 'PHONE_TYPE',
    SMS_TYPE: 'SMS_TYPE'
  };
+
  /**
   * Open the barcode scanner.
-   * @param options {Object} Optional options to pass to the scanner
+   * @param options {BarcodeScannerOptions} Optional options to pass to the scanner
   * @returns {Promise<any>} Returns a Promise that resolves with scanner data, or rejects with an error.
   */
  @Cordova({
    callbackOrder: 'reverse'
  })
-  static scan(options?: any): Promise<any> { return; }
+  static scan(options?: BarcodeScannerOptions): Promise<any> { return; }

  /**
   * Encodes data into a barcode.
--- a/src/plugins/base64togallery.ts
+++ b/src/plugins/base64togallery.ts
@@ -1,4 +1,5 @@
 import { Cordova, Plugin } from './plugin';
+
 /**
 * @name Base64 To Gallery
 * @description This plugin allows you to save base64 data as a png image into the device
--- a/src/plugins/batterystatus.ts
+++ b/src/plugins/batterystatus.ts
@@ -1,6 +1,20 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

+export interface BatteryStatusResponse {
+
+  /**
+   * The battery charge percentage
+   */
+  level: number;
+
+  /**
+   * A boolean that indicates whether the device is plugged in
+   */
+  isPlugged: boolean;
+
+}
+
 /**
 * @name Battery Status
 * @description
@@ -22,10 +36,13 @@ import { Observable } from 'rxjs/Observable';
 * subscription.unsubscribe();
 *
 * ```
+ * @interfaces
+ * BatteryStatusResponse
 */
@Plugin({
  pluginName: 'BatteryStatus',
  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']
 })
@@ -33,44 +50,32 @@ export class BatteryStatus {

  /**
   * Watch the change in battery level
-   * @returns {Observable<StatusObject>} Returns an observable that pushes a status object
+   * @returns {Observable<BatteryStatusResponse>} Returns an observable that pushes a status object
   */
  @Cordova({
    eventObservable: true,
    event: 'batterystatus'
  })
-  static onChange(): Observable<StatusObject> { return; }
+  static onChange(): Observable<BatteryStatusResponse> { return; }

  /**
   * Watch when the battery level goes low
-   * @returns {Observable<StatusObject>} Returns an observable that pushes a status object
+   * @returns {Observable<BatteryStatusResponse>} Returns an observable that pushes a status object
   */
  @Cordova({
    eventObservable: true,
    event: 'batterylow'
  })
-  static onLow(): Observable<StatusObject> { return; }
+  static onLow(): Observable<BatteryStatusResponse> { return; }

  /**
   * Watch when the battery level goes to critial
-   * @returns {Observable<StatusObject>} Returns an observable that pushes a status object
+   * @returns {Observable<BatteryStatusResponse>} Returns an observable that pushes a status object
   */
  @Cordova({
    eventObservable: true,
    event: 'batterycritical'
  })
-  static onCritical(): Observable<StatusObject> { return; }
+  static onCritical(): Observable<BatteryStatusResponse> { return; }

 }
-
-export interface StatusObject {
-  /**
-   * The battery charge percentage
-   */
-  level: number;
-
-  /**
-   * A boolean that indicates whether the device is plugged in
-   */
-  isPlugged: boolean;
-}
--- a/src/plugins/ble.ts
+++ b/src/plugins/ble.ts
@@ -167,6 +167,7 @@ import { Observable } from 'rxjs/Observable';
  platforms: ['iOS', 'Android']
 })
 export class BLE {
+
  /**
   * Scan and discover BLE peripherals for the specified amount of time.
   *
@@ -204,7 +205,7 @@ export class BLE {
  @Cordova({
    observable: true,
    clearFunction: 'stopScan',
-    clearWithArgs: true
+    clearWithArgs: false
  })
  static startScan(services: string[]): Observable<any> { return; }

@@ -217,7 +218,7 @@ export class BLE {
  @Cordova({
    observable: true,
    clearFunction: 'stopScan',
-    clearWithArgs: true
+    clearWithArgs: false
  })
  static startScanWithOptions(services: string[], options: {reportDuplicates?: boolean} | any): Observable<any> { return; }

@@ -421,4 +422,5 @@ export class BLE {
   */
  @Cordova()
  static enable(): Promise<any> { return; }
+
 }
--- a/src/plugins/broadcaster.ts
+++ b/src/plugins/broadcaster.ts
@@ -0,0 +1,51 @@
+import { Plugin, Cordova } from './plugin';
+import { Observable } from 'rxjs/Observable';
+
+/**
+ * @name Broadcaster
+ * @description
+ * This plugin adds exchanging events between native code and your app.
+ *
+ * @usage
+ * ```
+ * import { Broadcaster } from 'ionic-native';
+ *
+ * // Listen to events from Native
+ * Broadcaster.addEventListener('eventName').then((event) => console.log(event));
+ *
+ * // Send event to Native
+ * Broadcaster.fireNativeEvent('eventName', {}).then(() => console.log('success'));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Broadcaster',
+  plugin: 'cordova-plugin-broadcaster',
+  pluginRef: 'broadcaster',
+  repo: 'https://github.com/bsorrentino/cordova-broadcaster',
+  platforms: ['Android', 'iOS']
+})
+export class Broadcaster {
+
+  /**
+   * This function listen to an event sent from the native code
+   * @param eventName {string}
+   * @return {Observable<any>} Returns an observable to watch when an event is received
+   */
+  @Cordova({
+    observable: true,
+    clearFunction: 'removeEventListener',
+    clearWithArgs: true
+  })
+  static addEventListener(eventName: string): Observable<any> { return; }
+
+  /**
+   * This function sends data to the native code
+   * @param eventName {string}
+   * @param eventData {any}
+   * @return {Promise<any>} Returns a promise that resolves when an event is successfully fired
+   */
+  @Cordova()
+  static fireNativeEvent(eventName: string, eventData: any): Promise<any> { return; }
+
+}
--- a/src/plugins/calendar.ts
+++ b/src/plugins/calendar.ts
@@ -1,19 +1,55 @@
 import { Cordova, Plugin } from './plugin';

-
 /**
 * @private
 */
 export interface CalendarOptions {
+
+  /**
+   * Id
+   */
  id?: string;
+
+  /**
+   *
+   */
  firstReminderMinutes?: number;
+
+  /**
+   *
+   */
  secondReminderMinutes?: number;
-  recurrence?: string; // options are: 'daily', 'weekly', 'monthly', 'yearly'
-  recurrenceInterval?: number; // only used when recurrence is set
+
+  /**
+   * Recurrence. Can be set to `daily`, `weekly`, `monthly` or `yearly`
+   */
+  recurrence?: string;
+
+  /**
+   * Recurrence interval. Valid only when `recurrence` option is set.
+   */
+  recurrenceInterval?: number;
+
+  /**
+   * Recurrence end date. Valid only when `recurrence` option is set.
+   */
  recurrenceEndDate?: Date;
+
+  /**
+   * Calendar name. Ths is supported by `iOS` only.
+   */
  calendarName?: string;
+
+  /**
+   * Calendar id
+   */
  calendarId?: number;
+
+  /**
+   * URL
+   */
  url?: string;
+
 }

 /**
@@ -35,7 +71,8 @@ export interface CalendarOptions {
 *   (err) => { console.log(err); }
 * );
 * ```
- *
+ * @interfaces
+ * CalendarOptions
 */
@Plugin({
  pluginName: 'Calendar',
@@ -102,9 +139,7 @@ export class Calendar {
   * @returns {Promise<any>} Returns a Promise
   */
  @Cordova()
-  static createCalendar(
-    nameOrOptions: string | { calendarName: string, calendarColor: string }
-    ): Promise<any> { return; }
+  static createCalendar(nameOrOptions: string | any): Promise<any> { return; }

  /**
   * Delete a calendar. (iOS only)
@@ -117,31 +152,12 @@ export class Calendar {
  /**
   * Returns the default calendar options.
   *
-   * @return Returns an object with the default calendar options:
-   *   firstReminderMinutes: 60,
-   *   secondReminderMinutes: null,
-   *   recurrence: null, // options are: 'daily', 'weekly', 'monthly', 'yearly'
-   *   recurrenceInterval: 1, // only used when recurrence is set
-   *   recurrenceEndDate: null,
-   *   calendarName: null,
-   *   calendarId: null,
-   *   url: null
+   * @return {CalendarOptions} Returns an object with the default calendar options
   */
  @Cordova({
    sync: true
  })
-  static getCalendarOptions(): CalendarOptions {
-    return {
-      firstReminderMinutes: 60,
-      secondReminderMinutes: null,
-      recurrence: null,
-      recurrenceInterval: 1,
-      recurrenceEndDate: null,
-      calendarName: null,
-      calendarId: null,
-      url: null
-    };
-  }
+  static getCalendarOptions(): CalendarOptions { return; }

  /**
   * Silently create an event.
@@ -279,7 +295,9 @@ export class Calendar {
   * @param {Date} [endDate]  The end date
   * @returns {Promise<any>} Returns a Promise that resolves with the list of events, or rejects with an error.
   */
-  @Cordova()
+  @Cordova({
+    platforms: ['Android']
+  })
  static listEventsInRange(startDate: Date, endDate: Date): Promise<any> { return; }

  /**
@@ -293,7 +311,9 @@ export class Calendar {
   * Get a list of all future events in the specified calendar. (iOS only)
   * @returns {Promise<any>} Returns a Promise that resolves with the list of events, or rejects with an error.
   */
-  @Cordova()
+  @Cordova({
+    platforms: ['iOS']
+  })
  static findAllEventsInNamedCalendar(calendarName: string): Promise<any> { return; }

  /**
@@ -311,7 +331,9 @@ export class Calendar {
   * @param {Date} [newEndDate]  The new event end date
   * @return Returns a Promise
   */
-  @Cordova()
+  @Cordova({
+    platforms: ['iOS']
+  })
  static modifyEvent(
    title?: string,
    location?: string,
@@ -342,7 +364,9 @@ export class Calendar {
   * @param {CalendarOptions} [newOptions]  New event options, see `getCalendarOptions`
   * @return Returns a Promise
   */
-  @Cordova()
+  @Cordova({
+    platforms: ['iOS']
+  })
  static modifyEventWithOptions(
    title?: string,
    location?: string,
@@ -388,7 +412,9 @@ export class Calendar {
   * @param {string} calendarName
   * @return Returns a Promise
   */
-  @Cordova()
+  @Cordova({
+    platforms: ['iOS']
+  })
  static deleteEventFromNamedCalendar(
    title?: string,
    location?: string,
--- a/src/plugins/call-number.ts
+++ b/src/plugins/call-number.ts
@@ -23,6 +23,7 @@ import { Plugin, Cordova } from './plugin';
  platforms: ['iOS', 'Android']
 })
 export class CallNumber {
+
  /**
   * Calls a phone number
   * @param numberToCall {string} The phone number to call as a string
@@ -35,4 +36,5 @@ export class CallNumber {
  static callNumber(numberToCall: string, bypassAppChooser: boolean): Promise<any> {
    return;
  }
+
 }
--- a/src/plugins/camera-preview.ts
+++ b/src/plugins/camera-preview.ts
@@ -1,20 +1,28 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
 export interface CameraPreviewRect {
+
  x: number;
+
  y: number;
+
  width: number;
+
  height: number;
+
 }

 export interface CameraPreviewSize {
+
  maxWidth: number;
+
  maxHeight: number;
+
 }

 /**
+ * @beta
 * @name CameraPreview
 * @description
 * Showing camera preview in HTML
@@ -68,6 +76,9 @@ export interface CameraPreviewSize {
 *
 * ```
 *
+ * @interfaces
+ * CameraPreviewRect
+ * CameraPreviewSize
 */
@Plugin({
  pluginName: 'CameraPreview',
@@ -107,7 +118,7 @@ export class CameraPreview {
  @Cordova({
    sync: true
  })
-  static takePicture(size: CameraPreviewSize): void { }
+  static takePicture(size?: CameraPreviewSize): void { }

  /**
   * Register a callback function that receives the original picture and the image captured from the preview box.
@@ -157,4 +168,5 @@ export class CameraPreview {
    sync: true
  })
  static setColorEffect(effect: string): void { }
+
 }
--- a/src/plugins/camera.ts
+++ b/src/plugins/camera.ts
@@ -117,6 +117,7 @@ export interface CameraPopoverOptions {
  platforms: ['Android', 'BlackBerry', 'Browser', 'Firefox', 'FireOS', 'iOS', 'Windows', 'Windows Phone 8', 'Ubuntu']
 })
 export class Camera {
+
  /**
   * @private
   * @enum {number}
--- a/src/plugins/card-io.ts
+++ b/src/plugins/card-io.ts
@@ -1,6 +1,134 @@
 import { Cordova, Plugin } from './plugin';


+export interface CardIOOptions {
+
+  /**
+   * Set to true to require expiry date
+   */
+  requireExpiry?: boolean;
+
+  /**
+   * 	The user will be prompted for the card CVV
+   */
+  requireCVV?: boolean;
+
+  /**
+   * The user will be prompted for the card billing postal code.
+   */
+  requirePostalCode?: boolean;
+
+  /**
+   * 	Removes the keyboard button from the scan screen.
+   */
+  supressManual?: boolean;
+
+  /**
+   * The postal code will only collect numeric input. Set this if you know the expected country's postal code has only numeric postal codes.
+   */
+  restrictPostalCodeToNumericOnly?: boolean;
+
+  /**
+   * The theme for the card.io Activity's will be set to the theme of the application.
+   */
+  keepApplicationTheme?: boolean;
+
+  /**
+   * The user will be prompted for the cardholder name
+   */
+  requireCardholderName?: boolean;
+
+  /**
+   * Used to display instructions to the user while they are scanning their card.
+   */
+  scanInstructions?: string;
+
+  /**
+   * 	If set, the card will not be scanned with the camera.
+   */
+  noCamera?: boolean;
+
+  /**
+   * If scanExpiry is true, an attempt to extract the expiry from the card image will be made.
+   */
+  scanExpiry?: boolean;
+
+  /**
+   * The preferred language for all strings appearing in the user interface. If not set, or if set to null, defaults to the device's current language setting.
+   */
+  languageOrLocale?: string;
+
+  /**
+   * Changes the color of the guide overlay on the camera. The color is provided in hexadecimal format (e.g. `#FFFFFF`)
+   */
+  guideColor?: string;
+
+  /**
+   * The user will not be prompted to confirm their card number after processing.
+   */
+  supressConfirmation?: boolean;
+
+  /**
+   * The card.io logo will not be shown overlaid on the camera.
+   */
+  hideCardIOLogo?: boolean;
+
+  /**
+   * The card.io logo will be shown instead of the PayPal logo.
+   */
+  useCardIOLogo?: boolean;
+
+  /**
+   * Once a card image has been captured but before it has been processed, this value will determine whether to continue processing as usual.
+   */
+  supressScan?: boolean;
+
+}
+
+export interface CardIOResponse {
+
+  /**
+   * Card type
+   */
+  cardType: string;
+
+  /**
+   * Masked card number, showing only last 4 digits
+   */
+  redactedCardNumber: string;
+
+  /**
+   * Full card number
+   */
+  cardNumber: string;
+
+  /**
+   * Expiry month
+   */
+  expiryMonth: number;
+
+  /**
+   * Expiry year
+   */
+  expiryYear: number;
+
+  /**
+   * CVV
+   */
+  cvv: string;
+
+  /**
+   * Postal code
+   */
+  postalCode: string;
+
+  /**
+   * Cardholder name
+   */
+  cardholderName: string;
+
+}
+
 /**
 * @name CardIO
 * @description
@@ -23,15 +151,19 @@ import { Cordova, Plugin } from './plugin';
 *     }
 *   );
 * ```
+ * @interfaces
+ * CardIOOptions
+ * CardIOResponse
 */
@Plugin({
  pluginName: 'CardIO',
-  plugin: 'https://github.com/card-io/card.io-Cordova-Plugin',
+  plugin: 'card.io.cordova.mobilesdk',
  pluginRef: 'CardIO',
  repo: 'https://github.com/card-io/card.io-Cordova-Plugin',
  platforms: ['iOS', 'Android']
 })
 export class CardIO {
+
  /**
   * Check whether card scanning is currently available. (May vary by
   * device, OS version, network connectivity, etc.)
@@ -57,33 +189,3 @@ export class CardIO {
  static version(): Promise<string> { return; }

 }
-
-export interface CardIOOptions {
-  requireExpiry?: boolean;
-  requireCVV?: boolean;
-  requirePostalCode?: boolean;
-  supressManual?: boolean;
-  restrictPostalCodeToNumericOnly?: boolean;
-  keepApplicationTheme?: boolean;
-  requireCardholderName?: boolean;
-  scanInstructions?: string;
-  noCamera?: boolean;
-  scanExpiry?: boolean;
-  languageOrLocale?: string;
-  guideColor?: string;
-  supressConfirmation?: boolean;
-  hideCardIOLogo?: boolean;
-  useCardIOLogo?: boolean;
-  supressScan?: boolean;
-}
-
-export interface CardIOResponse {
-  cardType: string;
-  redactedCardNumber: string;
-  cardNumber: string;
-  expiryMonth: number;
-  expiryYear: number;
-  cvv: string;
-  postalCode: string;
-  cardholderName: string;
-}
--- a/src/plugins/clipboard.ts
+++ b/src/plugins/clipboard.ts
@@ -1,6 +1,5 @@
 import { Cordova, Plugin } from './plugin';

-
 /**
 * @name Clipboard
 * @description
--- a/src/plugins/code-push.ts
+++ b/src/plugins/code-push.ts
@@ -1,10 +1,6 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-// below are taken from
-// https://raw.githubusercontent.com/Microsoft/cordova-plugin-code-push/master/typings/codePush.d.ts
-// and adjusted to remove warnings and access control
-
 namespace Http {
  export const enum Verb {
    GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH
--- a/src/plugins/contacts.ts
+++ b/src/plugins/contacts.ts
@@ -1,38 +1,54 @@
-import { Cordova, CordovaInstance, InstanceProperty, Plugin } from './plugin';
+import { CordovaInstance, InstanceProperty, Plugin, getPromise } from './plugin';

 declare var 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';
+
 /**
 * @private
 */
 export interface IContactProperties {
+
  /** A globally unique identifier. */
  id?: string;
+
  /** The name of this Contact, suitable for display to end users. */
  displayName?: string;
+
  /** An object containing all components of a persons name. */
  name?: IContactName;
+
  /** A casual name by which to address the contact. */
  nickname?: string;
+
  /** An array of all the contact's phone numbers. */
  phoneNumbers?: IContactField[];
+
  /** An array of all the contact's email addresses. */
  emails?: IContactField[];
+
  /** An array of all the contact's addresses. */
  addresses?: IContactAddress[];
+
  /** An array of all the contact's IM addresses. */
  ims?: IContactField[];
+
  /** An array of all the contact's organizations. */
  organizations?: IContactOrganization[];
+
  /** The birthday of the contact. */
  birthday?: Date;
+
  /** A note about the contact. */
  note?: string;
+
  /** An array of the contact's photos. */
  photos?: IContactField[];
+
  /** An array of all the user-defined categories associated with the contact. */
  categories?: IContactField[];
+
  /** An array of web pages associated with the contact. */
  urls?: IContactField[];
 }
@@ -42,20 +58,20 @@ export interface IContactProperties {
 */
 export class Contact implements IContactProperties {
  private _objectInstance: any;
-  @InstanceProperty get id(): string { return; }
-  @InstanceProperty get displayName(): string { return; }
-  @InstanceProperty get name(): IContactName {return; }
-  @InstanceProperty get nickname(): string { return; }
-  @InstanceProperty get phoneNumbers(): IContactField[] { return; }
-  @InstanceProperty get emails(): IContactField[] { return; }
-  @InstanceProperty get addresses(): IContactAddress[] { return; }
-  @InstanceProperty get ims(): IContactField[] { return; }
-  @InstanceProperty get organizations(): IContactOrganization[] { return; }
-  @InstanceProperty get birthday(): Date { return; }
-  @InstanceProperty get note(): string { return; }
-  @InstanceProperty get photos(): IContactField[] { return; }
-  @InstanceProperty get categories(): IContactField[] { return; }
-  @InstanceProperty get urls(): IContactField[] { return; }
+  @InstanceProperty id: string;
+  @InstanceProperty displayName: string;
+  @InstanceProperty name: IContactName;
+  @InstanceProperty nickname: string;
+  @InstanceProperty phoneNumbers: IContactField[];
+  @InstanceProperty emails: IContactField[];
+  @InstanceProperty addresses: IContactAddress[];
+  @InstanceProperty ims: IContactField[];
+  @InstanceProperty organizations: IContactOrganization[];
+  @InstanceProperty birthday: Date;
+  @InstanceProperty note: string;
+  @InstanceProperty photos: IContactField[];
+  @InstanceProperty categories: IContactField[];
+  @InstanceProperty urls: IContactField[];

  constructor() {
    this._objectInstance = navigator.contacts.create();
@@ -73,8 +89,14 @@ export class Contact implements IContactProperties {
  @CordovaInstance()
  remove(): Promise<any> { return; }

-  @CordovaInstance()
-  save(): Promise<any> { return; }
+  save(): Promise<any> {
+    return getPromise((resolve, reject) => {
+      this._objectInstance.save((contact) => {
+        this._objectInstance = contact;
+        resolve(this);
+      }, reject);
+    });
+  }
 }

 /**
@@ -120,49 +142,37 @@ export interface IContactName {
 * @private
 */
 export class ContactName implements IContactName {
-  private _objectInstance: any;
-
-  constructor(formatted?: string, familyName?: string, givenName?: string, middleName?: string, honorificPrefix?: string, honorificSuffix?: string) {
-    this._objectInstance = new window.ContactName(formatted, familyName, givenName, middleName, honorificPrefix, honorificSuffix);
-  }
-
-  @InstanceProperty get formatted(): string { return; }
-  @InstanceProperty get familyName(): string { return; }
-  @InstanceProperty get givenName(): string { return; }
-  @InstanceProperty get middleName(): string { return; }
-  @InstanceProperty get honorificPrefix(): string { return; }
-  @InstanceProperty get honorificSuffix(): string { return; }
+  constructor(public formatted?: 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;
+  value?: string;
  /** Set to true if this ContactField contains the user's preferred value. */
-  pref: boolean;
+  pref?: boolean;
 }

 /**
 * @private
 */
 export class ContactField implements IContactField {
-  private _objectInstance: any;
-
-  constructor(type?: string, value?: string, pref?: boolean) {
-    this._objectInstance = new window.ContactField(type, value, pref);
-  }
-
-  @InstanceProperty get type(): string { return; }
-  @InstanceProperty get value(): string { return; }
-  @InstanceProperty get pref(): boolean { return; }
+  constructor(public type?: string,
+              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. */
@@ -181,42 +191,21 @@ export interface IContactAddress {
 * @private
 */
 export class ContactAddress implements IContactAddress {
-  private _objectInstance: any;
-
-  constructor(pref?: boolean,
-    type?: string,
-    formatted?: string,
-    streetAddress?: string,
-    locality?: string,
-    region?: string,
-    postalCode?: string,
-    country?: string) {
-    this._objectInstance = new window.ContactAddress(pref, type, formatted, streetAddress, locality, region, postalCode, country);
-  }
-
-  /** Set to true if this ContactAddress contains the user's preferred value. */
-  @InstanceProperty get pref(): boolean { return; }
-  /** A string indicating what type of field this is, home for example. */
-  @InstanceProperty get type(): string { return; }
-  /** The full address formatted for display. */
-  @InstanceProperty get formatted(): string { return; }
-  /** The full street address. */
-  @InstanceProperty get streetAddress(): string { return; }
-  /** The city or locality. */
-  @InstanceProperty get locality(): string { return; }
-  /** The state or region. */
-  @InstanceProperty get region(): string { return; }
-  /** The zip code or postal code. */
-  @InstanceProperty get postalCode(): string { return; }
-  /** The country name. */
-  @InstanceProperty get country(): string { return; }
+  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) {}
 }

 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. */
@@ -229,29 +218,22 @@ export interface IContactOrganization {
 * @private
 */
 export class ContactOrganization implements IContactOrganization {
-  private _objectInstance: any;
-  constructor() {
-    this._objectInstance = new window.ContactOrganization();
-  }
-  /** Set to true if this ContactOrganization contains the user's preferred value. */
-  @InstanceProperty get pref(): boolean { return; }
-  /** A string that indicates what type of field this is, home for example. */
-  @InstanceProperty get type(): string { return; }
-  /** The name of the organization. */
-  @InstanceProperty get name(): string { return; }
-  /** The department the contract works for. */
-  @InstanceProperty get department(): string { return; }
-  /** The contact's title at the organization. */
-  @InstanceProperty get title(): string { return; }
+  constructor(
+    public type?: string,
+    public name?: string,
+    public department?: string,
+    public title?: string,
+    public pref?: boolean
+  ) {}
 }

 /** Search options to filter navigator.contacts.  */
 export interface IContactFindOptions {
  /** The search string used to find navigator.contacts. */
  filter?: string;
-  /** Determines if the find operation returns multiple navigator.contacts. */
+  /** Determines if the find operation returns multiple navigator.contacts. Defaults to false. */
  multiple?: boolean;
-  /* Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields. */
+  /** Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields. */
  desiredFields?: string[];
  /**
   * (Android only): Filters the search to only return contacts with a phone number informed.
@@ -263,31 +245,10 @@ export interface IContactFindOptions {
 * @private
 */
 export class ContactFindOptions implements IContactFindOptions {
-  private _objectInstance: any;
-
-  constructor() {
-    this._objectInstance = new window.ContactFindOptions();
-  }
-
-  /**
-   * The search string used to find navigator.contacts. (Default: "")
-   */
-  @InstanceProperty get filter(): string { return; }
-
-  /**
-   * Determines if the find operation returns multiple navigator.contacts. (Default: false)
-   */
-  @InstanceProperty get multiple(): boolean { return; }
-
-  /**
-   * Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields.
-   */
-  @InstanceProperty get desiredFields(): any { return; }
-
-  /**
-   * (Android only): Filters the search to only return contacts with a phone number informed.
-   */
-  @InstanceProperty get hasPhoneNumber(): boolean { return; }
+  constructor(public filter?: string,
+              public multiple?: boolean,
+              public desiredFields?: string[],
+              public hasPhoneNumber?: boolean) {}
 }

 /**
@@ -298,22 +259,27 @@ export class ContactFindOptions implements IContactFindOptions {
 * @usage
 *
 * ```typescript
- * import { Contact } from 'ionic-native';
+ * import { Contacts, Contact, ContactField, ContactName } from 'ionic-native';
 *
 *
- * let contact = new Contact();
- * contact.displayName = 'Mr. Ionitron';
+ * let contact: Contact = Contacts.create();
+ *
+ * contact.name = new ContactName(null, 'Smith', 'John');
+ * contact.phoneNumbers = [new ContactField('mobile', '6471234567')];
 * contact.save().then(
 *   () => console.log('Contact saved!', contact),
 *   (error: any) => console.error('Error saving contact.', error)
 * );
+ *
 * ```
 * @interfaces
 * IContactProperties
- * @classes
- * ContactFindOptions
- * ContactOrganization
- * ContactAddress
+ * IContactError
+ * IContactName
+ * IContactField
+ * IContactAddress
+ * IContactOrganization
+ * IContactFindOptions
 */
@Plugin({
  pluginName: 'Contacts',
@@ -322,6 +288,7 @@ export class ContactFindOptions implements IContactFindOptions {
  repo: 'https://github.com/apache/cordova-plugin-contacts'
 })
 export class Contacts {
+
  /**
   * Create a single contact.
   * @returns {Contact} Returns a Contact object
@@ -332,29 +299,38 @@ export class Contacts {

  /**
   * Search for contacts in the Contacts list.
-   * @param fields {string[]}  Contact fields to be used as a search qualifier.
-   *  A zero-length contactFields parameter is invalid and results in ContactError.INVALID_ARGUMENT_ERROR.
-   *  A contactFields value of "*" searches all contact fields.
-   *
-   * @param options {Object} the options to query with:
-   *   filter: The search string used to find navigator.contacts. (string) (Default: "")
-   *   multiple: Determines if the find operation returns multiple navigator.contacts. (Boolean) (Default: false)
-   *   desiredFields: Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields. (DOMString[]) [Optional]
-   *   hasPhoneNumber(Android only): Filters the search to only return contacts with a phone number informed. (Boolean) (Default: false)
-   *
-   * @returns {Promise<any>} Returns a Promise that resolves with the search results (an array of Contact objects)
+   * @param fields {ContactFieldType[]}  Contact fields to be used as a search qualifier
+   * @param options {IContactFindOptions} Optional options for the query
+   * @returns {Promise<Contact[]>} Returns a Promise that resolves with the search results (an array of Contact objects)
   */
-  @Cordova({
-    successIndex: 1,
-    errorIndex: 2
-  })
-  static find(fields: string[], options?: any): Promise<any> { return; }
+  static find(fields: ContactFieldType[], options?: IContactFindOptions): Promise<Contact[]> {
+    return getPromise((resolve, reject) => {
+      navigator.contacts.find(fields, (contacts) => {
+        resolve(contacts.map(processContact));
+      }, reject, options);
+    });
+  }

  /**
   * Select a single Contact.
-   * @returns {Promise<any>} Returns a Promise that resolves with the selected Contact
+   * @returns {Promise<Contact>} Returns a Promise that resolves with the selected Contact
   */
-  @Cordova()
-  static pickContact(): Promise<any> { return; }
+  static pickContact(): Promise<Contact> {
+    return getPromise((resolve, reject) => {
+      navigator.contacts.pickContact((contact) => resolve(processContact(contact)), reject);
+    });
+  }

 }
+
+/**
+ * @private
+ */
+function processContact(contact) {
+  let newContact = new Contact();
+  for (let prop in contact) {
+    if (typeof contact[prop] === 'function') continue;
+    newContact[prop] = contact[prop];
+  }
+  return newContact;
+}
--- a/src/plugins/crop.ts
+++ b/src/plugins/crop.ts
@@ -1,4 +1,5 @@
 import { Cordova, Plugin } from './plugin';
+
 /**
 * @name Crop
 * @description Crops images
@@ -22,6 +23,7 @@ import { Cordova, Plugin } from './plugin';
  repo: 'https://github.com/jeduan/cordova-plugin-crop'
 })
 export class Crop {
+
  /**
   * Crops an image
   * @param pathToImage
@@ -32,4 +34,5 @@ export class Crop {
    callbackOrder: 'reverse'
  })
  static crop(pathToImage: string, options?: {quality: number}): Promise<string> { return; }
+
 }
--- a/src/plugins/datepicker.ts
+++ b/src/plugins/datepicker.ts
@@ -1,6 +1,5 @@
 import {Cordova, Plugin} from './plugin';

-
 export interface DatePickerOptions {
  /**
   * The mode of the date picker
@@ -35,71 +34,88 @@ export interface DatePickerOptions {
   * Label of BUTTON_POSITIVE (done button) on Android
   */
  okText?: string;
+
  /**
   * Label of BUTTON_NEGATIVE (cancel button). If empty, uses android.R.string.cancel.
   */
  cancelText?: string;
+
  /**
   * Label of today button. If empty, doesn't show the option to select current date.
   */
  todayText?: string;
+
  /**
   * Label of now button. If empty, doesn't show the option to select current time.
   */
  nowText?: string;
+
  /**
   * Shows time dialog in 24 hours format.
   */
  is24Hour?: boolean;
+
  /**
   * Choose the Android theme for the picker. You can use the DatePicker.ANDROID_THEMES property.
   * Values: 1: THEME_TRADITIONAL | 2: THEME_HOLO_DARK | 3: THEME_HOLO_LIGHT | 4: THEME_DEVICE_DEFAULT_DARK | 5: THEME_DEVICE_DEFAULT_LIGHT
   */
  androidTheme?: number;
+
  /**
   * Shows or hide dates earlier then selected date.
   */
  allowOldDates?: boolean;
+
  /**
   * Shows or hide dates after selected date.
   */
  allowFutureDates?: boolean;
+
  /**
   * Label of done button.
   */
  doneButtonLabel?: string;
+
  /**
   * Hex color of done button.
   */
  doneButtonColor?: string;
+
  /**
   * Label of cancel button.
   */
  cancelButtonLabel?: string;
+
  /**
   * Hex color of cancel button.
   */
  cancelButtonColor?: string;
+
  /**
   * X position of date picker. The position is absolute to the root view of the application.
   */
  x?: number;
+
  /**
   * Y position of date picker. The position is absolute to the root view of the application.
   */
  y?: number;
+
  /**
   * Interval between options in the minute section of the date picker.
   */
  minuteInterval?: number;
+
  /**
   * Force the UIPopoverArrowDirection enum. The value any will revert to default UIPopoverArrowDirectionAny and let the app choose the proper direction itself.
   */
  popoverArrowDirection?: string;
+
  /**
   * Force locale for datePicker.
   */
  locale?: string;
+
 }

 /**
--- a/src/plugins/dbmeter.ts
+++ b/src/plugins/dbmeter.ts
@@ -1,7 +1,6 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
 /**
 * @name DB Meter
 * @description This plugin defines a global DBMeter object, which permits to get the decibel values from the microphone.
--- a/src/plugins/deeplinks.ts
+++ b/src/plugins/deeplinks.ts
@@ -1,8 +1,8 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
 export interface DeeplinkMatch {
+
  /**
   * The route info for the matched route
   */
@@ -19,6 +19,7 @@ export interface DeeplinkMatch {
   * the route was matched (for example, Facebook sometimes adds extra data)
   */
  $link: any;
+
 }

 /**
@@ -52,11 +53,22 @@ export interface DeeplinkMatch {
 * Deeplinks.routeWithNavController(this.navController, {
    '/about-us': AboutPage,
    '/products/:productId': ProductPage
-  });
+  }).subscribe((match) => {
+      // match.$route - the route we matched, which is the matched entry from the arguments to route()
+      // match.$args - the args passed in the link
+      // match.$link - the full link data
+      console.log('Successfully matched route', match);
+    }, (nomatch) => {
+      // nomatch.$link - the full link data
+      console.error('Got a deeplink that didn\'t match', nomatch);
+    });
 * ```
 *
 * See the [Ionic 2 Deeplinks Demo](https://github.com/driftyco/ionic2-deeplinks-demo/blob/master/app/app.ts) for an example of how to
 * retrieve the `NavController` reference at runtime.
+ *
+ * @interfaces
+ * DeeplinkMatch
 */
@Plugin({
  pluginName: 'Deeplinks',
@@ -98,7 +110,7 @@ export class Deeplinks {
   * 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.
   *
-   * @returns {Observable<DeeplinkMatch} Returns an Observable that resolves each time a deeplink comes through, and
+   * @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({
--- a/src/plugins/device.ts
+++ b/src/plugins/device.ts
@@ -1,31 +1,6 @@
 import { CordovaProperty, Plugin } from './plugin';

-
-declare var window: {
-  device: Device
-};
-
-export interface Device {
-  /** Get the version of Cordova running on the device. */
-  cordova: string;
-  /**
-   * The device.model returns the name of the device's model or product. The value is set
-   * by the device manufacturer and may be different across versions of the same product.
-   */
-  model: string;
-  /** Get the device's operating system name. */
-  platform: string;
-  /** Get the device's Universally Unique Identifier (UUID). */
-  uuid: string;
-  /** Get the operating system version. */
-  version: string;
-  /** Get the device's manufacturer. */
-  manufacturer: string;
-  /** Whether the device is running on a simulator. */
-  isVirtual: boolean;
-  /** Get the device hardware serial number. */
-  serial: string;
-}
+declare var window: any;

 /**
 * @name Device
@@ -37,7 +12,7 @@ export interface Device {
 * import { Device } from 'ionic-native';
 *
 *
- * console.log('Device UUID is: ' + Device.device.uuid);
+ * console.log('Device UUID is: ' + Device.uuid);
 * ```
 */
@Plugin({
@@ -48,12 +23,39 @@ export interface Device {
 })
 export class Device {

+  /** Get the version of Cordova running on the device. */
+  @CordovaProperty
+  static cordova: string;
+
  /**
-   * Returns the whole device object.
-   *
-   * @returns {Device} The device object.
+   * The device.model returns the name of the device's model or product. The value is set
+   * by the device manufacturer and may be different across versions of the same product.
   */
  @CordovaProperty
-  static get device(): Device { return window.device; }
+  static model: string;
+
+  /** Get the device's operating system name. */
+  @CordovaProperty
+  static platform: string;
+
+  /** Get the device's Universally Unique Identifier (UUID). */
+  @CordovaProperty
+  static uuid: string;
+
+  /** Get the operating system version. */
+  @CordovaProperty
+  static version: string;
+
+  /** Get the device's manufacturer. */
+  @CordovaProperty
+  static manufacturer: string;
+
+  /** Whether the device is running on a simulator. */
+  @CordovaProperty
+  static isVirtual: boolean;
+
+  /** Get the device hardware serial number. */
+  @CordovaProperty
+  static serial: string;

 }
--- a/src/plugins/deviceaccounts.ts
+++ b/src/plugins/deviceaccounts.ts
@@ -1,6 +1,5 @@
 import { Cordova, Plugin } from './plugin';

-
@Plugin({
  pluginName: 'DeviceAccounts',
  plugin: 'https://github.com/loicknuchel/cordova-device-accounts.git',
--- a/src/plugins/devicemotion.ts
+++ b/src/plugins/devicemotion.ts
@@ -1,8 +1,7 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
-export interface AccelerationData {
+export interface DeviceMotionAccelerationData {

  /**
   * Amount of acceleration on the x-axis. (in m/s^2)
@@ -26,7 +25,7 @@ export interface AccelerationData {

 }

-export interface AccelerometerOptions {
+export interface DeviceMotionAccelerometerOptions {

  /**
   * Requested period of calls to accelerometerSuccess with acceleration data in Milliseconds. Default: 10000
@@ -60,6 +59,9 @@ export interface AccelerometerOptions {
 * subscription.unsubscribe();
 *
 * ```
+ * @interfaces
+ * DeviceMotionAccelerationData
+ * DeviceMotionAccelerometerOptions
 */
@Plugin({
  pluginName: 'DeviceMotion',
@@ -71,21 +73,21 @@ export class DeviceMotion {

  /**
   * Get the current acceleration along the x, y, and z axes.
-   * @returns {Promise<AccelerationData>} Returns object with x, y, z, and timestamp properties
+   * @returns {Promise<DeviceMotionAccelerationData>} Returns object with x, y, z, and timestamp properties
   */
  @Cordova()
-  static getCurrentAcceleration(): Promise<AccelerationData> { return; }
+  static getCurrentAcceleration(): Promise<DeviceMotionAccelerationData> { return; }

  /**
   * Watch the device acceleration. Clear the watch by unsubscribing from the observable.
   * @param {AccelerometerOptions} options list of options for the accelerometer.
-   * @returns {Observable<AccelerationData>} Observable returns an observable that you can subscribe to
+   * @returns {Observable<DeviceMotionAccelerationData>} Observable returns an observable that you can subscribe to
   */
  @Cordova({
    callbackOrder: 'reverse',
    observable: true,
    clearFunction: 'clearWatch'
  })
-  static watchAcceleration(options?: AccelerometerOptions): Observable<AccelerationData> { return; }
+  static watchAcceleration(options?: DeviceMotionAccelerometerOptions): Observable<DeviceMotionAccelerationData> { return; }

 }
--- a/src/plugins/deviceorientation.ts
+++ b/src/plugins/deviceorientation.ts
@@ -1,8 +1,7 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
-export interface CompassHeading {
+export interface DeviceOrientationCompassHeading {

  /**
   * The heading in degrees from 0-359.99 at a single moment in time. (Number)
@@ -26,7 +25,7 @@ export interface CompassHeading {

 }

-export interface CompassOptions {
+export interface DeviceOrientationCompassOptions {

  /**
   * How often to retrieve the compass heading in milliseconds. (Number) (Default: 100)
@@ -65,6 +64,9 @@ export interface CompassOptions {
 * // Stop watching heading change
 * subscription.unsubscribe();
 * ```
+ * @interfaces
+ * DeviceOrientationCompassOptions
+ * DeviceOrientationCompassHeading
 */
@Plugin({
  pluginName: 'DeviceOrientation',
@@ -76,23 +78,23 @@ export class DeviceOrientation {

  /**
   * Get the current compass heading.
-   * @returns {Promise<CompassHeading>}
+   * @returns {Promise<DeviceOrientationCompassHeading>}
   */
  @Cordova()
-  static getCurrentHeading(): Promise<CompassHeading> { return; }
+  static getCurrentHeading(): Promise<DeviceOrientationCompassHeading> { return; }

  /**
   * Get the device current heading at a regular interval
   *
   * Stop the watch by unsubscribing from the observable
-   * @param {CompassOptions} options Options for compass. Frequency and Filter. Optional
-   * @returns {Observable<CompassHeading>} Returns an observable that contains the compass heading
+   * @param {DeviceOrientationCompassOptions} options Options for compass. Frequency and Filter. Optional
+   * @returns {Observable<DeviceOrientationCompassHeading>} Returns an observable that contains the compass heading
   */
  @Cordova({
    callbackOrder: 'reverse',
    observable: true,
    clearFunction: 'clearWatch'
  })
-  static watchHeading(options?: CompassOptions): Observable<CompassHeading> { return; }
+  static watchHeading(options?: DeviceOrientationCompassOptions): Observable<DeviceOrientationCompassHeading> { return; }

 }
--- a/src/plugins/diagnostic.ts
+++ b/src/plugins/diagnostic.ts
@@ -1,4 +1,4 @@
-import { Cordova, Plugin } from './plugin';
+import {Cordova, Plugin, CordovaProperty} from './plugin';

 /**
 * @name Diagnostic
@@ -27,6 +27,7 @@ import { Cordova, Plugin } from './plugin';
 *   }).catch(e => console.error(e));
 *
 * ```
+ *
 */
@Plugin({
  pluginName: 'Diagnostic',
@@ -63,18 +64,19 @@ export class Diagnostic {
    BODY_SENSORS: 'BODY_SENSORS'
  };

-  static permissionStatus = {
-    GRANTED: 'GRANTED',
-    GRANTED_WHEN_IN_USE: 'GRANTED_WHEN_IN_USE', // iOS
-    RESTRICTED: 'RESTRICTED', // iOS
-    DENIED: 'DENIED',
-    DENIED_ALWAYS: 'DENIED_ALWAYS', // android
-    NOT_REQUESTED: 'NOT_REQUESTED'
+  @CordovaProperty
+  static permissionStatus: {
+    GRANTED: string;
+    DENIED: string;
+    NOT_REQUESTED: string;
+    DENIED_ALWAYS: string;
+    RESTRICTED: string;
+    GRANTED_WHEN_IN_USE: string;
  };

  static locationAuthorizationMode = {
-    ALWAYS: 'ALWAYS',
-    WHEN_IN_USE: 'WHEN_IN_USE'
+    ALWAYS: 'always',
+    WHEN_IN_USE: 'when_in_use'
  };

  static permissionGroups = {
--- a/src/plugins/dialogs.ts
+++ b/src/plugins/dialogs.ts
@@ -1,7 +1,7 @@
 import { Cordova, Plugin } from './plugin';


-export interface PromptCallback {
+export interface DialogsPromptCallback {

  /**
   * The index of the pressed button. (Number) Note that the index uses one-based indexing, so the value is 1, 2, 3, etc.
@@ -12,6 +12,7 @@ export interface PromptCallback {
   * The text entered in the prompt dialog box. (String)
   */
  input1: string;
+
 }


@@ -30,6 +31,8 @@ export interface PromptCallback {
 *
 *
 * ```
+ * @interfaces
+ * DialogsPromptCallback
 */
@Plugin({
  pluginName: 'Dialogs',
@@ -79,7 +82,7 @@ export class Dialogs {
   * @param {string} title Dialog title. (Optional, defaults to Prompt)
   * @param {Array<string>} buttonLabels  Array of strings specifying button labels. (Optional, defaults to ["OK","Cancel"])
   * @param {string} defaultText Default textbox input value.  (Optional, Default: empty string)
-   * @returns {Promise<any>} Returns a promise that resolves an object with the button index clicked and the text entered
+   * @returns {Promise<DialogsPromptCallback>} Returns a promise that resolves an object with the button index clicked and the text entered
   */
  @Cordova({
    successIndex: 1,
@@ -90,7 +93,7 @@ export class Dialogs {
    title: string = 'Prompt',
    buttonLabels: Array<string> = ['OK', 'Cancel'],
    defaultText: string = ''
-    ): Promise<any> { return; }
+    ): Promise<DialogsPromptCallback> { return; }


  /**
--- a/src/plugins/emailcomposer.ts
+++ b/src/plugins/emailcomposer.ts
@@ -1,9 +1,30 @@
 import { Cordova, Plugin } from './plugin';

-
 declare var cordova: any;

+export interface EmailComposerOptions {
+
+  app?: string;
+
+  to?: string | Array<string>;
+
+  cc?: string | Array<string>;
+
+  bcc?: string | Array<string>;
+
+  attachments?: Array<any>;
+
+  subject?: string;
+
+  body?: string;
+
+  isHtml?: boolean;
+
+}
+
+
 /**
+ * @beta
 * @name Email Composer
 * @description
 *
@@ -42,6 +63,8 @@ declare var cordova: any;
 * EmailComposer.open(email);
 *
 * ```
+ * @interfaces
+ * EmailComposerOptions
 */
@Plugin({
  pluginName: 'EmailComposer',
@@ -92,7 +115,7 @@ export class EmailComposer {
  /**
   * Displays the email composer pre-filled with data.
   *
-   * @param email {Email} Email
+   * @param options {EmailComposerOptions} Email
   * @param scope {any?} An optional scope for the promise
   * @returns {Promise<any>} Resolves promise when the EmailComposer has been opened
   */
@@ -100,17 +123,6 @@ export class EmailComposer {
    successIndex: 1,
    errorIndex: 3
  })
-  static open(email: Email, scope?: any): Promise<any> { return; }
+  static open(options: EmailComposerOptions, scope?: any): Promise<any> { return; }

 }
-
-export interface Email {
-  app?: string;
-  to?: string | Array<string>;
-  cc?: string | Array<string>;
-  bcc?: string | Array<string>;
-  attachments?: Array<any>;
-  subject?: string;
-  body?: string;
-  isHtml?: boolean;
-}
--- a/src/plugins/estimote-beacons.ts
+++ b/src/plugins/estimote-beacons.ts
@@ -1,12 +1,28 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

+export interface EstimoteBeaconRegion {
+
+  state?: string;
+
+  major: number;
+
+  minor: number;
+
+  identifier?: string;
+
+  uuid: string;
+
+}
+
 /**
 * @name EstimoteBeacons
 *
 * @description
 * This plugin enables communication between a phone and Estimote Beacons peripherals.
 *
+ * @interfaces
+ * EstimoteBeaconRegion
 */
@Plugin({
  pluginName: 'EstimoteBeacons',
@@ -40,6 +56,7 @@ export class EstimoteBeacons {

  /** Beacon colour */
  static BeaconColorBlueberryPie = 3;
+
  /**
   * Beacon colour.
   */
@@ -394,7 +411,6 @@ export class EstimoteBeacons {
  })
  static startSecureMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }

-
  /**
  * Stop monitoring secure beacons. Available on iOS.
  * This function has the same parameters/behaviour as
@@ -481,10 +497,3 @@ export class EstimoteBeacons {

 }

-export interface EstimoteBeaconRegion {
-  state?: string;
-  major: number;
-  minor: number;
-  identifier?: string;
-  uuid: string;
-}
--- a/src/plugins/facebook.ts
+++ b/src/plugins/facebook.ts
@@ -1,5 +1,27 @@
 import { Cordova, Plugin } from './plugin';

+export interface FacebookLoginResponse {
+
+  status: string;
+
+  authResponse: {
+
+    session_key: boolean;
+
+    accessToken: string;
+
+    expiresIn: number;
+
+    sig: string;
+
+    secret: string;
+
+    userID: string;
+
+  };
+
+}
+
 /**
 * @name Facebook
 * @description
@@ -249,15 +271,3 @@ export class Facebook {
  }): Promise<any> { return; }

 }
-
-export interface FacebookLoginResponse {
-  status: string;
-  authResponse: {
-    session_key: boolean;
-    accessToken: string;
-    expiresIn: number;
-    sig: string;
-    secret: string;
-    userID: string;
-  };
-}
--- a/src/plugins/file-chooser.ts
+++ b/src/plugins/file-chooser.ts
@@ -1,4 +1,5 @@
 import { Plugin, Cordova } from './plugin';
+
 /**
 * @name FileChooser
 * @description
@@ -10,8 +11,8 @@ import { Plugin, Cordova } from './plugin';
 * import {FileChooser} from 'ionic-native';
 *
 * FileChooser.open()
- *   .then(uri => console.log(uri);
- *   .catch(e => console.log(e);
+ *   .then(uri => console.log(uri));
+ *   .catch(e => console.log(e));
 *
 * ```
 */
@@ -23,10 +24,12 @@ import { Plugin, Cordova } from './plugin';
  platforms: ['Android']
 })
 export class FileChooser {
+
  /**
   * Open a file
   * @returns {Promise<string>}
   */
  @Cordova()
  static open(): Promise<string> { return; }
+
 }
--- a/src/plugins/file-opener.ts
+++ b/src/plugins/file-opener.ts
@@ -1,4 +1,5 @@
 import { Plugin, Cordova } from './plugin';
+
 /**
 * @name FileOpener
 * @description
@@ -19,6 +20,7 @@ import { Plugin, Cordova } from './plugin';
  repo: 'https://github.com/pwlin/cordova-plugin-file-opener2'
 })
 export class FileOpener {
+
  /**
   * Open an file
   * @param filePath {string} File Path
@@ -55,4 +57,5 @@ export class FileOpener {
    errorName: 'error'
  })
  static appIsInstalled(packageId: string): Promise<any> {return; }
+
 }
--- a/src/plugins/file.ts
+++ b/src/plugins/file.ts
@@ -385,8 +385,8 @@ export class File {
  };

  /**
-   * Get free disk space
-   * @returns {Promise<number>} Returns a promise that resolves with the remaining free disk space
+   * Get free disk space in Bytes
+   * @returns {Promise<number>} Returns a promise that resolves with the remaining free disk space in Bytes
   */
  static getFreeDiskSpace(): Promise<number> {
    return new Promise<any>((resolve, reject) => {
--- a/src/plugins/filepath.ts
+++ b/src/plugins/filepath.ts
@@ -26,6 +26,7 @@ declare var window: any;
  platforms: ['Android']
 })
 export class FilePath {
+
  /**
   * Resolve native path for given content URL/path.
   * @param {String} path  Content URL/path.
@@ -33,4 +34,5 @@ export class FilePath {
   */
  @Cordova()
  static resolveNativePath(path: string): Promise<string> {return; }
+
 }
--- a/src/plugins/filetransfer.ts
+++ b/src/plugins/filetransfer.ts
@@ -1,6 +1,5 @@
 import { CordovaInstance, Plugin } from './plugin';

-
 declare var FileTransfer;

 export interface FileUploadOptions {
@@ -46,6 +45,7 @@ export interface FileUploadOptions {
   * Content-Type is present, multipart form data will NOT be used.
   */
  headers?: { [s: string]: any; };
+
 }

 export interface FileUploadResult {
@@ -69,6 +69,7 @@ export interface FileUploadResult {
   * The HTTP response headers by the server.
   */
  headers: { [s: string]: any; };
+
 }

 export interface FileTransferError {
@@ -103,6 +104,7 @@ export interface FileTransferError {
   * Either e.getMessage or e.toString.
   */
  exception: string;
+
 }

 /**
@@ -171,6 +173,10 @@ export interface FileTransferError {
 * cd files
 * ls
 * ```
+ * @interfaces
+ * FileUploadOptions
+ * FileUploadResult
+ * FileTransferError
 */
@Plugin({
  pluginName: 'FileTransfer',
@@ -217,7 +223,7 @@ export class Transfer {
    successIndex: 2,
    errorIndex: 3
  })
-  upload(fileUrl: string, url: string, options?: FileUploadOptions, trustAllHosts?: boolean): Promise<FileUploadResult> {
+  upload(fileUrl: string, url: string, options?: FileUploadOptions, trustAllHosts?: boolean): Promise<FileUploadResult | FileTransferError> {
    return;
  }

--- a/src/plugins/fingerprint-aio.ts
+++ b/src/plugins/fingerprint-aio.ts
@@ -0,0 +1,62 @@
+import { Plugin, Cordova } from './plugin';
+
+
+export interface FingerprintOptions {
+  /**
+   * Key for platform keychain
+   */
+  clientId: string;
+
+  /**
+   * Secret password. Only for android
+   */
+  clientSecret?: string;
+}
+
+/**
+ * @beta
+ * @name FingerprintAIO
+ * @description
+ * Use simple fingerprint authentication on Android and iOS.
+ * Requires Cordova plugin: cordova-plugin-fingerprint-aio. For more info about plugin, vist: https://github.com/NiklasMerz/cordova-plugin-fingerprint-aio
+ *
+ * @usage
+ * ```typescript
+ * import { FingerprintAIO } from 'ionic-native';
+ *
+ * FingerprintAIO.show({
+ *     clientId: "Fingerprint-Demo",
+ *    clientSecret: "password" //Only necessary for Android
+ * })
+ * .then((result: any) => console.log(any))
+ * .catch((error: any) => console.log(error));
+ *
+ * ```
+ * @interfaces
+ * FingerprintOptions
+ */
+@Plugin({
+  pluginName: 'FingerprintAIO',
+  plugin: 'cordova-plugin-fingerprint-aio',
+  pluginRef: 'Fingerprint',
+  repo: 'https://github.com/NiklasMerz/cordova-plugin-fingerprint-aio',
+  platforms: ['Android', 'iOS']
+})
+export class FingerprintAIO {
+
+  /**
+   * Check if fingerprint authentication is available
+   * @return {Promise<any>} Returns a promise with result
+   */
+  @Cordova()
+  static isAvailable(): Promise<any> { return; }
+
+  /**
+   * Show authentication dialogue
+   * @param options {FingerprintOptions} options for platform specific fingerprint API
+   * @return {Promise<any>} Returns a promise that resolves when authentication was successfull
+   */
+  @Cordova()
+  static show(options: FingerprintOptions): Promise<any> { return; }
+
+}
--- a/src/plugins/firebase.ts
+++ b/src/plugins/firebase.ts
@@ -0,0 +1,201 @@
+import { Plugin, Cordova } from './plugin';
+import { Observable } from 'rxjs/Observable';
+
+/**
+ * @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
+ * ```
+ * import { Firebase } from 'ionic-native';
+ *
+ * Firebase.getToken()
+ *   .then(token => console.log(`The token is ${token}`)) // save the token server-side and use it to push notifications to this device
+ *   .catch(error => console.error('Error getting token', error));
+ *
+ * Firebase.onTokenRefresh()
+ *   .subscribe((token: string) => console.log(`Got a new token ${token}`));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Firebase',
+  plugin: 'cordova-plugin-firebase',
+  pluginRef: 'FirebasePlugin',
+  repo: 'https://github.com/arnesson/cordova-plugin-firebase',
+  platforms: ['Android', 'iOS']
+})
+export class Firebase {
+
+  /**
+   * Get the device token
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static getToken(): Promise<any> { return; }
+
+  /**
+   * Get notified when a token is refreshed
+   * @return {Observable<any>}
+   */
+  @Cordova({
+    observable: true
+  })
+  static onTokenRefresh(): Observable<any> { return; }
+
+  /**
+   * Get notified when the user opens a notification
+   * @return {Observable<any>}
+   */
+  @Cordova({
+    observable: true
+  })
+  static onNotificationOpen(): Observable<any> { return; }
+
+  /**
+   * Grant permission to recieve push notifications
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['iOS']
+  })
+  static grantPermission(): Promise<any> { return; }
+
+  /**
+   * Set icon badge number. Set to 0 to clear the badge.
+   * @param badgeNumber {number}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static setBadgeNumber(badgeNumber: number): Promise<any> { return; }
+
+  /**
+   * Get icon badge number
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static getBadgeNumber(): Promise<any> { return; }
+
+  /**
+   * Subscribe to a topic
+   * @param topic {string}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static subscribe(topic: string): Promise<any> { return; }
+
+  /**
+   * Unsubscribe from a topic
+   * @param topic {string}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static unsubscribe(topic: string): Promise<any> { return; }
+
+  /**
+   * Log an event using Analytics
+   * @param type {string}
+   * @param data {Object}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static logEvent(type: string, data: any): Promise<any> { return; }
+
+  /**
+   * Set a user id for use in Analytics
+   * @param userId {string}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static setUserId(userId: string): Promise<any> { return; }
+
+  /**
+   * Set a user property for use in Analytics
+   * @param name {string}
+   * @param value {string}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static setUserProperty(name: string, value: string): Promise<any> { return; }
+
+  /**
+   * Fetch Remote Config parameter values for your app
+   * @param cacheExpirationSeconds
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android'],
+    successIndex: 1,
+    errorIndex: 2
+  })
+  static fetch(cacheExpirationSeconds?: number): Promise<any> { return; }
+
+  /**
+   * Activate the Remote Config fetched config
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  static activateFetched(): Promise<any> { return; }
+
+  /**
+   * Retrieve a Remote Config value
+   * @param key {string}
+   * @param namespace {string}
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android'],
+    successIndex: 2,
+    errorIndex: 3
+  })
+  static getValue(key: string, namespace?: string): Promise<any> { return; }
+
+  /**
+   * Retrieve a Remote Config byte array
+   * @param key {string}
+   * @param namespace {string}
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android'],
+    successIndex: 2,
+    errorIndex: 3
+  })
+  static getByteArray(key: string, namespace?: string): Promise<any> { return; }
+
+  /**
+   * Get the current state of the FirebaseRemoteConfig singleton object
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  static getInfo(): Promise<any> { return; }
+
+  /**
+   * Change the settings for the FirebaseRemoteConfig object's operations
+   * @param settings {Object}
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  static setConfigSettings(settings: any): Promise<any> { return; }
+
+  /**
+   * Set defaults in the Remote Config
+   * @param defaults {Object}
+   * @param namespace {string}
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android'],
+    successIndex: 2,
+    errorIndex: 3
+  })
+  static setDefaults(defaults: any, namespace: string): Promise<any> { return; }
+
+}
--- a/src/plugins/flashlight.ts
+++ b/src/plugins/flashlight.ts
@@ -1,6 +1,5 @@
 import { Cordova, Plugin } from './plugin';

-
 /**
 * @name Flashlight
 * @description This plugin allows you to switch the flashlight / torch of the device on and off.
--- a/src/plugins/geofence.ts
+++ b/src/plugins/geofence.ts
@@ -1,5 +1,8 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';
+
+declare var window: any;
+
 /**
 * @name Geofence
 * @description Monitors circular geofences around latitude/longitude coordinates, and sends a notification to the user when the boundary of a geofence is crossed. Notifications can be sent when the user enters and/or exits a geofence.
@@ -71,8 +74,6 @@ import { Observable } from 'rxjs/Observable';
 * Try running `ionic platform rm <platform>` then run `ionic platform add <platform>` to recreate the
 * platform directories.
 */
-declare var window: any;
-
@Plugin({
  pluginName: 'Geofence',
  plugin: 'cordova-plugin-geofence',
--- a/src/plugins/geolocation.ts
+++ b/src/plugins/geolocation.ts
@@ -1,10 +1,10 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
 declare var navigator: any;

 export interface Coordinates {
+
  /**
   * a double representing the position's latitude in decimal degrees.
   */
@@ -48,6 +48,7 @@ export interface Coordinates {
   * This value can be null.
   */
  speed: number;
+
 }

 export interface Geoposition {
@@ -63,6 +64,7 @@ export interface Geoposition {
 }

 export interface PositionError {
+
  /**
   * A code that indicates the error that occurred
   */
@@ -72,9 +74,11 @@ export interface PositionError {
   * A message that can describe the error that occurred
   */
   message: string;
+
 }

 export interface GeolocationOptions {
+
  /**
   * Is a positive long value indicating the maximum age in milliseconds of a
   * possible cached position that is acceptable to return. If set to 0, it
@@ -102,8 +106,8 @@ export interface GeolocationOptions {
   * @type {boolean}
   */
  enableHighAccuracy?: boolean;
-}

+}

 /**
 * @name Geolocation
@@ -145,6 +149,7 @@ export interface GeolocationOptions {
  repo: 'https://github.com/apache/cordova-plugin-geolocation'
 })
 export class Geolocation {
+
  /**
   * Get the device's current position.
   *
@@ -182,4 +187,5 @@ export class Geolocation {
      }
    );
  }
+
 }
--- a/src/plugins/globalization.ts
+++ b/src/plugins/globalization.ts
@@ -14,7 +14,8 @@ import { Cordova, Plugin } from './plugin';
  pluginName: 'Globalization',
  plugin: 'cordova-plugin-globalization',
  pluginRef: 'navigator.globalization',
-  repo: 'https://github.com/apache/cordova-plugin-globalization'
+  repo: 'https://github.com/apache/cordova-plugin-globalization',
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Firefox OS', 'iOS', 'Windows Phone 8', 'Widnows', 'Browser']
 })
 export class Globalization {

--- a/src/plugins/google-plus.ts
+++ b/src/plugins/google-plus.ts
@@ -1,6 +1,5 @@
 import { Cordova, Plugin } from './plugin';

-
 /**
 * @name Google Plus
 * @description
@@ -8,6 +7,9 @@ import { Cordova, Plugin } from './plugin';
 * ```typescript
 * import { GooglePlus } from 'ionic-native';
 *
+ * GooglePlus.login()
+ *   .then(res => console.log(res))
+ *   .catch(err => console.error(err));
 *
 * ```
 */
@@ -21,34 +23,37 @@ import { Cordova, Plugin } from './plugin';
 })
 export class GooglePlus {

-    /**
-     * The login function walks the user through the Google Auth process.
-     * @param options
-     * @returns {Promise<any>}
-     */
-    @Cordova()
-    static login(options?: any): Promise<any> { return; }
+  /**
+   * The login function walks the user through the Google Auth process.
+   * @param options
+   * @returns {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  static login(options?: any): Promise<any> { return; }

-    /**
-     * You can call trySilentLogin to check if they're already signed in to the app and sign them in silently if they are.
-     * @param options
-     * @returns {Promise<any>}
-     */
-    @Cordova()
-    static trySilentLogin(options?: any): Promise<any> { return; }
+  /**
+   * You can call trySilentLogin to check if they're already signed in to the app and sign them in silently if they are.
+   * @param options
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  static trySilentLogin(options?: any): Promise<any> { return; }

-    /**
-     * This will clear the OAuth2 token.
-     * @returns {Promise<any>}
-     */
-    @Cordova()
-    static logout(): Promise<any> { return; }
+  /**
+   * This will clear the OAuth2 token.
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  static logout(): Promise<any> { return; }

-    /**
-     * This will clear the OAuth2 token, forget which account was used to login, and disconnect that account from the app. This will require the user to allow the app access again next time they sign in. Be aware that this effect is not always instantaneous. It can take time to completely disconnect.
-     * @returns {Promise<any>}
-     */
-    @Cordova()
-    static disconnect(): Promise<any> { return; }
+  /**
+   * This will clear the OAuth2 token, forget which account was used to login, and disconnect that account from the app. This will require the user to allow the app access again next time they sign in. Be aware that this effect is not always instantaneous. It can take time to completely disconnect.
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  static disconnect(): Promise<any> { return; }

 }
--- a/src/plugins/googleanalytics.ts
+++ b/src/plugins/googleanalytics.ts
@@ -1,6 +1,5 @@
 import { Cordova, Plugin } from './plugin';

-
 declare var window;

 /**
@@ -11,6 +10,20 @@ declare var window;
 * - A Cordova 3.0+ project for iOS and/or Android
 * - A Mobile App property through the Google Analytics Admin Console
 * - (Android) Google Play Services SDK installed via [Android SDK Manager](https://developer.android.com/sdk/installing/adding-packages.html)
+ * @usage
+ * ```typescript
+ * import { GoogleAnalytics } from 'ionic-native';
+ *
+ * GoogleAnalytics.startTrackerWithId('YOUR_TRACKER_ID')
+ *    .then(() => {
+ *      console.log('Google analytics is ready now');
+ *      // Tracker is ready
+ *      // You can now track pages or set additional information such as AppVersion or UserId
+ *    })
+ *    .catch(e => console.log('Error starting GoogleAnalytics', e));
+ *
+ *
+ * ```
 */
@Plugin({
  pluginName: 'GoogleAnalytics',
@@ -20,6 +33,7 @@ declare var window;
  platforms: ['Android', 'iOS', 'Browser']
 })
 export class GoogleAnalytics {
+
  /**
   * In your 'deviceready' handler, set up your Analytics tracker.
   * https://developers.google.com/analytics/devguides/collection/analyticsjs/
@@ -27,7 +41,10 @@ export class GoogleAnalytics {
   * @param {number} interval Optional dispatch period in seconds. Defaults to 30.
   * @returns {Promise<any>}
   */
-  @Cordova()
+  @Cordova({
+    successIndex: 2,
+    errorIndex: 3
+  })
  static startTrackerWithId(id: string, interval?: number): Promise<any> { return; }

  /**
@@ -187,4 +204,5 @@ export class GoogleAnalytics {
   */
  @Cordova()
  static enableUncaughtExceptionReporting(shouldEnable: boolean): Promise<any> { return; }
+
 }
--- a/src/plugins/googlemap.ts
+++ b/src/plugins/googlemap.ts
@@ -60,8 +60,9 @@ export const GoogleMapsAnimation = {
 *
 * loadMap() {
 *  // make sure to create following structure in your view.html file
+ *  // and add a height (for example 100%) to it, else the map won't be visible
 *  // <ion-content>
- *  //  <div #map id="map"></div>
+ *  //  <div #map id="map" style="height:100%;"></div>
 *  // </ion-content>
 *
 *  // create a new map by passing HTMLElement
@@ -118,7 +119,7 @@ export class GoogleMap {
  @Cordova()
  static isAvailable(): Promise<boolean> { return; }

-  constructor(element: string|HTMLElement, options?: any) {
+  constructor(element: string | HTMLElement, options?: any) {
    if (!!getPlugin('plugin.google.maps.Map')) {
      if (typeof element === 'string') {
        element = document.getElementById(<string>element);
@@ -132,12 +133,55 @@ export class GoogleMap {
    }
  }

+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
+    return new Observable(
+      (observer) => {
+        this._objectInstance.addEventListener(event, observer.next.bind(observer));
+        return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
+      }
+    );
+  }
+
+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({ sync: true })
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({ sync: true })
+  set(key: string, value: any): void { }
+
  /**
   * Listen to a map event.
   *
   * @returns {Observable<any>}
   */
-  on(event: any): Observable<any> {
+  on(eventName: string): Observable<any> {
    if (!this._objectInstance) {
      return new Observable((observer) => {
        observer.error({ error: 'plugin_not_installed' });
@@ -146,7 +190,7 @@ export class GoogleMap {

    return new Observable(
      (observer) => {
-        this._objectInstance.on(event, observer.next.bind(observer));
+        this._objectInstance.on(eventName, observer.next.bind(observer));
        return () => this._objectInstance.off(event);
      }
    );
@@ -157,15 +201,21 @@ export class GoogleMap {
   *
   * @returns {Promise<any>}
   */
-  one(event: any): Promise<any> {
+  one(eventName: string): Promise<any> {
    if (!this._objectInstance) {
      return Promise.reject({ error: 'plugin_not_installed' });
    }
    return new Promise<any>(
-      resolve => this._objectInstance.one(event, resolve)
+      resolve => this._objectInstance.one(eventName, resolve)
    );
  }

+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
  @CordovaInstance({ sync: true })
  setDebuggable(isDebuggable: boolean): void { }

@@ -481,18 +531,80 @@ export interface VisibleRegion {
 * @private
 */
 export interface GoogleMapsMarkerOptions {
+  /**
+   * The icon image url or properties. Also you can specify HTML Color values. Alternatively you can specify the image as Base64
+   */
  icon?: any;
+
+  /**
+   * The content of the infoWindow.
+   */
  title?: string;
+
+  /**
+   * The snippet of the infoWindow.
+   */
  snippet?: string;
+
+  /**
+   * The position of the marker.
+   */
  position?: GoogleMapsLatLng;
+
+  /**
+   * 	Specify the anchor of the InfoWindow
+   */
  infoWindowAnchor?: number[];
+
+  /**
+   * Set true if you want to enable to drag the marker. (Default: false) Important! Drag starts after long pressed on the marker.
+   */
  draggable?: boolean;
+
+  /**
+   * 	Set true if you want to use a flat marker. (Default: false)
+   */
  flat?: boolean;
+
+  /**
+   * 	Set rotation angle. (Default: 0)
+   */
  rotation?: number;
+
+  /**
+   * Set false if you want to hide. (Default: true)
+   */
  visible?: boolean;
+
+  /**
+   * Specify the options for title.
+   */
  styles?: any;
+
+  /**
+   * Which animation to play when marker is added to a map.
+   */
  animation?: string;
+
+  /**
+   * 	iOS only, Plugin Version >= 1.3.3 Higher zIndex value overlays will be drawn on top of lower zIndex value tile layers and overlays. (You're able to run this on Android, but it will have no effect)
+   */
  zIndex?: number;
+
+  /**
+   * Set to true to disable auto panning when the marker is clicked.
+   */
+  disableAutoPan?: boolean;
+
+  /**
+   * Function to be invoked when the user clicks on the marker
+   */
+  markerClick?: Function;
+
+  /**
+   * Function to be invoked when the user clicks on the info box
+   */
+  infoClick?: Function;
 }

 /**
@@ -513,7 +625,12 @@ export class GoogleMapsMarker {

  constructor(private _objectInstance: any) { }

-  addEventListener(event: any): Observable<any> {
+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
    return new Observable(
      (observer) => {
        this._objectInstance.addEventListener(event, observer.next.bind(observer));
@@ -522,11 +639,25 @@ export class GoogleMapsMarker {
    );
  }

+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
  /**
   * Gets a value
   * @param key
   */
-  @CordovaInstance({sync: true})
+  @CordovaInstance({ sync: true })
  get(key: string): any { return; }

  /**
@@ -534,81 +665,221 @@ export class GoogleMapsMarker {
   * @param key
   * @param value
   */
-  @CordovaInstance({sync: true})
+  @CordovaInstance({ sync: true })
  set(key: string, value: any): void { }

+  /**
+   * Listen to a map event.
+   *
+   * @returns {Observable<any>}
+   */
+  on(eventName: string): Observable<any> {
+    if (!this._objectInstance) {
+      return new Observable((observer) => {
+        observer.error({ error: 'plugin_not_installed' });
+      });
+    }
+
+    return new Observable(
+      (observer) => {
+        this._objectInstance.on(eventName, observer.next.bind(observer));
+        return () => this._objectInstance.off(event);
+      }
+    );
+  }
+
+  /**
+   * Listen to a map event only once.
+   *
+   * @returns {Promise<any>}
+   */
+  one(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.one(eventName, resolve)
+    );
+  }
+
+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
+  /**
+   * Return true if the marker is visible
+   */
  @CordovaInstance({ sync: true })
  isVisible(): boolean { return; }

+  /**
+   * Set false if you want to hide the marker.
+   * @param visible
+   */
  @CordovaInstance()
  setVisible(visible: boolean): void { }

+  /**
+   * Return the marker hash code.
+   * @return {string} Marker hash code
+   */
  @CordovaInstance({ sync: true })
  getHashCode(): string { return; }

+  /**
+   * Remove the marker completely.
+   */
  @CordovaInstance({ sync: true })
  remove(): void { }

+  /**
+   * Change the marker opacity.
+   * @param alpha {number} Opacity
+   */
  @CordovaInstance({ sync: true })
  setOpacity(alpha: number): void { }

+  /**
+   * Return the marker opacity.
+   * @return {number} Opacity
+   */
  @CordovaInstance({ sync: true })
  getOpacity(): number { return; }

+  /**
+   * iOS only, Plugin Version >= 1.3.3 Higher zIndex value overlays will be drawn on top of lower zIndex value tile layers and overlays. (You're able to run this on Android, but it will have no effect)
+   * @return {number}
+   */
  @CordovaInstance({ sync: true })
-  setZIndex(): void { }
+  setZIndex(): number { return; }

+  /**
+   * Change the info window anchor. This defaults to 50% from the left of the image and at the bottom of the image.
+   * @param x {number}
+   * @param y {number}
+   */
  @CordovaInstance({ sync: true })
  setIconAnchor(x: number, y: number): void { }

+  /**
+   * Change the info window anchor. This defaults to 50% from the left of the image and at the top of the image.
+   * @param x {number}
+   * @param y {number}
+   */
  @CordovaInstance({ sync: true })
  setInfoWindowAnchor(x: number, y: number): void { }

+  /**
+   * 	Set true if you allows all users to drag the marker.
+   * @param draggable {boolean}
+   */
  @CordovaInstance({ sync: true })
  setDraggable(draggable: boolean): void { }

+  /**
+   * Return true if the marker drag is enabled.
+   * @return {boolean}
+   */
  @CordovaInstance({ sync: true })
  isDraggable(): boolean { return; }

+  /**
+   * Set true if you want to be flat marker.
+   * @param flat {boolean}
+   */
  @CordovaInstance({ sync: true })
  setFlat(flat: boolean): void { return; }

+  /**
+   * Change icon url and/or size
+   * @param icon
+   */
  @CordovaInstance({ sync: true })
  setIcon(icon: GoogleMapsMarkerIcon): void { return; }

+  /**
+   * Change title of the infoWindow.
+   * @param title {string}
+   */
  @CordovaInstance({ sync: true })
  setTitle(title: string): void { }

+  /**
+   * Return the title strings.
+   * @return {string}
+   */
  @CordovaInstance({ sync: true })
  getTitle(): string { return; }

+  /**
+   * Change snippet of the infoWindow.
+   * @param snippet {string}
+   */
  @CordovaInstance({ sync: true })
  setSnippet(snippet: string): void { }

+  /**
+   * Return the snippet strings.
+   * @return {string}
+   */
  @CordovaInstance({ sync: true })
  getSnippet(): string { return; }

+  /**
+   * Set the marker rotation angle.
+   * @param rotation {number}
+   */
  @CordovaInstance({ sync: true })
  setRotation(rotation: number): void { }

+  /**
+   * Return the marker rotation angle.
+   * @return {number}
+   */
  @CordovaInstance({ sync: true })
  getRotation(): number { return; }

+  /**
+   * Show the infoWindow of the marker.
+   * @return {number}
+   */
  @CordovaInstance({ sync: true })
  showInfoWindow(): number { return; }

+  /**
+   * Hide the infoWindow of the marker.
+   * @return {number}
+   */
  @CordovaInstance({ sync: true })
  hideInfoWindow(): number { return; }

+  /**
+   * Set the marker position.
+   * @param latLng {GoogleMapLatLng}
+   */
  @CordovaInstance({ sync: true })
  setPosition(latLng: GoogleMapsLatLng): void { return; }

+  /**
+   * Return the marker position.
+   * @return {Promise<GoogleMapLatLng>}
+   */
  @CordovaInstance()
  getPosition(): Promise<GoogleMapsLatLng> { return; }

+  /**
+   * Return the map instance.
+   * @return {GoogleMap}
+   */
  @CordovaInstance({ sync: true })
  getMap(): GoogleMap { return; }

+  /**
+   * Specify the animation either `DROP` or `BOUNCE`
+   * @param animation {string}
+   */
  @CordovaInstance({ sync: true })
  setAnimation(animation: string): void { }

@@ -634,7 +905,12 @@ export class GoogleMapsCircle {

  constructor(private _objectInstance: any) { }

-  addEventListener(event: any): Observable<any> {
+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
    return new Observable(
      (observer) => {
        this._objectInstance.addEventListener(event, observer.next.bind(observer));
@@ -643,6 +919,75 @@ export class GoogleMapsCircle {
    );
  }

+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({ sync: true })
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({ sync: true })
+  set(key: string, value: any): void { }
+
+  /**
+   * Listen to a map event.
+   *
+   * @returns {Observable<any>}
+   */
+  on(eventName: string): Observable<any> {
+    if (!this._objectInstance) {
+      return new Observable((observer) => {
+        observer.error({ error: 'plugin_not_installed' });
+      });
+    }
+
+    return new Observable(
+      (observer) => {
+        this._objectInstance.on(eventName, observer.next.bind(observer));
+        return () => this._objectInstance.off(event);
+      }
+    );
+  }
+
+  /**
+   * Listen to a map event only once.
+   *
+   * @returns {Promise<any>}
+   */
+  one(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.one(eventName, resolve)
+    );
+  }
+
+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
  @CordovaInstance({ sync: true })
  getCenter(): GoogleMapsLatLng { return; }

@@ -704,7 +1049,12 @@ export interface GoogleMapsPolylineOptions {
 export class GoogleMapsPolyline {
  constructor(private _objectInstance: any) { }

-  addEventListener(event: any): Observable<any> {
+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
    return new Observable(
      (observer) => {
        this._objectInstance.addEventListener(event, observer.next.bind(observer));
@@ -713,6 +1063,75 @@ export class GoogleMapsPolyline {
    );
  }

+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({ sync: true })
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({ sync: true })
+  set(key: string, value: any): void { }
+
+  /**
+   * Listen to a map event.
+   *
+   * @returns {Observable<any>}
+   */
+  on(eventName: string): Observable<any> {
+    if (!this._objectInstance) {
+      return new Observable((observer) => {
+        observer.error({ error: 'plugin_not_installed' });
+      });
+    }
+
+    return new Observable(
+      (observer) => {
+        this._objectInstance.on(eventName, observer.next.bind(observer));
+        return () => this._objectInstance.off(event);
+      }
+    );
+  }
+
+  /**
+   * Listen to a map event only once.
+   *
+   * @returns {Promise<any>}
+   */
+  one(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.one(eventName, resolve)
+    );
+  }
+
+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
  @CordovaInstance({ sync: true })
  getPoints(): Array<GoogleMapsLatLng> { return; }

@@ -775,7 +1194,12 @@ export class GoogleMapsPolygon {

  constructor(private _objectInstance: any) { }

-  addEventListener(event: any): Observable<any> {
+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
    return new Observable(
      (observer) => {
        this._objectInstance.addEventListener(event, observer.next.bind(observer));
@@ -784,6 +1208,75 @@ export class GoogleMapsPolygon {
    );
  }

+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({ sync: true })
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({ sync: true })
+  set(key: string, value: any): void { }
+
+  /**
+   * Listen to a map event.
+   *
+   * @returns {Observable<any>}
+   */
+  on(eventName: string): Observable<any> {
+    if (!this._objectInstance) {
+      return new Observable((observer) => {
+        observer.error({ error: 'plugin_not_installed' });
+      });
+    }
+
+    return new Observable(
+      (observer) => {
+        this._objectInstance.on(eventName, observer.next.bind(observer));
+        return () => this._objectInstance.off(event);
+      }
+    );
+  }
+
+  /**
+   * Listen to a map event only once.
+   *
+   * @returns {Promise<any>}
+   */
+  one(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.one(eventName, resolve)
+    );
+  }
+
+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
  @CordovaInstance({ sync: true })
  getPoints(): Array<GoogleMapsLatLng> { return; }

@@ -848,6 +1341,89 @@ export class GoogleMapsTileOverlay {

  constructor(private _objectInstance: any) { }

+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
+    return new Observable(
+      (observer) => {
+        this._objectInstance.addEventListener(event, observer.next.bind(observer));
+        return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
+      }
+    );
+  }
+
+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({ sync: true })
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({ sync: true })
+  set(key: string, value: any): void { }
+
+  /**
+   * Listen to a map event.
+   *
+   * @returns {Observable<any>}
+   */
+  on(eventName: string): Observable<any> {
+    if (!this._objectInstance) {
+      return new Observable((observer) => {
+        observer.error({ error: 'plugin_not_installed' });
+      });
+    }
+
+    return new Observable(
+      (observer) => {
+        this._objectInstance.on(eventName, observer.next.bind(observer));
+        return () => this._objectInstance.off(event);
+      }
+    );
+  }
+
+  /**
+   * Listen to a map event only once.
+   *
+   * @returns {Promise<any>}
+   */
+  one(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.one(eventName, resolve)
+    );
+  }
+
+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
  @CordovaInstance({ sync: true })
  getVisible(): boolean { return; }

@@ -899,6 +1475,89 @@ export class GoogleMapsGroundOverlay {

  constructor(private _objectInstance: any) { }

+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
+    return new Observable(
+      (observer) => {
+        this._objectInstance.addEventListener(event, observer.next.bind(observer));
+        return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
+      }
+    );
+  }
+
+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({ sync: true })
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({ sync: true })
+  set(key: string, value: any): void { }
+
+  /**
+   * Listen to a map event.
+   *
+   * @returns {Observable<any>}
+   */
+  on(eventName: string): Observable<any> {
+    if (!this._objectInstance) {
+      return new Observable((observer) => {
+        observer.error({ error: 'plugin_not_installed' });
+      });
+    }
+
+    return new Observable(
+      (observer) => {
+        this._objectInstance.on(eventName, observer.next.bind(observer));
+        return () => this._objectInstance.off(event);
+      }
+    );
+  }
+
+  /**
+   * Listen to a map event only once.
+   *
+   * @returns {Promise<any>}
+   */
+  one(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.one(eventName, resolve)
+    );
+  }
+
+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
  @CordovaInstance({ sync: true })
  setBearing(bearing: number): void { }

@@ -941,6 +1600,89 @@ export class GoogleMapsKmlOverlay {

  constructor(private _objectInstance: any) { }

+  /**
+   * Adds an event listener.
+   *
+   * @returns {Observable<any>}
+   */
+  addEventListener(eventName: string): Observable<any> {
+    return new Observable(
+      (observer) => {
+        this._objectInstance.addEventListener(event, observer.next.bind(observer));
+        return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
+      }
+    );
+  }
+
+  /**
+   * Adds an event listener that works once.
+   *
+   * @returns {Promise<any>}
+   */
+  addListenerOnce(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.addListenerOnce(eventName, resolve)
+    );
+  }
+
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({ sync: true })
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({ sync: true })
+  set(key: string, value: any): void { }
+
+  /**
+   * Listen to a map event.
+   *
+   * @returns {Observable<any>}
+   */
+  on(eventName: string): Observable<any> {
+    if (!this._objectInstance) {
+      return new Observable((observer) => {
+        observer.error({ error: 'plugin_not_installed' });
+      });
+    }
+
+    return new Observable(
+      (observer) => {
+        this._objectInstance.on(eventName, observer.next.bind(observer));
+        return () => this._objectInstance.off(event);
+      }
+    );
+  }
+
+  /**
+   * Listen to a map event only once.
+   *
+   * @returns {Promise<any>}
+   */
+  one(eventName: string): Promise<any> {
+    if (!this._objectInstance) {
+      return Promise.reject({ error: 'plugin_not_installed' });
+    }
+    return new Promise<any>(
+      resolve => this._objectInstance.one(eventName, resolve)
+    );
+  }
+
+  /**
+   * Clears all stored values
+   */
+  @CordovaInstance({ sync: true })
+  empty(): void { }
+
  @CordovaInstance({ sync: true })
  remove(): void { }

@@ -954,9 +1696,9 @@ export class GoogleMapsKmlOverlay {
 export class GoogleMapsLatLngBounds {
  private _objectInstance: any;

-  @InstanceProperty get northeast(): GoogleMapsLatLng { return; }
-  @InstanceProperty get southwest(): GoogleMapsLatLng { return; }
-  @InstanceProperty get type(): string { return; }
+  @InstanceProperty northeast: GoogleMapsLatLng;
+  @InstanceProperty southwest: GoogleMapsLatLng;
+  @InstanceProperty type: string;

  constructor(southwestOrArrayOfLatLng: GoogleMapsLatLng | GoogleMapsLatLng[], northeast?: GoogleMapsLatLng) {
    let args = !!northeast ? [southwestOrArrayOfLatLng, northeast] : southwestOrArrayOfLatLng;
--- a/src/plugins/headercolor.ts
+++ b/src/plugins/headercolor.ts
@@ -0,0 +1,36 @@
+import { Plugin, Cordova } from './plugin';
+
+/**
+ * @name Headerolor
+ * @description
+ * Cordova plugin to change color of header in multitask view
+ *
+ * @usage
+ * ```typescript
+ * import { HeaderColor } from 'ionic-native';
+ *
+ * HeaderColor.tint("#becb29");
+ * ```
+ */
+@Plugin({
+  pluginName: 'HeaderColor',
+  plugin: 'cordova-plugin-headercolor',
+  pluginRef: 'plugins.headerColor',
+  repo: 'https://github.com/tomloprod/cordova-plugin-headercolor',
+  platforms: ['Android']
+})
+export class HeaderColor {
+
+  /**
+   * Set a color to the task header
+   * @param color {string} The hex value of the color
+   * @returns {Promise<any>}
+   */
+  @Cordova({
+    callbackStyle: 'object',
+    successName: 'success',
+    errorName: 'failure'
+  })
+  static tint(color: string): Promise<any> { return; }
+
+}
--- a/src/plugins/hotspot.ts
+++ b/src/plugins/hotspot.ts
@@ -1,6 +1,109 @@
 import { Cordova, Plugin } from './plugin';

+export interface HotspotConnectionInfo {
+
+  /**
+   *      The service set identifier (SSID) of the current 802.11 network.
+   */
+  SSID: string;
+
+  /**
+   *      The basic service set identifier (BSSID) of the current access point.
+   */
+  BSSID: string;
+
+  /**
+   *      The current link speed in Mbps
+   */
+  linkSpeed: string;
+
+  /**
+   *      The IP Address
+   */
+  IPAddress: string;
+
+  /**
+   *      Each configured network has a unique small integer ID, used to identify the network when performing operations on the supplicant.
+   */
+  networkID: string;
+
+}
+
+export interface HotspotNetwork {
+
+  /**
+   *      Human readable network name
+   */
+  SSID: string;
+
+  /**
+   *      MAC Address of the access point
+   */
+  BSSID: string;
+
+  /**
+   *      The primary 20 MHz frequency (in MHz) of the channel over which the client is communicating with the access point.
+   */
+  frequency: number;
+
+  /**
+   *      The detected signal level in dBm, also known as the RSSI.
+   */
+  level: number;
+
+  /**
+   *      Timestamp in microseconds (since boot) when this result was last seen.
+   */
+  timestamp: number;
+
+  /**
+   *      Describes the authentication, key management, and encryption schemes supported by the access point.
+   */
+  capabilities: string;
+
+}
+export interface HotspotNetworkConfig {
+
+  /**
+   *   Device IP Address
+   */
+  deviceIPAddress: string;
+
+  /**
+   *   Device MAC Address
+   */
+  deviceMacAddress: string;
+
+  /**
+   *   Gateway IP Address
+   */
+  gatewayIPAddress: string;
+
+  /**
+   *   Gateway MAC Address
+   */
+  gatewayMacAddress: string;
+
+}
+
+export interface HotspotDevice {
+
+  /**
+   *   ip
+   *      Hotspot IP Address
+   */
+  ip: string;
+
+  /**
+   *   mac
+   *      Hotspot MAC Address
+   */
+  mac: string;
+
+}
+
 /**
+ * @beta
 * @name Hotspot
 * @description
 * @usage
@@ -13,6 +116,11 @@ import { Cordova, Plugin } from './plugin';
 * });
 *
 * ```
+ * @interfaces
+ * HotspotConnectionInfo
+ * HotspotNetwork
+ * HotspotNetworkConfig
+ * HotspotDevice
 */
@Plugin({
  pluginName: 'Hotspot',
@@ -210,10 +318,10 @@ export class Hotspot {
  static getNetConfig(): Promise<HotspotNetworkConfig> { return; }

  /**
-   * @returns {Promise<ConnectionInfo>}
+   * @returns {Promise<HotspotConnectionInfo>}
   */
  @Cordova()
-  static getConnectionInfo(): Promise<ConnectionInfo> { return; }
+  static getConnectionInfo(): Promise<HotspotConnectionInfo> { return; }

  /**
   * @returns {Promise<string>}
@@ -260,94 +368,3 @@ export class Hotspot {
  static isRooted(): Promise<boolean> { return; }

 }
-
-export interface ConnectionInfo {
-  /**
-   *   SSID
-   *      The service set identifier (SSID) of the current 802.11 network.
-   */
-  SSID: string;
-  /**
-   *   BSSID
-   *      The basic service set identifier (BSSID) of the current access point.
-   */
-  BSSID: string;
-  /**
-   *   linkSpeed
-   *      The current link speed in Mbps
-   */
-  linkSpeed: string;
-  /**
-   *   IPAddress
-   *      The IP Address
-   */
-  IPAddress: string;
-  /**
-   *   networkID
-   *      Each configured network has a unique small integer ID, used to identify the network when performing operations on the supplicant.
-   */
-  networkID: string;
-}
-
-export interface HotspotNetwork {
-  /**
-   *       SSID
-   *      Human readable network name
-   */
-  SSID: string;
-  /**
-   *       BSSID
-   *      MAC Address of the access point
-   */
-  BSSID: string;
-  /**
-   * frequency
-   *      The primary 20 MHz frequency (in MHz) of the channel over which the client is communicating with the access point.
-   */
-  frequency: number;
-  /**
-   *       level
-   *      The detected signal level in dBm, also known as the RSSI.
-   */
-  level: number;
-  /**
-   *       timestamp
-   *      Timestamp in microseconds (since boot) when this result was last seen.
-   */
-  timestamp: number;
-  /**
-   *       capabilities
-   *      Describes the authentication, key management, and encryption schemes supported by the access point.
-   */
-  capabilities: string;
-}
-export interface HotspotNetworkConfig {
-  /**
-   *   deviceIPAddress - Device IP Address
-   */
-  deviceIPAddress: string;
-  /**
-   *   deviceMacAddress - Device MAC Address
-   */
-  deviceMacAddress: string;
-  /**
-   *   gatewayIPAddress - Gateway IP Address
-   */
-  gatewayIPAddress: string;
-  /**
-   *   gatewayMacAddress - Gateway MAC Address
-   */
-  gatewayMacAddress: string;
-}
-export interface HotspotDevice {
-  /**
-   *   ip
-   *      Hotspot IP Address
-   */
-  ip: string;
-  /**
-   *   mac
-   *      Hotspot MAC Address
-   */
-  mac: string;
-}
--- a/src/plugins/http.ts
+++ b/src/plugins/http.ts
@@ -1,4 +1,24 @@
 import { Plugin, Cordova } from './plugin';
+
+export interface HTTPResponse {
+  /**
+   * The status number of the response
+   */
+  status: number;
+  /**
+   * The data that is in the response. This property usually exists when a promise returned by a request method resolves.
+   */
+  data?: any;
+  /**
+   * The headers of the response
+   */
+  headers: any;
+  /**
+   * Error response from the server. This property usually exists when a promise returned by a request method rejects.
+   */
+  error?: string;
+}
+
 /**
 * @name HTTP
 * @description
@@ -137,22 +157,3 @@ export class HTTP {
  @Cordova()
  static downloadFile(url: string, body: any, headers: any, filePath: string): Promise<HTTPResponse> { return; }
 }
-
-export interface HTTPResponse {
-  /**
-   * The status number of the response
-   */
-  status: number;
-  /**
-   * The data that is in the response. This property usually exists when a promise returned by a request method resolves.
-   */
-  data?: any;
-  /**
-   * The headers of the response
-   */
-  headers: any;
-  /**
-   * Error response from the server. This property usually exists when a promise returned by a request method rejects.
-   */
-  error?: string;
-}
--- a/src/plugins/httpd.ts
+++ b/src/plugins/httpd.ts
@@ -1,6 +1,23 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

+export interface HttpdOptions {
+  /**
+   * The public root directory for your web server. This path is relative to your app's www directory.
+   * Default is current directory.
+   */
+  www_root?: string;
+  /**
+   * The port number to use.
+   * Default is 8888
+   */
+  port?: number;
+  /**
+   * Setting this option to false will allow remote access to your web server (over any IP).
+   * Default is false.
+   */
+  localhost_only?: boolean;
+}

 /**
 * @name Httpd
@@ -21,6 +38,8 @@ import { Observable } from 'rxjs/Observable';
 * });
 *
 * ```
+ * @interfaces
+ * HttpdOptions
 */
@Plugin({
  pluginName: 'Httpd',
@@ -33,15 +52,14 @@ export class Httpd {

  /**
   * Starts a web server.
-   * @returns {Observable<string>} Returns an Observable. Subscribe to receive the URL for your web server (if succeeded). Unsubscribe to stop the server.
   * @param options {HttpdOptions}
-   * @returns {Observable<string>}
+   * @returns {Observable<string>} Returns an Observable. Subscribe to receive the URL for your web server (if succeeded). Unsubscribe to stop the server.
   */
  @Cordova({
    observable: true,
    clearFunction: 'stopServer'
  })
-  static startServer(options?: any): Observable<string> { return; }
+  static startServer(options?: HttpdOptions): Observable<string> { return; }

  /**
   * Gets the URL of the running server
@@ -59,23 +77,3 @@ export class Httpd {

 }

-/**
- * These options are used for the Httpd.startServer() function.
- */
-export interface HttpdOptions {
-  /**
-   * The public root directory for your web server. This path is relative to your app's www directory.
-   * Default is current directory.
-   */
-  www_root?: string;
-  /**
-   * The port number to use.
-   * Default is 8888
-   */
-  port?: number;
-  /**
-   * Setting this option to false will allow remote access to your web server (over any IP).
-   * Default is false.
-   */
-  localhost_only?: boolean;
-}
--- a/src/plugins/ibeacon.ts
+++ b/src/plugins/ibeacon.ts
@@ -1,7 +1,6 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
 declare var cordova: any;

 export interface Beacon {
@@ -103,7 +102,7 @@ export interface CircularRegion {

 export type Region = BeaconRegion | CircularRegion;

-export interface PluginResult {
+export interface IBeaconPluginResult {

  /**
   * The name of the delegate function that produced the PluginResult object.
@@ -136,7 +135,7 @@ export interface PluginResult {
  error: string;
 }

-export interface Delegate {
+export interface IBeaconDelegate {
  /**
   * An observable that publishes information about the location permission authorization status.
   *
@@ -151,9 +150,9 @@ export interface Delegate {
   * This event is called when the phone begins starts monitoring,
   * when requestStateForRegion is called, etc.
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  didDetermineStateForRegion(): Observable<PluginResult>;
+  didDetermineStateForRegion(): Observable<IBeaconPluginResult>;

  /**
   * An Observable that publishes event data to it's subscribers
@@ -163,9 +162,9 @@ export interface Delegate {
   *  will be called even when the app is not running on iOS.
   * The app will run silently in the background for a small amount of time.
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  didEnterRegion(): Observable<PluginResult>;
+  didEnterRegion(): Observable<IBeaconPluginResult>;

  /**
   * An Observable that publishes event data to it's subscribers
@@ -175,51 +174,51 @@ export interface Delegate {
   *  will be called even when the app is not running on iOS.
   * The app will run silently in the background for a small amount of time.
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  didExitRegion(): Observable<PluginResult>;
+  didExitRegion(): Observable<IBeaconPluginResult>;

  /**
   * An Observable that publishes event data to it's subscribers
   *  each time that the device ranges beacons. Modern Android and iOS devices range
   * aproximately once per second.
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  didRangeBeaconsInRegion(): Observable<PluginResult>;
+  didRangeBeaconsInRegion(): Observable<IBeaconPluginResult>;

  /**
   * An Observable that publishes event data to it's subscribers
   *  when the device begins monitoring a region.
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  didStartMonitoringForRegion(): Observable<PluginResult>;
+  didStartMonitoringForRegion(): Observable<IBeaconPluginResult>;

  /**
   * An Observable that publishes event data to it's subscribers
   *  when the device fails to monitor a region.
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  monitoringDidFailForRegionWithError(): Observable<PluginResult>;
+  monitoringDidFailForRegionWithError(): Observable<IBeaconPluginResult>;

  /**
   * An Observable that publishes event data to it's subscribers
   *  when the device begins advertising as an iBeacon.
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  peripheralManagerDidStartAdvertising(): Observable<PluginResult>;
+  peripheralManagerDidStartAdvertising(): Observable<IBeaconPluginResult>;

  /**
   * An Observable that publishes event data to it's subscribers
   * when the state of the peripheral manager's state updates.
   *
   *
-   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<IBeaconPluginResult>} Returns a IBeaconPluginResult object with information about the event, region, and beacon(s).
   */
-  peripheralManagerDidUpdateState(): Observable<PluginResult>;
+  peripheralManagerDidUpdateState(): Observable<IBeaconPluginResult>;
 }

 /**
@@ -266,6 +265,13 @@ export interface Delegate {
 *     error => console.error('Native layer failed to begin monitoring: ', error)
 *   );
 * ```
+ * @interfaces
+ * Beacon
+ * BeaconRegion
+ * CircularRegion
+ * IBeaconPluginResult
+ * IBeaconDelegate
+ *
 */
@Plugin({
  pluginName: 'IBeacon',
@@ -280,87 +286,87 @@ export class IBeacon {
   * Instances of this class are delegates between the {@link LocationManager} and
   * the code that consumes the messages generated on in the native layer.
   *
-   * @returns {Delegate} An instance of the type {@type Delegate}.
+   * @returns {IBeaconDelegate} An instance of the type {@type Delegate}.
   */
-  static Delegate(): Delegate {
+  static Delegate(): IBeaconDelegate {
    let delegate = new cordova.plugins.locationManager.Delegate();

-    delegate.didChangeAuthorizationStatus = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.didChangeAuthorizationStatus = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.didChangeAuthorizationStatus = cb;
        }
      );
    };

-    delegate.didDetermineStateForRegion = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.didDetermineStateForRegion = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.didDetermineStateForRegion = cb;
        }
      );
    };

-    delegate.didEnterRegion = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.didEnterRegion = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.didEnterRegion = cb;
        }
      );
    };

-    delegate.didExitRegion = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.didExitRegion = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.didExitRegion = cb;
        }
      );
    };

-    delegate.didRangeBeaconsInRegion = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.didRangeBeaconsInRegion = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.didRangeBeaconsInRegion = cb;
        }
      );
    };

-    delegate.didStartMonitoringForRegion = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.didStartMonitoringForRegion = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.didStartMonitoringForRegion = cb;
        }
      );
    };

-    delegate.monitoringDidFailForRegionWithError = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.monitoringDidFailForRegionWithError = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.monitoringDidFailForRegionWithError = cb;
        }
      );
    };

-    delegate.peripheralManagerDidStartAdvertising = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.peripheralManagerDidStartAdvertising = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.peripheralManagerDidStartAdvertising = cb;
        }
      );
    };

-    delegate.peripheralManagerDidUpdateState = (pluginResult?: PluginResult) => {
-      return new Observable<PluginResult>(
+    delegate.peripheralManagerDidUpdateState = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
        (observer: any) => {
-          let cb = (data: PluginResult) => observer.next(data);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
          return delegate.peripheralManagerDidUpdateState = cb;
        }
      );
@@ -387,33 +393,33 @@ export class IBeacon {
  }

  /**
-   * @returns {Delegate} Returns the Delegate
+   * @returns {IBeaconDelegate} Returns the IBeaconDelegate
   */
  @Cordova()
-  static getDelegate(): Delegate { return; }
+  static getDelegate(): IBeaconDelegate { return; }

  /**
-   * @param {Delegate} delegate An instance of a delegate to register with the native layer.
+   * @param {IBeaconDelegate} delegate An instance of a delegate to register with the native layer.
   *
-   * @returns {Delegate} Returns the Delegate
+   * @returns {IBeaconDelegate} Returns the IBeaconDelegate
   */
  @Cordova()
-  static setDelegate(delegate: Delegate): Delegate { return; }
+  static setDelegate(delegate: IBeaconDelegate): IBeaconDelegate { return; }

  /**
   * Signals the native layer that the client side is ready to consume messages.
-   * Readiness here means that it has a {Delegate} set by the consumer javascript
+   * Readiness here means that it has a {IBeaconDelegate} set by the consumer javascript
   * code.
   *
   * The {LocationManager.setDelegate()} will implicitly call this method as well,
   * therefore the only case when you have to call this manually is if you don't
-   * wish to specify a {Delegate} of yours.
+   * wish to specify a {IBeaconDelegate} of yours.
   *
   * The purpose of this signaling mechanism is to make the events work when the
   * app is being woken up by the Operating System to give it a chance to handle
   * region monitoring events for example.
   *
-   * If you don't set a {Delegate} and don't call this method manually, an error
+   * If you don't set a {IBeaconDelegate} and don't call this method manually, an error
   * message get emitted in the native runtime and the DOM as well after a certain
   * period of time.
   *
@@ -611,7 +617,7 @@ export class IBeacon {
   * this application, it will be replaced with the new identifier.
   *
   * This call will accept a valid beacon even when no BlueTooth is available,
-   * and will start when BlueTooth is powered on. See {Delegate.}
+   * and will start when BlueTooth is powered on. See {IBeaconDelegate.}
   *
   * @param {Region} region An instance of {Region} which will be advertised
   * by the operating system.
--- a/src/plugins/imageresizer.ts
+++ b/src/plugins/imageresizer.ts
@@ -65,6 +65,8 @@ export interface ImageResizerOptions {
 *  () => { console.log('Error occured'); }
 * )
 * ```
+ * @interfaces
+ * ImageResizerOptions
 */
@Plugin({
  pluginName: 'ImageResizer',
--- a/src/plugins/inappbrowser.ts
+++ b/src/plugins/inappbrowser.ts
@@ -29,6 +29,8 @@ export interface InAppBrowserEvent extends Event {
 * browser.insertCSS(...);
 * browser.close();
 * ```
+ * @interfaces
+ * InAppBrowserEvent
 */
@Plugin({
  pluginName: 'InAppBrowser',
@@ -38,13 +40,6 @@ export interface InAppBrowserEvent extends Event {
 })
 export class InAppBrowser {

-  /**
-   * @private
-   */
-  static open(url: string, target?: string, options?: string): void {
-    console.warn('Native: Your current usage of the InAppBrowser plugin is deprecated as of ionic-native@1.3.8. Please check the Ionic Native docs for the latest usage details.');
-  }
-
  private _objectInstance: any;

  /**
@@ -79,7 +74,7 @@ export class InAppBrowser {

  /**
   * Injects JavaScript code into the InAppBrowser window.
-   * @param script    Details of the script to run, specifying either a file or code key.
+   * @param script {Object} Details of the script to run, specifying either a file or code key.
   * @returns {Promise<any>}
   */
  @CordovaInstance()
@@ -87,14 +82,11 @@ export class InAppBrowser {

  /**
   * Injects CSS into the InAppBrowser window.
-   * @param {Object}       Details of the script to run, specifying either a file or code key.
+   * @param css {Object} Details of the script to run, specifying either a file or code key.
   * @returns {Promise<any>}
   */
  @CordovaInstance()
-  insertCss(css: {file?: string, code?: string}): Promise<any> {return; }
-
-
-
+  insertCSS(css: {file?: string, code?: string}): Promise<any> {return; }

  /**
   * A method that allows you to listen to events happening in the browser.
@@ -107,4 +99,5 @@ export class InAppBrowser {
      return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
    });
  }
+
 }
--- a/src/plugins/launch-review.ts
+++ b/src/plugins/launch-review.ts
@@ -0,0 +1,36 @@
+import { Plugin, Cordova } from './plugin';
+
+/**
+ * @name LaunchReview
+ * @description
+ *
+ * This launches the native store app in order for the user to leave a review.
+ * On Android, the plugin opens the the app's storepage in the Play Store where the user can leave a review by pressing the stars to give a rating.
+ * On iOS, the plugin opens the app's storepage in the App Store and focuses the Review tab, where the user can leave a review by pressing "Write a review".
+ *
+ * @usage
+ * ```
+ * import { LaunchReview } from 'ionic-native';
+ *
+ * const appId: string = 'yourAppId';
+ * LaunchReview.launch(appId)
+ *   .then(() => console.log('Successfully launched store app');
+ * ```
+ */
+@Plugin({
+  pluginName: 'LaunchReview',
+  plugin: 'cordova-launch-review',
+  pluginRef: 'LaunchReview',
+  repo: 'https://github.com/dpa99c/cordova-launch-review',
+  platforms: ['Android', 'iOS']
+})
+export class LaunchReview {
+
+  /**
+   * Launch store app using given app ID
+   * @returns {Promise<void>}
+   */
+  @Cordova()
+  static launch(appId: string): Promise<void> { return; }
+
+}
--- a/src/plugins/launchnavigator.ts
+++ b/src/plugins/launchnavigator.ts
@@ -1,6 +1,5 @@
 import { Cordova, Plugin } from './plugin';

-
 export interface LaunchNavigatorOptions {

  /**
@@ -80,6 +79,8 @@ export interface LaunchNavigatorOptions {
 *     error => console.log('Error launching navigator', error)
 *   );
 * ```
+ * @interfaces
+ * LaunchNavigatorOptions
 */
@Plugin({
  pluginName: 'LaunchNavigator',
--- a/src/plugins/localnotifications.ts
+++ b/src/plugins/localnotifications.ts
@@ -1,5 +1,87 @@
 import { Cordova, Plugin } from './plugin';

+export interface ILocalNotification {
+
+  /**
+   * A unique identifier required to clear, cancel, update or retrieve the local notification in the future
+   * Default: 0
+   */
+  id?: number;
+
+  /**
+   * First row of the notification
+   * Default: Empty string (iOS) or the app name (Android)
+   */
+  title?: string;
+
+  /**
+   * Second row of the notification
+   * Default: Empty string
+   */
+  text?: string;
+
+  /**
+   * The interval at which to reschedule the local notification. That can be a value of second, minute, hour, day, week, month or year
+   * Default: 0 (which means that the system triggers the local notification once)
+   */
+  every?: string;
+
+  /**
+   * The date and time when the system should deliver the local notification. If the specified value is nil or is a date in the past, the local notification is delivered immediately.
+   * Default: now ~ new Date()
+   */
+  at?: any;
+  firstAt?: any;
+
+  /**
+   * The number currently set as the badge of the app icon in Springboard (iOS) or at the right-hand side of the local notification (Android)
+   * Default: 0 (which means don't show a number)
+   */
+  badge?: number;
+
+  /**
+   * Uri of the file containing the sound to play when an alert is displayed
+   * Default: res://platform_default
+   */
+  sound?: string;
+
+  /**
+   * Arbitrary data, objects will be encoded to JSON string
+   * Default: null
+   */
+  data?: any;
+
+  /**
+   * ANDROID ONLY
+   * Uri of the icon that is shown in the ticker and notification
+   * Default: res://icon
+   */
+  icon?: string;
+
+  /**
+   * ANDROID ONLY
+   * Uri of the resource (only res://) to use in the notification layouts. Different classes of devices may return different sizes
+   * Default: res://ic_popup_reminder
+   */
+  smallIcon?: string;
+
+
+  /**
+   * ANDROID ONLY
+   * Ongoing notifications differ from regular notifications in the following ways:
+   * - They are sorted above the regular notifications in the notification panel
+   * - They do not have an 'X' close button, and are not affected by the "Clear all" button
+   * Default: false
+   */
+  ongoing?: boolean;
+
+  /**
+   * ANDROID ONLY
+   * ARGB value that you would like the LED on the device to blink
+   * Default: FFFFFF
+   */
+  led?: string;
+}

 /**
 * @name Local Notifications
@@ -14,7 +96,7 @@ import { Cordova, Plugin } from './plugin';
 * // Schedule a single notification
 * LocalNotifications.schedule({
 *   id: 1,
- *   text: 'Single Notification',
+ *   text: 'Single ILocalNotification',
 *   sound: isAndroid? 'file://sound.mp3': 'file://beep.caf',
 *   data: { secret: key }
 * });
@@ -23,26 +105,27 @@ import { Cordova, Plugin } from './plugin';
 * // Schedule multiple notifications
 * LocalNotifications.schedule([{
 *    id: 1,
- *    text: 'Multi Notification 1',
+ *    text: 'Multi ILocalNotification 1',
 *    sound: isAndroid ? 'file://sound.mp3': 'file://beep.caf',
 *    data: { secret:key }
 *   },{
 *    id: 2,
- *    title: 'Local Notification Example',
- *    text: 'Multi Notification 2',
+ *    title: 'Local ILocalNotification Example',
+ *    text: 'Multi ILocalNotification 2',
 *    icon: 'http://example.com/icon.png'
 * }]);
 *
 *
 * // Schedule delayed notification
 * LocalNotifications.schedule({
- *    text: 'Delayed Notification',
+ *    text: 'Delayed ILocalNotification',
 *    at: new Date(new Date().getTime() + 3600),
 *    led: 'FF0000',
 *    sound: null
 * });
 * ```
- *
+ * @interfaces
+ * ILocalNotification
 */
@Plugin({
  pluginName: 'LocalNotifications',
@@ -54,21 +137,21 @@ export class LocalNotifications {

  /**
   * Schedules a single or multiple notifications
-   * @param options {Notification | Array<Notification>} optional
+   * @param options {Notification | Array<ILocalNotification>} optional
   */
  @Cordova({
    sync: true
  })
-  static schedule(options?: Notification | Array<Notification>): void { }
+  static schedule(options?: ILocalNotification | Array<ILocalNotification>): void { }

  /**
   * Updates a previously scheduled notification. Must include the id in the options parameter.
-   * @param options {Notification} optional
+   * @param options {ILocalNotification} optional
   */
  @Cordova({
    sync: true
  })
-  static update(options?: Notification): void { }
+  static update(options?: ILocalNotification): void { }

  /**
   * Clears single or multiple notifications
@@ -154,47 +237,47 @@ export class LocalNotifications {
  /**
   * Get a notification object
   * @param notificationId {any} The id of the notification to get
-   * @returns {Promise<Notification>}
+   * @returns {Promise<ILocalNotification>}
   */
  @Cordova()
-  static get(notificationId: any): Promise<Notification> { return; }
+  static get(notificationId: any): Promise<ILocalNotification> { return; }

  /**
   * Get a scheduled notification object
   * @param notificationId {any} The id of the notification to get
-   * @returns {Promise<Notification>}
+   * @returns {Promise<ILocalNotification>}
   */
  @Cordova()
-  static getScheduled(notificationId: any): Promise<Notification> { return; }
+  static getScheduled(notificationId: any): Promise<ILocalNotification> { return; }

  /**
   * Get a triggered notification object
   * @param notificationId The id of the notification to get
-   * @returns {Promise<Notification>}
+   * @returns {Promise<ILocalNotification>}
   */
  @Cordova()
-  static getTriggered(notificationId: any): Promise<Notification> { return; }
+  static getTriggered(notificationId: any): Promise<ILocalNotification> { return; }

  /**
   * Get all notification objects
-   * @returns {Promise<Array<Notification>>}
+   * @returns {Promise<Array<ILocalNotification>>}
   */
  @Cordova()
-  static getAll(): Promise<Array<Notification>> { return; }
+  static getAll(): Promise<Array<ILocalNotification>> { return; }

  /**
   * Get all scheduled notification objects
-   * @returns {Promise<Array<Notification>>}
+   * @returns {Promise<Array<ILocalNotification>>}
   */
  @Cordova()
-  static getAllScheduled(): Promise<Array<Notification>> { return; }
+  static getAllScheduled(): Promise<Array<ILocalNotification>> { return; }

  /**
   * Get all triggered notification objects
-   * @returns {Promise<Array<Notification>>}
+   * @returns {Promise<Array<ILocalNotification>>}
   */
  @Cordova()
-  static getAllTriggered(): Promise<Array<Notification>> { return; }
+  static getAllTriggered(): Promise<Array<ILocalNotification>> { return; }

  /**
   * Register permission to show notifications if not already granted.
@@ -223,86 +306,3 @@ export class LocalNotifications {


 }
-
-export interface Notification {
-
-  /**
-   * A unique identifier required to clear, cancel, update or retrieve the local notification in the future
-   * Default: 0
-   */
-  id?: number;
-
-  /**
-   * First row of the notification
-   * Default: Empty string (iOS) or the app name (Android)
-   */
-  title?: string;
-
-  /**
-   * Second row of the notification
-   * Default: Empty string
-   */
-  text?: string;
-
-  /**
-   * The interval at which to reschedule the local notification. That can be a value of second, minute, hour, day, week, month or year
-   * Default: 0 (which means that the system triggers the local notification once)
-   */
-  every?: string;
-
-  /**
-   * The date and time when the system should deliver the local notification. If the specified value is nil or is a date in the past, the local notification is delivered immediately.
-   * Default: now ~ new Date()
-   */
-  at?: any;
-  firstAt?: any;
-
-  /**
-   * The number currently set as the badge of the app icon in Springboard (iOS) or at the right-hand side of the local notification (Android)
-   * Default: 0 (which means don't show a number)
-   */
-  badge?: number;
-
-  /**
-   * Uri of the file containing the sound to play when an alert is displayed
-   * Default: res://platform_default
-   */
-  sound?: string;
-
-  /**
-   * Arbitrary data, objects will be encoded to JSON string
-   * Default: null
-   */
-  data?: any;
-
-  /**
-   * ANDROID ONLY
-   * Uri of the icon that is shown in the ticker and notification
-   * Default: res://icon
-   */
-  icon?: string;
-
-  /**
-   * ANDROID ONLY
-   * Uri of the resource (only res://) to use in the notification layouts. Different classes of devices may return different sizes
-   * Default: res://ic_popup_reminder
-   */
-  smallIcon?: string;
-
-
-  /**
-   * ANDROID ONLY
-   * Ongoing notifications differ from regular notifications in the following ways:
-   * - They are sorted above the regular notifications in the notification panel
-   * - They do not have an 'X' close button, and are not affected by the "Clear all" button
-   * Default: false
-   */
-  ongoing?: boolean;
-
-  /**
-   * ANDROID ONLY
-   * ARGB value that you would like the LED on the device to blink
-   * Default: FFFFFF
-   */
-  led?: string;
-}
--- a/src/plugins/market.ts
+++ b/src/plugins/market.ts
@@ -19,12 +19,30 @@ import { Plugin, Cordova } from './plugin';
  repo: 'https://github.com/xmartlabs/cordova-plugin-market'
 })
 export class Market {
+
  /**
   * Opens an app in Google Play / App Store
   * @param appId {string} Package name
-   * @param callbacks {Object} Optional callbacks in the format {success?: Function, failure?: Function}
+   * @return {Promise<any>}
   */
-  @Cordova({sync: true})
-  static open(appId: string, callbacks?: {success?: Function, failure?: Function}): void { }
+  @Cordova({
+    callbackStyle: 'object',
+    successName: 'success',
+    errorName: 'failure'
+  })
+  static open(appId: string): Promise<any> { return; }
+
+  /**
+   * Search apps by keyword
+   * @param keyword {string} Keyword
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    callbackStyle: 'object',
+    successName: 'success',
+    errorName: 'failure',
+    platforms: ['Android']
+  })
+  static search(keyword: string): Promise<any> { return; }

 }
--- a/src/plugins/media-capture.ts
+++ b/src/plugins/media-capture.ts
@@ -1,15 +1,119 @@
 import { Cordova, CordovaProperty, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-
 declare var navigator: any;

+export interface MediaFile {
+  /**
+   * The name of the file, without path information.
+   */
+  name: string;
+  /**
+   * The full path of the file, including the name.
+   */
+  fullPath: string;
+  /**
+   * The file's mime type
+   */
+    type: string;
+  /**
+   * The date and time when the file was last modified.
+   */
+  lastModifiedDate: Date;
+  /**
+   * The size of the file, in bytes.
+   */
+  size: number;
+  /**
+   * Retrieves the format information of the media file.
+   * @param {Function} successCallback
+   * @param {Function} errorCallback
+   */
+  getFormatData(successCallback: (data: MediaFileData) => any, errorCallback?: (err: any) => any);
+}
+
+export interface MediaFileData {
+  /**
+   * The actual format of the audio and video content.
+   */
+  codecs: string;
+  /**
+   * The average bitrate of the content. The value is zero for images.
+   */
+  bitrate: number;
+  /**
+   * The height of the image or video in pixels. The value is zero for audio clips.
+   */
+  height: number;
+  /**
+   * The width of the image or video in pixels. The value is zero for audio clips.
+   */
+  width: number;
+  /**
+   * The length of the video or sound clip in seconds. The value is zero for images.
+   */
+  duration: number;
+}
+
+export interface CaptureError {
+  code: string;
+}
+
+export interface CaptureAudioOptions {
+  /**
+   * Maximum number of audio clips. Defaults to 1.
+   * On iOS you can only record one file.
+   */
+  limit?: number;
+  /**
+   * Maximum duration of an audio sound clip, in seconds. This does not work on Android devices.
+   */
+  duration?: number;
+}
+
+export interface CaptureImageOptions {
+  /**
+   * Maximum number of images to capture. This limit is not supported on iOS, only one image will be taken per invocation.
+   */
+  limit?: number;
+}
+
+export interface CaptureVideoOptions {
+  /**
+   * Maximum number of video clips to record. This value is ignored on iOS, only one video clip can be taken per invocation.
+   */
+  limit?: number;
+  /**
+   * Maximum duration per video clip. This will be ignored on BlackBerry.
+   */
+  duration?: number;
+  /**
+   * Quality of the video. This parameter can only be used with Android.
+   */
+  quality?: number;
+}
+
+export interface ConfigurationData {
+  /**
+   * The ASCII-encoded lowercase string representing the media type.
+   */
+    type: string;
+  /**
+   * The height of the image or video in pixels. The value is zero for sound clips.
+   */
+  height: number;
+  /**
+   * The width of the image or video in pixels. The value is zero for sound clips.
+   */
+  width: number;
+}
+
 /**
 * @name Media Capture
 * @description
 * @usage
 * ```typescript
- * import { MediaCapture } from 'ionic-native';
+ * import { MediaCapture, MediaFile, CaptureError, CaptureImageOptions } from 'ionic-native';
 *
 *
 * let options: CaptureImageOptions = { limit: 3 };
@@ -20,6 +124,14 @@ declare var navigator: any;
 *   );
 *
 * ```
+ * @interfaces
+ * MediaFile
+ * MediaFileData
+ * CaptureError
+ * CaptureAudioOptions
+ * CaptureImageOptions
+ * CaptureVideoOptions
+ * ConfigurationData
 */
@Plugin({
  pluginName: 'MediaCapture',
@@ -33,32 +145,26 @@ export class MediaCapture {
   * @returns {ConfigurationData[]}
   */
  @CordovaProperty
-  static get supportedImageModes(): ConfigurationData[] {
-    return <ConfigurationData[]>navigator.device.capture.supportedImageModes;
-  }
+  static supportedImageModes: ConfigurationData[];

  /**
   * The audio recording formats supported by the device.
   * @returns {ConfigurationData[]}
   */
  @CordovaProperty
-  static get supportedAudioModes(): ConfigurationData[] {
-    return <ConfigurationData[]>navigator.device.capture.supportedAudioModes;
-  }
+  static supportedAudioModes: ConfigurationData[];

  /**
   * The recording video resolutions and formats supported by the device.
   * @returns {ConfigurationData[]}
   */
  @CordovaProperty
-  static get supportedVideoModes(): ConfigurationData[] {
-    return <ConfigurationData[]>navigator.device.capture.supportedVideoModes;
-  }
+  static supportedVideoModes: ConfigurationData[];

  /**
   * Start the audio recorder application and return information about captured audio clip files.
   * @param options
-   * @returns {Promise<MediaFile[]>} 
+   * @returns {Promise<MediaFile[]>}
   */
  @Cordova({
    callbackOrder: 'reverse'
@@ -106,122 +212,3 @@ export class MediaCapture {
  static onPendingCaptureError(): Observable<CaptureError> { return; }

 }
-/**
- * Encapsulates properties of a media capture file.
- */
-export interface MediaFile {
-  /**
-   * The name of the file, without path information.
-   */
-  name: string;
-  /**
-   * The full path of the file, including the name.
-   */
-  fullPath: string;
-  /**
-   * The file's mime type
-   */
-  type: string;
-  /**
-   * The date and time when the file was last modified.
-   */
-  lastModifiedDate: Date;
-  /**
-   * The size of the file, in bytes.
-   */
-  size: number;
-  /**
-   * Retrieves the format information of the media file.
-   * @param {Function} successCallback
-   * @param {Function} errorCallback
-   */
-  getFormatData(successCallback: (data: MediaFileData) => any, errorCallback?: (err: any) => any);
-}
-/**
- * Encapsulates format information about a media file.
- */
-export interface MediaFileData {
-  /**
-   * The actual format of the audio and video content.
-   */
-  codecs: string;
-  /**
-   * The average bitrate of the content. The value is zero for images.
-   */
-  bitrate: number;
-  /**
-   * The height of the image or video in pixels. The value is zero for audio clips.
-   */
-  height: number;
-  /**
-   * The width of the image or video in pixels. The value is zero for audio clips.
-   */
-  width: number;
-  /**
-   * The length of the video or sound clip in seconds. The value is zero for images.
-   */
-  duration: number;
-}
-/**
- * Encapsulates the error code resulting from a failed media capture operation.
- */
-export interface CaptureError {
-  code: string;
-}
-/**
- * Encapsulates audio capture configuration options.
- */
-export interface CaptureAudioOptions {
-  /**
-   * Maximum number of audio clips. Defaults to 1.
-   * On iOS you can only record one file.
-   */
-  limit?: number;
-  /**
-   * Maximum duration of an audio sound clip, in seconds. This does not work on Android devices.
-   */
-  duration?: number;
-}
-/**
- * Encapsulates image capture configuration options.
- */
-export interface CaptureImageOptions {
-  /**
-   * Maximum number of images to capture. This limit is not supported on iOS, only one image will be taken per invocation.
-   */
-  limit?: number;
-}
-/**
- * Encapsulates video capture configuration options.
- */
-export interface CaptureVideoOptions {
-  /**
-   * Maximum number of video clips to record. This value is ignored on iOS, only one video clip can be taken per invocation.
-   */
-  limit?: number;
-  /**
-   * Maximum duration per video clip. This will be ignored on BlackBerry.
-   */
-  duration?: number;
-  /**
-   * Quality of the video. This parameter can only be used with Android.
-   */
-  quality?: number;
-}
-/**
- * Encapsulates a set of media capture parameters that a device supports.
- */
-export interface ConfigurationData {
-  /**
-   * The ASCII-encoded lowercase string representing the media type.
-   */
-  type: string;
-  /**
-   * The height of the image or video in pixels. The value is zero for sound clips.
-   */
-  height: number;
-  /**
-   * The width of the image or video in pixels. The value is zero for sound clips.
-   */
-  width: number;
-}
--- a/src/plugins/media.ts
+++ b/src/plugins/media.ts
@@ -17,7 +17,11 @@ export interface MediaError {
 *
 *
 * // Create a MediaPlugin instance.  Expects path to file or url as argument
- * var file = new MediaPlugin('path/to/file.mp3');
+ * // We can optionally pass a second argument to track the status of the media
+ *
+ * const onStatusUpdate = (status) => console.log(status);
+ *
+ * const file = new MediaPlugin('path/to/file.mp3', onStatusUpdate);
 *
 * // Catch the Success & Error Output
 * // Platform Quirks
--- a/src/plugins/mixpanel.ts
+++ b/src/plugins/mixpanel.ts
@@ -16,6 +16,8 @@ declare var mixpanel: any;
 *   .catch(onError);
 *
 * ```
+ * @classes
+ * MixpanelPeople
 */
@Plugin({
  pluginName: 'Mixpanel',
@@ -83,7 +85,10 @@ export class Mixpanel {
   * @param eventProperties {any} optional
   * @returns {Promise<any>}
   */
-  @Cordova()
+  @Cordova({
+    successIndex: 2,
+    errorIndex: 3
+  })
  static track(eventName: string, eventProperties?: any): Promise<any> { return; }

  /**
--- a/src/plugins/music-controls.ts
+++ b/src/plugins/music-controls.ts
@@ -1,5 +1,18 @@
 import { Plugin, Cordova } from './plugin';
 import { Observable } from 'rxjs/Observable';
+
+export interface MusicControlsOptions {
+  track: string;
+  artist: string;
+  cover: string;
+  isPlaying: boolean;
+  dismissable: boolean;
+  hasPrev: boolean;
+  hasNext: boolean;
+  hasClose: boolean;
+  ticker: string;
+}
+
 /**
 * @name MusicControls
 * @description
@@ -71,6 +84,8 @@ import { Observable } from 'rxjs/Observable';
 *
 *
 * ```
+ * @interfaces
+ * MusicControlsOptions
 */
@Plugin({
  pluginName: 'MusicControls',
@@ -79,6 +94,7 @@ import { Observable } from 'rxjs/Observable';
  repo: 'https://github.com/homerours/cordova-music-controls-plugin'
 })
 export class MusicControls {
+
  /**
   * Create the media controls
   * @param options {MusicControlsOptions}
@@ -115,15 +131,5 @@ export class MusicControls {
   */
  @Cordova({sync: true})
  static updateIsPlaying(isPlaying: boolean): void {}
-}
-export interface MusicControlsOptions {
-  track: string;
-  artist: string;
-  cover: string;
-  isPlaying: boolean;
-  dismissable: boolean;
-  hasPrev: boolean;
-  hasNext: boolean;
-  hasClose: boolean;
-  ticker: string;
+
 }
--- a/src/plugins/native-geocoder.ts
+++ b/src/plugins/native-geocoder.ts
@@ -0,0 +1,98 @@
+import { Plugin, Cordova } from './plugin';
+
+/**
+ * @beta
+ * @name NativeGeocoder
+ * @description
+ * Cordova plugin for native forward and reverse geocoding
+ *
+ * @usage
+ * ```typescript
+ * import { NativeGeocoder, NativeGeocoderReverseResult, NativeGeocoderForwardResult } from 'ionic-native';
+ *
+ * NativeGeocoder.reverseGeocode(52.5072095, 13.1452818)
+ *   .then((result: NativeGeocoderReverseResult) => console.log("The address is " + result.address + " in " + result.countryCode))
+ *   .catch((error: any) => console.log(error));
+ *
+ * NativeGeocoder.forwardGeocode("Berlin")
+ *   .then((coordinates: NativeGeocoderForwardResult) => console.log("The coordinates are latitude=" + coordinates.latitude + " and longitude=" + coordinates.longitude))
+ *   .catch((error: any) => console.log(error));
+ * ```
+ * @interfaces
+ * NativeGeocoderReverseResult
+ * NativeGeocoderForwardResult
+ */
+@Plugin({
+  pluginName: 'NativeGeocoder',
+  plugin: 'cordova-plugin-nativegeocoder',
+  pluginRef: 'nativegeocoder',
+  repo: 'https://github.com/sebastianbaar/cordova-plugin-nativegeocoder',
+  platforms: ['iOS', 'Android']
+})
+export class NativeGeocoder {
+
+  /**
+   * Reverse geocode a given latitude and longitude to find location address
+   * @param latitude {number} The latitude
+   * @param longitude {number} The longitude
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  static reverseGeocode(latitude: number, longitude: number): Promise<NativeGeocoderReverseResult> { return; }
+
+  /**
+   * Forward geocode a given address to find coordinates
+   * @param addressString {string} The address to be geocoded
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  static forwardGeocode(addressString: string): Promise<NativeGeocoderForwardResult> { return; }
+
+}
+
+/**
+ * Encapsulates format information about a reverse geocoding result.
+ */
+export interface NativeGeocoderReverseResult {
+  /**
+   * The street.
+   */
+  street: string;
+  /**
+   * The house number.
+   */
+  houseNumber: string;
+  /**
+   * The postal code.
+   */
+  postalCode: string;
+  /**
+   * The city.
+   */
+  city: string;
+  /**
+   * The country name.
+   */
+  countryName: string;
+  /**
+   * The country code.
+   */
+  countryCode: string;
+}
+/**
+ * Encapsulates format information about a forward geocoding result.
+ */
+export interface NativeGeocoderForwardResult {
+  /**
+   * The latitude.
+   */
+  latitude: string;
+  /**
+   * The longitude.
+   */
+  longitude: string;
+}
--- a/src/plugins/native-page-transitions.ts
+++ b/src/plugins/native-page-transitions.ts
@@ -1,4 +1,20 @@
 import { Plugin, Cordova } from './plugin';
+
+export interface NativeTransitionOptions {
+  direction?: string;
+  duration?: number;
+  slowdownfactor?: number;
+  slidePixels?: number;
+  iosdelay?: number;
+  androiddelay?: number;
+  winphonedelay?: number;
+  fixedPixelsTop?: number;
+  fixedPixelsBottom?: number;
+  action?: string;
+  origin?: string;
+  href?: string;
+}
+
 /**
 * @name NativePageTransitions
 * @description
@@ -6,9 +22,9 @@ import { Plugin, Cordova } from './plugin';
 *
 * @usage
 * ```
- * import {NativePageTransitions, TransitionOptions} from 'ionic-native';
+ * import {NativePageTransitions, NativeTransitionOptions} from 'ionic-native';
 *
- * let options: TransitionOptions = {
+ * let options: NativeTransitionOptions = {
 *    direction: 'up',
 *    duration: 500,
 *    slowdownfactor: 3,
@@ -36,60 +52,46 @@ import { Plugin, Cordova } from './plugin';
 export class NativePageTransitions {
  /**
   * Perform a slide animation
-   * @param options {TransitionOptions} Options for the transition
+   * @param options {NativeTransitionOptions} Options for the transition
   * @returns {Promise<any>}
   */
  @Cordova()
-  static slide(options: TransitionOptions): Promise<any> { return; }
+  static slide(options: NativeTransitionOptions): Promise<any> { return; }

  /**
   * Perform a flip animation
-   * @param options {TransitionOptions} Options for the transition
+   * @param options {NativeTransitionOptions} Options for the transition
   * @returns {Promise<any>}
   */
  @Cordova()
-  static flip(options: TransitionOptions): Promise<any> { return; }
+  static flip(options: NativeTransitionOptions): Promise<any> { return; }

  /**
   * Perform a fade animation
-   * @param options {TransitionOptions} Options for the transition
+   * @param options {NativeTransitionOptions} Options for the transition
   * @returns {Promise<any>}
   */
  @Cordova({platforms: ['iOS', 'Android']})
-  static fade(options: TransitionOptions): Promise<any> { return; }
+  static fade(options: NativeTransitionOptions): Promise<any> { return; }


  /**
   * Perform a slide animation
-   * @param options {TransitionOptions} Options for the transition
+   * @param options {NativeTransitionOptions} Options for the transition
   * @returns {Promise<any>}
   */
  @Cordova({platforms: ['iOS', 'Android']})
-  static drawer(options: TransitionOptions): Promise<any> { return; }
+  static drawer(options: NativeTransitionOptions): Promise<any> { return; }



  /**
   * Perform a slide animation
-   * @param options {TransitionOptions} Options for the transition
+   * @param options {NativeTransitionOptions} Options for the transition
   * @returns {Promise<any>}
   */
  @Cordova({platforms: ['iOS']})
-  static curl(options: TransitionOptions): Promise<any> { return; }
+  static curl(options: NativeTransitionOptions): Promise<any> { return; }

 }

-export interface TransitionOptions {
-  direction?: string;
-  duration?: number;
-  slowdownfactor?: number;
-  slidePixels?: number;
-  iosdelay?: number;
-  androiddelay?: number;
-  winphonedelay?: number;
-  fixedPixelsTop?: number;
-  fixedPixelsBottom?: number;
-  action?: string;
-  origin?: string;
-  href?: string;
-}
--- a/src/plugins/navigationbar.ts
+++ b/src/plugins/navigationbar.ts
@@ -0,0 +1,50 @@
+import { Cordova, Plugin } from './plugin';
+
+
+/**
+ * @beta
+ * @name NavigationBar
+ * @description
+ * The NavigationBar plugin can you to hide and auto hide the android navigation bar.
+ *
+ * @usage
+ * ```typescript
+ * import { NavigationBar } from 'ionic-native';
+ *
+ * let autoHide: boolean = true;
+ * NavigationBar.hide(autoHide);
+ * ```
+ */
+@Plugin({
+  pluginName: 'NavigationBar',
+  plugin: 'cordova-plugin-navigationbar',
+  pluginRef: 'navigationbar',
+  repo: 'https://github.com/cranberrygame/cordova-plugin-navigationbar',
+  platforms: ['Android']
+})
+export class NavigationBar {
+
+  /**
+   * hide automatically (or not) the navigation bar.
+   * @param autohide {boolean}  
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    callbackStyle: 'object',
+    successName: 'success',
+    errorName: 'failure'
+  })
+  static setUp(autohide?: boolean): Promise<any> { return; }
+
+  /**
+   * Hide the navigation bar. 
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    callbackStyle: 'object',
+    successName: 'success',
+    errorName: 'failure'
+  })
+  static hideNavigationBar(): Promise<any> { return; }
+
+}
--- a/src/plugins/network.ts
+++ b/src/plugins/network.ts
@@ -1,4 +1,4 @@
-import { Cordova, CordovaProperty, Plugin } from './plugin';
+import {Cordova, CordovaProperty, Plugin, CordovaFunctionOverride} from './plugin';
 import { Observable } from 'rxjs/Observable';


@@ -29,7 +29,7 @@ declare var navigator: any;
 *    // before we determine the connection type.  Might need to wait 
 *   // prior to doing any api requests as well.
 *   setTimeout(() => {
- *     if (Network.connection === 'wifi') {
+ *     if (Network.type === 'wifi') {
 *       console.log('we got a wifi connection, woohoo!');
 *     }
 *   }, 3000);
@@ -40,7 +40,7 @@ declare var navigator: any;
 *
 * ```
 * @advanced
- * The `connection` property will return one of the following connection types: `unknown`, `ethernet`, `wifi`, `2g`, `3g`, `4g`, `cellular`, `none`
+ * The `type` property will return one of the following connection types: `unknown`, `ethernet`, `wifi`, `2g`, `3g`, `4g`, `cellular`, `none`
 */
@Plugin({
  pluginName: 'Network',
@@ -52,10 +52,32 @@ declare var navigator: any;
 export class Network {

  /**
-   * Return the network connection type
+   * Connection type
+   * @return {string}
   */
  @CordovaProperty
-  static get connection(): string { return navigator.connection.type; }
+  static type: string;
+
+  /**
+   * Downlink Max Speed
+   * @return {string}
+   */
+  @CordovaProperty
+  static downlinkMax: string;
+
+  /**
+   * Returns an observable to watch connection changes
+   * @return {Observable<any>}
+   */
+  @CordovaFunctionOverride()
+  static onchange(): Observable<any> { return; }
+
+  /**
+   * Returns an observable to watch connection type changes
+   * @return {Observable<any>}
+   */
+  @CordovaFunctionOverride()
+  static ontypechange(): Observable<any> { return; }

  /**
   * Get notified when the device goes offline
--- a/src/plugins/nfc.ts
+++ b/src/plugins/nfc.ts
@@ -47,6 +47,21 @@ export class NFC {

  /**
   * Registers an event listener for tags matching any tag type.
+   * @param onSuccess
+   * @param onFailure
+   * @returns {Observable<any>}
+   */
+  @Cordova({
+    observable: true,
+    successIndex: 0,
+    errorIndex: 3,
+    clearFunction: 'removeTagDiscoveredListener',
+    clearWithArgs: true
+  })
+  static addTagDiscoveredListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
+
+  /**
+   * Registers an event listener for NDEF tags matching a specified MIME type.
   * @param mimeType
   * @param onSuccess
   * @param onFailure
@@ -56,25 +71,10 @@ export class NFC {
    observable: true,
    successIndex: 1,
    errorIndex: 4,
-    clearFunction: 'removeTagDiscoveredListener',
-    clearWithArgs: true
-  })
-  static addTagDiscoveredListener(mimeType: string, onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
-
-  /**
-   * Registers an event listener for NDEF tags matching a specified MIME type.
-   * @param onSuccess
-   * @param onFailure
-   * @returns {Observable<any>}
-   */
-  @Cordova({
-    observable: true,
-    successIndex: 0,
-    errorIndex: 3,
    clearFunction: 'removeMimeTypeListener',
    clearWithArgs: true
  })
-  static addMimeTypeListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
+  static addMimeTypeListener(mimeType: string, onSuccess?: Function, onFailure?: Function): Observable<any> {return; }

  /**
   * Registers an event listener for formatable NDEF tags.
@@ -152,6 +152,27 @@ export class NFC {
   */
  @Cordova()
  static enabled(): Promise<any> {return; }
+  /**
+   * Convert bytes to string
+   * @param bytes {number[]}
+   * @returns {string}
+   */
+  @Cordova({ sync: true })
+  static bytesToString(bytes: number[]): string {return; }
+  /**
+   * Convert string to bytes
+   * @param str {string}
+   * @returns {number[]}
+   */
+  @Cordova({ sync: true })
+  static stringToBytes(str: string): number[] {return; };
+  /**
+   * Convert bytes to hex string
+   * @param bytes {number[]}
+   * @returns {string}
+   */
+  @Cordova({ sync: true })
+  static bytesToHexString(bytes: number[]): string {return; };

 }
 /**
--- a/src/plugins/onesignal.ts
+++ b/src/plugins/onesignal.ts
@@ -1,238 +1,32 @@
 import { Cordova, Plugin } from './plugin';
 import { Observable } from 'rxjs/Observable';

-/**
- * @name OneSignal
- * @description
- * The OneSignal plugin is an client implementation for using the [OneSignal](https://onesignal.com/) Service.
- * OneSignal is a simple implementation for delivering push notifications.
- *
- * Requires Cordova plugin: `onesignal-cordova-plugin`. For more info, please see the [OneSignal Cordova Docs](https://documentation.onesignal.com/docs/phonegap-sdk-installation).
- *
- * @usage
- * ```typescript
- * import { OneSignal } from 'ionic-native';
- *
- * OneSignal.startInit('b2f7f966-d8cc-11e4-bed1-df8f05be55ba', '703322744261');
- *
- * OneSignal.inFocusDisplaying(OneSignal.OSInFocusDisplayOption.InAppAlert);
- *
- * OneSignal.handleNotificationReceived().subscribe(() => {
- *  // do something when notification is received
- * });
- *
- * OneSignal.handleNotificationOpened().subscribe(() => {
- *   // do something when a notification is opened
- * });
- *
- * OneSignal.endInit();
- * ```
- *
- */
-@Plugin({
-  pluginName: 'OneSignal',
-  plugin: 'onesignal-cordova-plugin',
-  pluginRef: 'plugins.OneSignal',
-  repo: 'https://github.com/OneSignal/OneSignal-Cordova-SDK'
-})
-export class OneSignal {
-
+export interface OSNotification {
  /**
-   * constants to use in inFocusDisplaying()
+   * Was app in focus.
   */
-  static OSInFocusDisplayOption = {
-    None: 0,
-    InAppAlert : 1,
-    Notification : 2
-  };
-
+  isAppInFocus: boolean;
  /**
-   * Start the initialization process. Once you are done configuring OneSignal, call the endInit function.
-   *
-   * @param {string} appId Your AppId from your OneSignal app
-   * @param {string} googleProjectNumber The Google Project Number (which you can get from the Google Developer Portal) and the autoRegister option.
-   * @returns {any}
+   * Was notification shown to the user. Will be false for silent notifications.
   */
-  @Cordova({ sync: true })
-  static startInit(appId: string, googleProjectNumber: string): any { return; }
-
+  shown: boolean;
  /**
-   * Callback to run when a notification is received
-   * @return {Observable<any>}
+   * **ANDROID** - Android Notification assigned to the notification. Can be used to cancel or replace the notification.
   */
-  @Cordova({
-    observable: true
-  })
-  static handleNotificationReceived(): Observable<any> { return; }
-
+  androidNotificationId?: number;
  /**
-   * Callback to run when a notification is opened
-   * @return {Observable<any>}
+   * Payload received from OneSignal.
   */
-  @Cordova({
-    observable: true
-  })
-  static handleNotificationOpened(): Observable<any> { return; }
-
+  payload: OSNotificationPayload;
  /**
-   *
-   * @param settings
-   * @returns {any}
+   * How the notification was displayed to the user. Can be set to `Notification`, `InAppAlert`, or `None` if it was not displayed.
   */
-  @Cordova({ sync: true })
-  static iOSSettings(settings: {
-    kOSSettingsKeyInAppLaunchURL: boolean;
-    kOSSettingsKeyAutoPrompt: boolean;
-  }): any { return; }
-
+  displayType: OSDisplayType;
  /**
-   * @returns {any}
+   * **ANDROID** - Notification is a summary notification for a group this will contain all notification payloads it was created from.
   */
-  @Cordova({ sync: true })
-  static endInit(): any { return; }
-
-  /**
-   * Retrieve a list of tags that have been set on the user from the OneSignal server.
-   *
-   * @returns {Promise<any>} Returns a Promise that resolves when tags are recieved.
-   */
-  @Cordova()
-  static getTags(): Promise<any> { return; }
-
-  /**
-   * Lets you retrieve the OneSignal user id and device token.
-   * Your handler is called after the device is successfully registered with OneSignal.
-   *
-   * @returns {Promise<any>} Returns a Promise that reolves if the device was successfully registered.
-   * It returns a JSON with `userId`and `pushToken`.
-   */
-  @Cordova()
-  static getIds(): Promise<any> { return; }
-
-
-  /**
-   * Tag a user based on an app event of your choosing so later you can create segments on [onesignal.com](https://onesignal.com/) to target these users.
-   * Recommend using sendTags over sendTag if you need to set more than one tag on a user at a time.
-   *
-   * @param {string} Key of your choosing to create or update.
-   * @param {string} Value to set on the key. NOTE: Passing in a blank String deletes the key, you can also call deleteTag.
-   */
-  @Cordova({ sync: true })
-  static sendTag(key: string, value: string): void { }
-
-  /**
-   * Tag a user based on an app event of your choosing so later you can create segments on [onesignal.com](https://onesignal.com/) to target these users.
-   * Recommend using sendTags over sendTag if you need to set more than one tag on a user at a time.
-   *
-   * @param {string} Pass a json object with key/value pairs like: {key: "value", key2: "value2"}
-   */
-  @Cordova({ sync: true })
-  static sendTags(json: any): void { }
-
-  /**
-   * Deletes a tag that was previously set on a user with `sendTag` or `sendTags`. Use `deleteTags` if you need to delete more than one.
-   *
-   * @param {string} Key to remove.
-   */
-  @Cordova({ sync: true })
-  static deleteTag(key: string): void { }
-
-  /**
-   * Deletes tags that were previously set on a user with `sendTag` or `sendTags`.
-   *
-   * @param {Array<string>} Keys to remove.
-   */
-  @Cordova({ sync: true })
-  static deleteTags(keys: string[]): void { }
-
-  /**
-   * Call this when you would like to prompt an iOS user to accept push notifications with the default system prompt.
-   * Only use if you passed false to autoRegister when calling init.
-   */
-  @Cordova({ sync: true })
-  static registerForPushNotifications(): void { }
-
-  /**
-  * Warning:
-  * Only applies to Android and Amazon. You can call this from your UI from a button press for example to give your user's options for your notifications.
-  *
-  * By default OneSignal always vibrates the device when a notification is displayed unless the device is in a total silent mode.
-  * Passing false means that the device will only vibrate lightly when the device is in it's vibrate only mode.
-  *
-  * @param {boolean} false to disable vibrate, true to re-enable it.
-  */
-  @Cordova({ sync: true })
-  static enableVibrate(enable: boolean): void { }
-
-  /**
-  * Warning:
-  * Only applies to Android and Amazon. You can call this from your UI from a button press for example to give your user's options for your notifications.
-  *
-  * By default OneSignal plays the system's default notification sound when the device's notification system volume is turned on.
-  * Passing false means that the device will only vibrate unless the device is set to a total silent mode.
-  *
-  * @param {boolean} false to disable sound, true to re-enable it.
-  */
-  @Cordova({ sync: true })
-  static enableSound(enable: boolean): void { }
-
-  /**
-  *
-  * Setting to control how OneSignal notifications will be shown when one is received while your app is in focus. By default this is set to inAppAlert, which can be helpful during development.
-  *
-  * @param {number} displayOption Options are 0 = None, 1 = InAppAlert, and 2 = Notification.
-  */
-  @Cordova({ sync: true })
-  static inFocusDisplaying(displayOption: number): void { }
-
-  /**
-  * You can call this method with false to opt users out of receiving all notifications through OneSignal.
-  * You can pass true later to opt users back into notifications.
-  *
-  * @param {boolean} enable
-  */
-  @Cordova({ sync: true })
-  static setSubscription(enable: boolean): void { }
-
-  /**
-  *
-  * @param {notificationObj} Parameters see POST [documentation](https://documentation.onesignal.com/v2.0/docs/notifications-create-notification)
-  * @returns {Promise<any>} Returns a Promise that resolves if the notification was send successfully.
-  */
-  @Cordova()
-  static postNotification(notificationObj: OneSignalNotification): Promise<any> { return; }
-
-  /**
-  * Prompts the user for location permission to allow geotagging based on the "Location radius" filter on the OneSignal dashboard.
-  */
-  @Cordova({ sync: true })
-  static promptLocation(): void { }
-
-  /**
-   *
-   * @param email {string}
-   */
-  @Cordova({ sync: true })
-  static syncHashedEmail(email: string): void { }
-
-  /**
-  * Enable logging to help debug if you run into an issue setting up OneSignal.
-  * The logging levels are as follows: 0 = None, 1= Fatal, 2 = Errors, 3 = Warnings, 4 = Info, 5 = Debug, 6 = Verbose
-
-  * The higher the value the more information is shown.
-  *
-  * @param {loglevel} contains two properties: logLevel (for console logging) and visualLevel (for dialog messages)
-  */
-  @Cordova({ sync: true })
-  static setLogLevel(logLevel: {
-    logLevel: number,
-    visualLevel: number
-  }): void { }
-
-}
-
-export interface OneSignalNotification {
-  app_id: string;
+  groupedNotifications?: OSNotificationPayload[];
+  app_id?: string;
  contents: any;
  headings?: any;
  isIos?: boolean;
@@ -293,3 +87,429 @@ export interface OneSignalNotification {
  priority?: number;
  ios_category?: string;
 }
+
+/**
+ * **ANDROID** - Privacy setting for how the notification should be shown on the lockscreen of Android 5+ devices.
+ */
+export enum OSLockScreenVisibility {
+  /**
+   * Fully visible (default)
+   */
+  Public = 1,
+  /**
+   * Contents are hidden
+   */
+  Private = 0,
+  /**
+   * Not shown
+   */
+  Secret = -1
+}
+
+/**
+ * How the notification was displayed to the user. Part of OSNotification. See inFocusDisplaying for more information on how this is used.
+ */
+export enum OSDisplayType {
+  /**
+   * notification is silent, or inFocusDisplaying is disabled.
+   */
+  None = 0,
+  /**
+   * (**DEFAULT**) - native alert dialog display.
+   */
+  InAppAlert = 1,
+  /**
+   * native notification display.
+   */
+  Notification = 2
+}
+
+/**
+ * Contents and settings of the notification the user received.
+ */
+export interface OSNotificationPayload {
+  /**
+   * OneSignal notification UUID.
+   */
+  notificationID: string;
+  /**
+   * Title of the notification.
+   */
+  title: string;
+  /**
+   * Body of the notification.
+   */
+  body: string;
+  /**
+   * Custom additional data that was sent with the notification. Set on the dashboard under Options > Additional Data
+   * or with the 'data' field on the REST API.
+   */
+  additionalData?: any;
+  /**
+   * **ANDROID** - Small icon resource name set on the notification.
+   */
+  smallIcon?: string;
+  /**
+   * **ANDROID** - Large icon set on the notification.
+   */
+  largeIcon?: string;
+  /**
+   * **ANDROID** - Big picture image set on the notification.
+   */
+  bigPicture?: string;
+  /**
+   * **ANDROID** - Accent color shown around small notification icon on Android 5+ devices. ARGB format.
+   */
+  smallIconAccentColor?: string;
+  /**
+   * URL to open when opening the notification.
+   */
+  launchUrl?: string;
+  /**
+   * Sound resource to play when the notification is shown.
+   */
+  sound: string;
+  /**
+   * **ANDROID** - Devices that have a notification LED will blink in this color. ARGB format.
+   */
+  ledColor?: string;
+  lockScreenVisibility?: OSLockScreenVisibility;
+  /**
+   * **ANDROID** - Notifications with this same key will be grouped together as a single summary notification.
+   */
+  groupKey?: string;
+  /**
+   * **ANDROID** - Summary text displayed in the summary notification.
+   */
+  groupMessage?: string;
+  /**
+   * List of action buttons on the notification.
+   */
+  actionButtons: OSActionButton[];
+  /**
+   * **ANDROID** - The Google project number the notification was sent under.
+   */
+  fromProjectNumber?: string;
+  /**
+   * **ANDROID** - If a background image was set this object will be available.
+   */
+  backgroundImageLayout?: OSBackgroundImageLayout;
+  priority?: number;
+  /**
+   * List of action buttons on the notification.
+   */
+  rawPayload: string;
+}
+
+/**
+ * List of action buttons on the notification.
+ */
+export interface OSActionButton {
+  /**
+   * Id assigned to the button.
+   */
+  id: string;
+  /**
+   * Text show on the button to the user.
+   */
+  text: string;
+  /**
+   * **ANDROID** - Icon shown on the button.
+   */
+  icon: string;
+}
+
+/**
+ * **ANDROID** - If a background image was set, this object will be available.
+ */
+export interface OSBackgroundImageLayout {
+  /**
+   * Image URL or name used as the background image.
+   */
+  image: string;
+  /**
+   * Text color of the title on the notification. ARGB Format.
+   */
+  titleTextColor: string;
+  /**
+   * Text color of the body on the notification. ARGB Format.
+   */
+  bodyTextColor: string;
+}
+
+/**
+ * The information returned from a notification the user received.
+ */
+export interface OSNotificationOpenedResult {
+  action: {
+    /**
+     * Was the notification opened normally (`Opened`) or was a button pressed on the notification (`ActionTaken`).
+     */
+    type: OSActionType;
+    /**
+     * If `type` == `ActionTaken` then this will contain the id of the button pressed.
+     */
+    actionID?: string;
+  };
+  notification: OSNotification;
+}
+
+export enum OSActionType {
+  Opened = 0,
+  ActionTake = 1
+}
+
+/**
+ * @name OneSignal
+ * @description
+ * The OneSignal plugin is an client implementation for using the [OneSignal](https://onesignal.com/) Service.
+ * OneSignal is a simple implementation for delivering push notifications.
+ *
+ * Requires Cordova plugin: `onesignal-cordova-plugin`. For more info, please see the [OneSignal Cordova Docs](https://documentation.onesignal.com/docs/phonegap-sdk-installation).
+ *
+ * @usage
+ * ```typescript
+ * import { OneSignal } from 'ionic-native';
+ *
+ * OneSignal.startInit('b2f7f966-d8cc-11e4-bed1-df8f05be55ba', '703322744261');
+ *
+ * OneSignal.inFocusDisplaying(OneSignal.OSInFocusDisplayOption.InAppAlert);
+ *
+ * OneSignal.handleNotificationReceived().subscribe(() => {
+ *  // do something when notification is received
+ * });
+ *
+ * OneSignal.handleNotificationOpened().subscribe(() => {
+ *   // do something when a notification is opened
+ * });
+ *
+ * OneSignal.endInit();
+ * ```
+ * @interfaces
+ * OSNotification
+ * OSLockScreenVisibility
+ * OSDisplayType
+ * OSNotificationPayload
+ * OSActionButton
+ * OSBackgroundImageLayout
+ * OSNotificationOpenedResult
+ * OSActionType
+ */
+@Plugin({
+  pluginName: 'OneSignal',
+  plugin: 'onesignal-cordova-plugin',
+  pluginRef: 'plugins.OneSignal',
+  repo: 'https://github.com/OneSignal/OneSignal-Cordova-SDK',
+  platforms: ['Android', 'iOS', 'Windows', 'FireOS']
+})
+export class OneSignal {
+
+  /**
+   * constants to use in inFocusDisplaying()
+   */
+  static OSInFocusDisplayOption = {
+    None: 0,
+    InAppAlert : 1,
+    Notification : 2
+  };
+
+  /**
+   * Start the initialization process. Once you are done configuring OneSignal, call the `endInit` function.
+   *
+   * @param {string} appId Your OneSignal app id
+   * @param {string} googleProjectNumber **ANDROID** - your Google project number; only required for Android GCM/FCM pushes.
+   * @returns {any}
+   */
+  @Cordova({ sync: true })
+  static startInit(appId: string, googleProjectNumber?: string): any { return; }
+
+  /**
+   * Callback to run when a notification is received, whether it was displayed or not.
+   *
+   * @return {Observable<OneSignalReceivedNotification>}
+   */
+  @Cordova({
+    observable: true
+  })
+  static handleNotificationReceived(): Observable<OSNotification> { return; }
+
+  /**
+   * Callback to run when a notification is tapped on from the notification shade (**ANDROID**) or notification
+   * center (**iOS**), or when closing an Alert notification shown in the app (if InAppAlert is enabled in
+   * inFocusDisplaying).
+   *
+   * @return {Observable<OneSignalOpenedNotification>}
+   */
+  @Cordova({
+    observable: true
+  })
+  static handleNotificationOpened(): Observable<OSNotificationOpenedResult> { return; }
+
+  /**
+   * **iOS** - Settings for iOS apps
+   *
+   * @param settings
+   *  kOSSettingsKeyAutoPrompt: boolean = true
+   *  Auto prompt user for notification permissions.
+   *
+   *  kOSSettingsKeyInAppLaunchURL: boolean = false
+   *  Launch notifications with a launch URL as an in app webview.
+   * @returns {any}
+   */
+  @Cordova({ sync: true })
+  static iOSSettings(settings: {
+    kOSSettingsKeyAutoPrompt: boolean;
+    kOSSettingsKeyInAppLaunchURL: boolean;
+  }): any { return; }
+
+  /**
+   * Must be called after `startInit` to complete initialization of OneSignal.
+   *
+   * @returns {any}
+   */
+  @Cordova({ sync: true })
+  static endInit(): any { return; }
+
+  /**
+   * Retrieve a list of tags that have been set on the user from the OneSignal server.
+   *
+   * @returns {Promise<any>} Returns a Promise that resolves when tags are recieved.
+   */
+  @Cordova()
+  static getTags(): Promise<any> { return; }
+
+  /**
+   * Lets you retrieve the OneSignal user id and device token.
+   * Your handler is called after the device is successfully registered with OneSignal.
+   *
+   * @returns {Promise<Object>} Returns a Promise that resolves if the device was successfully registered.
+   *
+   *  userId {string} OneSignal userId is a UUID formatted string. (unique per device per app)
+   *
+   *  pushToken {string} A push token is a Google/Apple assigned identifier(unique per device per app).
+   */
+  @Cordova()
+  static getIds(): Promise<{userId: string; pushToken: string}> { return; }
+
+
+  /**
+   * Tag a user based on an app event of your choosing so later you can create segments on [onesignal.com](https://onesignal.com/) to target these users.
+   * Recommend using sendTags over sendTag if you need to set more than one tag on a user at a time.
+   *
+   * @param {string} Key of your choosing to create or update.
+   * @param {string} Value to set on the key. NOTE: Passing in a blank String deletes the key, you can also call deleteTag.
+   */
+  @Cordova({ sync: true })
+  static sendTag(key: string, value: string): void { }
+
+  /**
+   * Tag a user based on an app event of your choosing so later you can create segments on [onesignal.com](https://onesignal.com/) to target these users.
+   * Recommend using sendTags over sendTag if you need to set more than one tag on a user at a time.
+   *
+   * @param {string} Pass a json object with key/value pairs like: {key: "value", key2: "value2"}
+   */
+  @Cordova({ sync: true })
+  static sendTags(json: any): void { }
+
+  /**
+   * Deletes a tag that was previously set on a user with `sendTag` or `sendTags`. Use `deleteTags` if you need to delete more than one.
+   *
+   * @param {string} Key to remove.
+   */
+  @Cordova({ sync: true })
+  static deleteTag(key: string): void { }
+
+  /**
+   * Deletes tags that were previously set on a user with `sendTag` or `sendTags`.
+   *
+   * @param {Array<string>} Keys to remove.
+   */
+  @Cordova({ sync: true })
+  static deleteTags(keys: string[]): void { }
+
+  /**
+   * Call this when you would like to prompt an iOS user to accept push notifications with the default system prompt.
+   * Only works if you set `kOSSettingsAutoPrompt` to `false` in `iOSSettings`
+   */
+  @Cordova({ sync: true })
+  static registerForPushNotifications(): void { }
+
+  /**
+  * Warning:
+  * Only applies to Android and Amazon. You can call this from your UI from a button press for example to give your user's options for your notifications.
+  *
+  * By default OneSignal always vibrates the device when a notification is displayed unless the device is in a total silent mode.
+  * Passing false means that the device will only vibrate lightly when the device is in it's vibrate only mode.
+  *
+  * @param {boolean} false to disable vibrate, true to re-enable it.
+  */
+  @Cordova({ sync: true })
+  static enableVibrate(enable: boolean): void { }
+
+  /**
+  * Warning:
+  * Only applies to Android and Amazon. You can call this from your UI from a button press for example to give your user's options for your notifications.
+  *
+  * By default OneSignal plays the system's default notification sound when the device's notification system volume is turned on.
+  * Passing false means that the device will only vibrate unless the device is set to a total silent mode.
+  *
+  * @param {boolean} false to disable sound, true to re-enable it.
+  */
+  @Cordova({ sync: true })
+  static enableSound(enable: boolean): void { }
+
+  /**
+  *
+  * Setting to control how OneSignal notifications will be shown when one is received while your app is in focus. By default this is set to inAppAlert, which can be helpful during development.
+  *
+  * @param {DisplayType} displayOption
+  * @returns {any}
+  */
+  @Cordova({ sync: true })
+  static inFocusDisplaying(displayOption: OSDisplayType): any { return; }
+
+  /**
+  * You can call this method with false to opt users out of receiving all notifications through OneSignal.
+  * You can pass true later to opt users back into notifications.
+  *
+  * @param {boolean} enable
+  */
+  @Cordova({ sync: true })
+  static setSubscription(enable: boolean): void { }
+
+  /**
+  *
+  * @param {notificationObj} Parameters see POST [documentation](https://documentation.onesignal.com/v2.0/docs/notifications-create-notification)
+  * @returns {Promise<any>} Returns a Promise that resolves if the notification was send successfully.
+  */
+  @Cordova()
+  static postNotification(notificationObj: OSNotification): Promise<any> { return; }
+
+  /**
+  * Prompts the user for location permission to allow geotagging based on the "Location radius" filter on the OneSignal dashboard.
+  */
+  @Cordova({ sync: true })
+  static promptLocation(): void { }
+
+  /**
+   *
+   * @param email {string}
+   */
+  @Cordova({ sync: true })
+  static syncHashedEmail(email: string): void { }
+
+  /**
+  * Enable logging to help debug if you run into an issue setting up OneSignal.
+  * The logging levels are as follows: 0 = None, 1= Fatal, 2 = Errors, 3 = Warnings, 4 = Info, 5 = Debug, 6 = Verbose
+
+  * The higher the value the more information is shown.
+  *
+  * @param {loglevel} contains two properties: logLevel (for console logging) and visualLevel (for dialog messages)
+  */
+  @Cordova({ sync: true })
+  static setLogLevel(logLevel: {
+    logLevel: number,
+    visualLevel: number
+  }): void { }
+
+}
--- a/src/plugins/plugin.ts
+++ b/src/plugins/plugin.ts
@@ -108,7 +108,7 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts

  let pluginInstance = getPlugin(pluginObj.pluginRef);

-  if (!pluginInstance) {
+  if (!pluginInstance || pluginInstance[methodName] === 'undefined') {
    // Do this check in here in the case that the Web API for this plugin is available (for example, Geolocation).
    if (!window.cordova) {
      cordovaWarn(pluginObj.pluginName, methodName);
@@ -123,11 +123,13 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts
    };
  }

-  // TODO: Illegal invocation needs window context
-  return get(window, pluginObj.pluginRef)[methodName].apply(pluginInstance, args);
+  return pluginInstance[methodName].apply(pluginInstance, args);
 }

-function getPromise(cb) {
+/**
+ * @private
+ */
+export function getPromise(cb) {

  const tryNativePromise = () => {
    if (window.Promise) {
@@ -191,7 +193,7 @@ function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: a
      try {
        if (opts.clearFunction) {
          if (opts.clearWithArgs) {
-            return get(window, pluginObj.pluginRef)[opts.clearFunction].apply(pluginObj, args);
+            return callCordovaPlugin(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
          }
          return get(window, pluginObj.pluginRef)[opts.clearFunction].call(pluginObj, pluginResult);
        }
@@ -318,6 +320,36 @@ export const wrap = function(pluginObj: any, methodName: string, opts: any = {})
  };
 };

+/**
+ * @private
+ */
+export interface PluginConfig {
+  /**
+   * Plugin name, this should match the class name
+   */
+  pluginName: string;
+  /**
+   * Plugin NPM package name
+   */
+  plugin: string;
+  /**
+   * Plugin object reference
+   */
+  pluginRef: string;
+  /**
+   * Github repository URL
+   */
+  repo: string;
+  /**
+   * Custom install command
+   */
+  install?: string;
+  /**
+   * Supported platforms
+   */
+  platforms?: string[];
+}
+
 /**
 * @private
 *
@@ -337,7 +369,7 @@ export const wrap = function(pluginObj: any, methodName: string, opts: any = {})
 *  }
 * ```
 */
-export function Plugin(config) {
+export function Plugin(config: PluginConfig) {
  return function(cls) {

    // Add these fields to the class
@@ -404,43 +436,47 @@ export function CordovaInstance(opts: any = {}) {
 *
 * Before calling the original method, ensure Cordova and the plugin are installed.
 */
-export function CordovaProperty(target: Function, key: string, descriptor: TypedPropertyDescriptor<any>) {
-  let originalMethod = descriptor.get;
-
-  descriptor.get = function(...args: any[]) {
-    if (!window.cordova) {
-      cordovaWarn(this.name, null);
-      return {};
+export function CordovaProperty(target: any, key: string) {
+  const exists = () => {
+    let pluginInstance = getPlugin(target.pluginRef);
+    if (!pluginInstance || typeof pluginInstance[key] === 'undefined') {
+      pluginWarn(target, key);
+      return false;
    }
-    let pluginObj: any = this;
-    let pluginInstance = getPlugin(pluginObj.pluginRef);
-    if (!pluginInstance) {
-      pluginWarn(this, key);
-      return {};
-    }
-    return originalMethod.apply(this, args);
+    return true;
  };

-  return descriptor;
+  Object.defineProperty(target, key, {
+    get: () => {
+      if (exists()) {
+        return getPlugin(target.pluginRef)[key];
+      } else {
+        return null;
+      }
+    },
+    set: (value) => {
+      if (exists()) {
+        getPlugin(target.pluginRef)[key] = value;
+      }
+    }
+  });
 }

 /**
 * @private
 * @param target
 * @param key
- * @param descriptor
 * @constructor
 */
-export function InstanceProperty(target: any, key: string, descriptor: TypedPropertyDescriptor<any>) {
-  descriptor.get = function() {
-    return this._objectInstance[key];
-  };
-
-  descriptor.set = function(...args: any[]) {
-    this._objectInstance[key] = args[0];
-  };
-
-  return descriptor;
+export function InstanceProperty(target: any, key: string) {
+  Object.defineProperty(target, key, {
+    get: function(){
+      return this._objectInstance[key];
+    },
+    set: function(value){
+      this._objectInstance[key] = value;
+    }
+  });
 }

 /**
--- a/src/plugins/printer.ts
+++ b/src/plugins/printer.ts
@@ -59,6 +59,8 @@ export interface PrintOptions {
 *
 * Printer.print(content, options).then(onSuccess, onError);
 * ```
+ * @interfaces
+ * PrintOptions
 */
@Plugin({
  pluginName: 'Printer',
--- a/src/plugins/push.ts
+++ b/src/plugins/push.ts
@@ -36,7 +36,7 @@ export interface NotificationEventResponse {
  /**
   * An optional collection of data sent by the 3rd party push service that does not fit in the above properties.
   */
-  additionalData: NotificationEventAdditionalData;
+  additionalData: NotificationEventAdditionalData | any;
 }

 /**
@@ -110,6 +110,25 @@ export interface PushNotification {
  unregister(successHandler: () => any, errorHandler?: () => any): void;

  /**
+   * The subscribe method is used when the application wants to subscribe a new topic to receive push notifications.
+   * @param {string} topic: Topic to subscribe to.
+   * @param successHandler
+   * @param errorHandler
+   */
+  subscribe(topic: string, successHandler: () => any, errorHandler?: () => any): void;
+
+  /**
+   * The unsubscribe method is used when the application no longer wants to receive push notifications
+   * from a specific topic but continue to receive other push messages.
+   * @param {string} topic: Topic to subscribe to.
+   * @param successHandler
+   * @param errorHandler
+   */
+  unsubscribe(topic: string, successHandler: () => any, errorHandler?: () => any): void;
+
+  /**
+   * iOS & android only
+   *
   * Set the badge count visible when the app is not running
   *
   * The count is an integer indicating what number should show up in the badge.
@@ -121,6 +140,8 @@ export interface PushNotification {
   */
  setApplicationIconBadgeNumber(successHandler: () => any, errorHandler: () => any, count?: number): void;
  /**
+   * iOS only
+   *
   * Get the current badge count visible when the app is not running
   * successHandler gets called with an integer which is the current badge count
   * @param successHandler
@@ -130,6 +151,7 @@ export interface PushNotification {

  /**
   * iOS only
+   *
   * Tells the OS that you are done processing a background push notification.
   * successHandler gets called when background push processing is successfully completed.
   * @param successHandler
@@ -137,6 +159,16 @@ export interface PushNotification {
   * @param id
   */
  finish(successHandler: () => any, errorHandler: () => any, id?: string): void;
+
+  /**
+   * iOS & android only
+   *
+   * Tells the OS to clear all notifications from the Notification Center.
+   * successHandler gets called when the api successfully clears the notifications
+   * @param successHandler
+   * @param errorHandler
+   */
+  clearAllNotifications(successHandler: () => any, errorHandler: () => any): void;
 }

 export interface IOSPushOptions {
--- a/src/plugins/rollbar.ts
+++ b/src/plugins/rollbar.ts
@@ -0,0 +1,34 @@
+import { Plugin, Cordova } from './plugin';
+
+/**
+ * @beta
+ * @name Rollbar
+ * @description
+ * This plugin adds Rollbar App monitoring to your application
+ *
+ * @usage
+ * ```
+ * import { Rollbar } from 'ionic-native';
+ *
+ * Rollbar.init();
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Rollbar',
+  plugin: 'resgrid-cordova-plugins-rollbar',
+  pluginRef: 'Rollbar',
+  repo: 'https://github.com/Resgrid/cordova-plugins-rollbar',
+  platforms: ['Android', 'iOS'],
+  install: 'ionic plugin add resgrid-cordova-plugins-rollbar --variable ROLLBAR_ACCESS_TOKEN="YOUR_ROLLBAR_ACCEESS_TOKEN" --variable ROLLBAR_ENVIRONMENT="ROLLBAR_ENVIRONMENT"'
+})
+export class Rollbar {
+
+  /**
+   * This function initializes the monitoring of your application
+   * @return {Promise<any>} Returns a promise that resolves when the plugin successfully initializes
+   */
+  @Cordova()
+  static init(): Promise<any> { return; }
+
+}
--- a/src/plugins/safari-view-controller.ts
+++ b/src/plugins/safari-view-controller.ts
@@ -1,5 +1,15 @@
 import { Cordova, Plugin } from './plugin';

+export interface SafariViewControllerOptions {
+  url?: string;
+  hidden?: boolean;
+  toolbarColor?: string;
+  animated?: boolean;
+  showDefaultShareMenuItem?: boolean;
+  enterReaderModeIfAvailable?: boolean;
+  tintColor?: string;
+  transition?: string;
+}

 /**
 * @name SafariViewController
@@ -37,6 +47,8 @@ import { Cordova, Plugin } from './plugin';
 *     }
 *   );
 * ```
+ * @interfaces
+ * SafariViewControllerOptions
 */
@Plugin({
  pluginName: 'SafariViewController',
@@ -91,14 +103,3 @@ export class SafariViewController {
  static mayLaunchUrl(url: string): Promise<any> { return; }

 }
-
-export interface SafariViewControllerOptions {
-  url?: string;
-  hidden?: boolean;
-  toolbarColor?: string;
-  animated?: boolean;
-  showDefaultShareMenuItem?: boolean;
-  enterReaderModeIfAvailable?: boolean;
-  tintColor?: string;
-  transition?: string;
-}
--- a/src/plugins/screen-orientation.ts
+++ b/src/plugins/screen-orientation.ts
@@ -59,11 +59,9 @@ export class ScreenOrientation {
  @Cordova({ sync: true })
  static unlockOrientation(): void { }

-  /*
+  /**
   * Get the current orientation of the device.
   */
  @CordovaProperty
-  static get orientation() {
-    return window.screen.orientation;
-  }
+  static orientation: string;
 }
--- a/src/plugins/serial.ts
+++ b/src/plugins/serial.ts
@@ -0,0 +1,111 @@
+import { Plugin, Cordova } from './plugin';
+import { Observable } from 'rxjs/Observable';
+
+declare var serial: any;
+
+export interface SerialPermissionOptions {
+  vid: string;
+  pid: string;
+  driver: string;
+}
+
+export interface SerialOpenOptions {
+  baudRate: number;
+}
+
+/**
+ * @name Serial
+ * @description
+ * This plugin provides functions for working with Serial connections
+ *
+ * @usage
+ *
+ * ```
+ * import { Serial } from 'ionic-native';
+ *
+ * Serial.requestPermission({
+ *   vid: '0403',
+ *   pid: '6001',
+ *   driver: 'FtdiSerialDriver'
+ * }).then(() => {
+ *   Serial.open({
+ *     baudRate: 38400
+ *   }).then(() => {
+ *     console.log('Serial connection opened');
+ *   });
+ * }).catch((error: any) => console.log(error));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Serial',
+  plugin: 'cordovarduino',
+  pluginRef: 'serial',
+  repo: 'https://github.com/xseignard/cordovarduino',
+  platforms: ['Android']
+})
+export class Serial {
+
+  /**
+   * Request permission to connect to a serial device
+   *
+   * @param options {SerialPermissionOptions} Options used to request serial permissions
+   * @return {Promise<any>} Returns a promise that resolves when permissions are granted
+   */
+  @Cordova()
+  static requestPermission(options: SerialPermissionOptions): Promise<any> { return; }
+
+  /**
+   * Open connection to a serial device
+   *
+   * @param options {SerialOpenOptions} Options used to open serial connection
+   * @return {Promise<any>} Returns a promise that resolves when the serial connection is opened
+   */
+  @Cordova()
+  static open(options: SerialOpenOptions): Promise<any> { return; }
+
+  /**
+   * Write to a serial connection
+   *
+   * @param data {any} data to write to the serial connection
+   * @return {Promise<any>} Returns a promise that resolves when the write is complete
+   */
+  @Cordova()
+  static write(data: any): Promise<any> { return; }
+
+  /**
+   * Write hex to a serial connection
+   *
+   * @param data {any} data to write to the serial connection
+   * @return {Promise<any>} Returns a promise that resolves when the write is complete
+   */
+  @Cordova()
+  static writeHex(data: any): Promise<any> { return; }
+
+  /**
+   * Read from a serial connection
+   *
+   * @return {Promise<any>} Returns a promise that resolves with data read from the serial connection
+   */
+  @Cordova()
+  static read(): Promise<any> { return; }
+
+  /**
+   * Watch the incoming data from the serial connection. Clear the watch by unsubscribing from the observable
+   *
+   * @returns {Observable<any>} Observable returns an observable that you can subscribe to
+   */
+  @Cordova({
+    observable: true
+  })
+  static registerReadCallback(): Observable<any> { return; }
+
+  /**
+   * Close the serial connection
+   *
+   * @return {Promise<any>} Returns a promise that resolves when the serial connection is closed
+   */
+  @Cordova()
+  static close(): Promise<any> { return; }
+
+}
--- a/src/plugins/sim.ts
+++ b/src/plugins/sim.ts
@@ -17,6 +17,15 @@ import { Cordova, Plugin } from './plugin';
 *   (info) => console.log('Sim info: ', info),
 *   (err) => console.log('Unable to get sim info: ', err)
 * );
+ *
+ * Sim.hasReadPermission().then(
+ *   (info) => console.log('Has permission: ', info)
+ * );
+ *
+ * Sim.requestReadPermission().then(
+ *   () => console.log('Permission granted'),
+ *   () => console.log('Permission denied')
+ * );
 * ```
 */
@Plugin({
@@ -34,4 +43,21 @@ export class Sim {
  @Cordova()
  static getSimInfo(): Promise<any> { return; }

+  /**
+   * Check permission
+   * @returns {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  static hasReadPermission(): Promise<any> { return; }
+
+  /**
+   * Request permission
+   * @returns {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  static requestReadPermission(): Promise<any> { return; }
 }
--- a/src/plugins/sms.ts
+++ b/src/plugins/sms.ts
@@ -38,6 +38,9 @@ export interface SmsOptionsAndroid {
 * // Send a text message using default options
 * SMS.send('416123456', 'Hello world!');
 * ```
+ * @interfaces
+ * SmsOptions
+ * SmsOptionsAndroid
 */
@Plugin({
  pluginName: 'SMS',
@@ -55,7 +58,10 @@ export class SMS {
   * @param options {SmsOptions} Options
   * @returns {Promise<any>} Resolves promise when the SMS has been sent
   */
-  @Cordova()
+  @Cordova({
+    successIndex: 3,
+    errorIndex: 4
+  })
  static send(
    phoneNumber: string | string[],
    message: string,
--- a/src/plugins/speech-recognition.ts
+++ b/src/plugins/speech-recognition.ts
@@ -0,0 +1,157 @@
+import { Plugin, Cordova } from './plugin';
+import { Observable } from 'rxjs/Observable';
+
+export type SpeechRecognitionListeningOptions = SpeechRecognitionListeningOptionsIOS | SpeechRecognitionListeningOptionsAndroid;
+
+export interface SpeechRecognitionListeningOptionsIOS {
+  /**
+   * used language for recognition (default `"en-US"`)
+   */
+  language?: string;
+
+  /**
+   * umber of return matches (default `5`)
+   */
+  matches?: number;
+
+  /**
+   * Allow partial results to be returned (default `false`)
+   */
+  showPartial?: boolean;
+}
+
+export interface SpeechRecognitionListeningOptionsAndroid {
+  /**
+   * used language for recognition (default `"en-US"`)
+   */
+  language?: string;
+
+  /**
+   * number of return matches (maximum number of matches)
+   */
+  matches?: number;
+
+  /**
+   * displayed prompt of listener popup window
+   */
+  prompt?: string;
+
+  /**
+   * display listener popup window with prompt (default `true`)
+   */
+  showPopup?: boolean;
+}
+
+/**
+ * @beta
+ * @name SpeechRecognition
+ * @description
+ * This plugin does speech recognition using cloud services
+ *
+ * @usage
+ * ```
+ * import { SpeechRecognition } from 'ionic-native';
+ *
+ * // Check feature available
+ * SpeechRecognition.isRecognitionAvailable()
+ *   .then((available: boolean) => console.log(available))
+ *
+ * // Start the recognition process
+ * SpeechRecognition.startListening(options)
+ *   .subscribe(
+ *     (matches: Array<string>) => console.log(matches),
+ *     (onerror) => console.log('error:', onerror)
+ *   )
+ *
+ * // Stop the recognition process (iOS only)
+ * SpeechRecognition.stopListening()
+ *
+ * // Get the list of supported languages
+ * SpeechRecognition.getSupportedLanguages()
+ *   .then(
+ *     (languages: Array<string>) => console.log(languages),
+ *     (error) => console.log(error)
+ *   )
+ *
+ * // Check permission
+ * SpeechRecognition.hasPermission()
+ *   .then((hasPermission: boolean) => console.log(hasPermission))
+ *
+ * // Request permissions
+ * SpeechRecognition.requestPermission()
+ *   .then(
+ *     () => console.log('Granted'),
+ *     () => console.log('Denied')
+ *   )
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'SpeechRecognition',
+  plugin: 'cordova-plugin-speechrecognition',
+  pluginRef: 'plugins.speechRecognition',
+  repo: 'https://github.com/pbakondy/cordova-plugin-speechrecognition',
+  platforms: ['Android', 'iOS']
+})
+export class SpeechRecognition {
+
+  /**
+   * Check feature available
+   * @return {Promise<boolean>}
+   */
+  @Cordova()
+  static isRecognitionAvailable(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Start the recognition process
+   * @return {Promise< Array<string> >} list of recognized terms
+   */
+  @Cordova({
+    callbackOrder: 'reverse',
+    observable: true,
+
+  })
+  static startListening(options?: SpeechRecognitionListeningOptions): Observable<Array<string>> {
+    return;
+  }
+
+  /**
+   * Stop the recognition process
+   */
+  @Cordova({
+    platforms: ['iOS']
+  })
+  static stopListening(): Promise<void> {
+    return;
+  }
+
+  /**
+   * Get the list of supported languages
+   * @return {Promise< Array<string> >} list of languages
+   */
+  @Cordova()
+  static getSupportedLanguages(): Promise<Array<string>> {
+    return;
+  }
+
+  /**
+   * Check permission
+   * @return {Promise<boolean>} has permission
+   */
+  @Cordova()
+  static hasPermission(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Request permissions
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  static requestPermission(): Promise<void> {
+    return;
+  }
+
+}
--- a/src/plugins/spinnerdialog.ts
+++ b/src/plugins/spinnerdialog.ts
@@ -1,5 +1,11 @@
 import { Cordova, Plugin } from './plugin';

+export interface SpinnerDialogIOSOptions {
+  overlayOpacity?: number;
+  textColorRed?: number;
+  textColorGreen?: number;
+  textColorBlue?: number;
+}

 /**
 * @name Spinner Dialog
@@ -13,6 +19,8 @@ import { Cordova, Plugin } from './plugin';
 *
 * SpinnerDialog.hide();
 * ```
+ * @interfaces
+ * SpinnerDialogIOSOptions
 */
@Plugin({
  pluginName: 'SpinnerDialog',
@@ -44,10 +52,3 @@ export class SpinnerDialog {
  static hide(): void {}

 }
-
-export interface SpinnerDialogIOSOptions {
-  overlayOpacity?: number;
-  textColorRed?: number;
-  textColorGreen?: number;
-  textColorBlue?: number;
-}
--- a/src/plugins/sqlite.ts
+++ b/src/plugins/sqlite.ts
@@ -1,4 +1,4 @@
-import {Cordova, CordovaInstance, Plugin, pluginWarn} from './plugin';
+import {Cordova, CordovaInstance, Plugin, pluginWarn, InstanceProperty} from './plugin';


 declare var sqlitePlugin;
@@ -14,6 +14,20 @@ declare var sqlitePlugin;
 * ```typescript
 * import { SQLite } from 'ionic-native';
 *
+ * // OPTION A: Use static constructor
+ * SQLite.openDatabase({
+ *   name: 'data.db',
+ *   location: 'default'
+ * })
+ *   .then((db: SQLite) => {
+ *
+ *     db.executeSql('create table danceMoves(name VARCHAR(32))', {}).then(() => {}).catch(() => {});
+ *
+ *   })
+ *   .catch(error => console.error('Error opening database', error);
+ *
+ *
+ * // OPTION B: Create a new instance of SQLite
 * let db = new SQLite();
 * db.openDatabase({
 *   name: 'data.db',
@@ -39,38 +53,22 @@ declare var sqlitePlugin;
 export class SQLite {

  private _objectInstance: any;
-  get databaseFeatures(): any {
-    return this._objectInstance.databaseFeatures;
-  }
+
+  @InstanceProperty databaseFeatures: any;

  constructor() { }

+  static openDatabase(config: any): Promise<SQLite> {
+    return new SQLite().openDatabase(config);
+  }
+
+
  /**
   * Open or create a SQLite database file.
   *
   * See the plugin docs for an explanation of all options: https://github.com/litehelpers/Cordova-sqlite-storage#opening-a-database
   *
   * @param config the config for opening the database.
-   * @returns {Promise<any>}
-   * @usage
-   *
-   * ```typescript
-   * import { SQLite } from 'ionic-native';
-   *
-   * let db = new SQLite();
-   * db.openDatabase({
-   *   name: 'data.db',
-   *   location: 'default' // the location field is required
-   * }).then(() => {
-   *   db.executeSql('create table danceMoves(name VARCHAR(32))', {}).then(() => {
-   *
-   *   }, (err) => {
-   *     console.error('Unable to execute sql', err);
-   *   })
-   * }, (err) => {
-   *   console.error('Unable to open database', err);
-   * });
-   * ```
   */
  openDatabase(config: any): Promise<any> {
    return new Promise((resolve, reject) => {
@@ -132,18 +130,6 @@ export class SQLite {
  /**
   * Execute SQL on the opened database. Note, you must call `openDatabase` first, and
   * ensure it resolved and successfully opened the database.
-   *
-   * @usage
-   *
-   * ```typescript
-   * db.executeSql('SELECT FROM puppies WHERE type = ?', ['cavalier']).then((resultSet) => {
-   *   // Access the items through resultSet.rows
-   *   // resultSet.rows.item(i)
-   * }, (err) => {})
-   * ```
-   * @param statement {string}
-   * @param params {any}
-   * @returns {Promise<any>}
   */
  @CordovaInstance()
  executeSql(statement: string, params: any): Promise<any> { return; }
--- a/src/plugins/statusbar.ts
+++ b/src/plugins/statusbar.ts
@@ -117,6 +117,6 @@ export class StatusBar {
   * Whether the StatusBar is currently visible or not.
   */
  @CordovaProperty
-  static get isVisible() { return window.StatusBar.isVisible; }
+  static isVisible: boolean;

 }
--- a/src/plugins/streaming-media.ts
+++ b/src/plugins/streaming-media.ts
@@ -1,4 +1,20 @@
 import { Plugin, Cordova } from './plugin';
+
+export interface StreamingVideoOptions {
+  successCallback?: Function;
+  errorCallback?: Function;
+  orientation?: string;
+}
+
+export interface StreamingAudioOptions {
+  bgColor?: string;
+  bgImage?: string;
+  bgImageScale?: string;
+  initFullscreen?: boolean;
+  successCallback?: Function;
+  errorCallback?: Function;
+}
+
 /**
 * @name StreamingMedia
 * @description
@@ -17,6 +33,9 @@ import { Plugin, Cordova } from './plugin';
 * StreamingMedia.('https://path/to/video/stream', options);
 *
 * ```
+ * @interfaces
+ * StreamingVideoOptions
+ * StreamingAudioOptions
 */
@Plugin({
  pluginName: 'StreamingMedia',
@@ -61,18 +80,3 @@ export class StreamingMedia {
  static resumeAudio(): void { }

 }
-
-export interface StreamingVideoOptions {
-  successCallback?: Function;
-  errorCallback?: Function;
-  orientation?: string;
-}
-
-export interface StreamingAudioOptions {
-  bgColor?: string;
-  bgImage?: string;
-  bgImageScale?: string;
-  initFullscreen?: boolean;
-  successCallback?: Function;
-  errorCallback?: Function;
-}
--- a/src/plugins/stripe.ts
+++ b/src/plugins/stripe.ts
@@ -0,0 +1,106 @@
+import {Plugin, Cordova} from './plugin';
+
+export interface StripeCardTokenParams {
+  /**
+   * Card number
+   */
+  number: string;
+  /**
+   * Expiry month
+   */
+  expMonth: number;
+  /**
+   * Expiry year
+   */
+  expYear: number;
+  /**
+   * CVC / CVV
+   */
+  cvc?: string;
+  /**
+   * Cardholder name
+   */
+  name?: string;
+  /**
+   * Address line 1
+   */
+  address_line1?: string;
+  /**
+   * Address line 2
+   */
+  address_line2?: string;
+  /**
+   * City
+   */
+  address_city?: string;
+  /**
+   * State / Province
+   */
+  address_state?: string;
+  /**
+   * Country
+   */
+  address_country?: string;
+  /**
+   * Postal code / ZIP Code
+   */
+  postal_code?: string;
+  /**
+   * 3-letter ISO code for currency
+   */
+  currency?: string;
+}
+
+/**
+ * @beta
+ * @name Stripe
+ * @description
+ * A plugin that allows you to use Stripe's Native SDKs for Android and iOS.
+ *
+ * @usage
+ * ```
+ * import { Stripe } from 'ionic-native';
+ *
+ * Stripe.setPublishableKey('my_publishable_key');
+ *
+ * let card = {
+ *  number: '4242424242424242',
+ *  expMonth: 12,
+ *  expYear: 2020,
+ *  cvc: 220
+ * };
+ *
+ * Stripe.createToken(card)
+ *    .then(token => console.log(token))
+ *    .catch(error => console.error(error));
+ *
+ * ```
+ *
+ * @interfaces
+ * StripeCardTokenParams
+ */
+@Plugin({
+  pluginName: 'Stripe',
+  plugin: 'cordova-plugin-stripe',
+  pluginRef: 'cordova.plugins.stripe',
+  repo: 'https://github.com/zyramedia/cordova-plugin-stripe'
+})
+export class Stripe {
+
+  /**
+   * Set publishable key
+   * @param publishableKey {string} Publishable key
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  static setPublishableKey(publishableKey: string): Promise<void> { return; }
+
+  /**
+   * Create Credit Card Token
+   * @param params {StripeCardTokenParams} Credit card information
+   * @return {Promise<string>} returns a promise that resolves with the token, or reject with an error
+   */
+  @Cordova()
+  static createCardToken(params: StripeCardTokenParams): Promise<string> { return; }
+
+}
--- a/src/plugins/text-to-speech.ts
+++ b/src/plugins/text-to-speech.ts
@@ -23,6 +23,8 @@ export interface TTSOptions {
 *   .catch((reason: any) => console.log(reason));
 *
 * ```
+ * @interfaces
+ * TTSOptions
 */
@Plugin({
  pluginName: 'TextToSpeech',
--- a/Show More
+++ b/Show More