diff --git a/accepts/index.d.ts b/accepts/index.d.ts
index ff6a9d0995..a12dcaf5c9 100644
--- a/accepts/index.d.ts
+++ b/accepts/index.d.ts
@@ -3,29 +3,60 @@
 // Definitions by: Stefan Reichel <https://github.com/bomret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="node" />
-import { IncomingMessage } from "http";
-
 declare namespace accepts {
+    export interface Headers {
+        [key: string]: string | string[];
+    }
+
     export interface Accepts {
-        charset(charsets: string[]): string | string[] | boolean;
-        charset(...charsets: string[]): string | string[] | boolean;
+        /**
+         * Return the first accepted charset. If nothing in `charsets` is accepted, then `false` is returned.
+         */
+        charset(charsets: string[]): string | false;
+        charset(...charsets: string[]): string | false;
+
+        /**
+         * Return the charsets that the request accepts, in the order of the client's preference (most preferred first).
+         */
         charsets(): string[];
 
-        encoding(encodings: string[]): string | string[] | boolean;
-        encoding(...encodings: string[]): string | string[] | boolean;
+        /**
+         * Return the first accepted encoding. If nothing in `encodings` is accepted, then `false` is returned.
+         */
+        encoding(encodings: string[]): string | false;
+        encoding(...encodings: string[]): string | false;
+
+        /**
+         * Return the encodings that the request accepts, in the order of the client's preference (most preferred first).
+         */
         encodings(): string[];
 
-        language(languages: string[]): string | string[] | boolean;
-        language(...languages: string[]): string | string[] | boolean;
+        /**
+         * Return the first accepted language. If nothing in `languages` is accepted, then `false` is returned.
+         */
+        language(languages: string[]): string | false;
+        language(...languages: string[]): string | false;
+
+        /**
+         * Return the languages that the request accepts, in the order of the client's preference (most preferred first).
+         */
         languages(): string[];
 
-        type(types: string[]): string | string[] | boolean;
-        type(...types: string[]): string | string[] | boolean;
+        /**
+         * Return the first accepted type (and it is returned as the same text as what appears in the `types` array). If nothing in `types` is accepted, then `false` is returned.
+         *
+         * The `types` array can contain full MIME types or file extensions. Any value that is not a full MIME types is passed to `require('mime-types').lookup`.
+         */
+        type(types: string[]): string | false;
+        type(...types: string[]): string | false;
+
+        /**
+         * Return the types that the request accepts, in the order of the client's preference (most preferred first).
+         */
         types(): string[];
     }
 }
 
-declare function accepts(req: IncomingMessage): accepts.Accepts;
+declare function accepts(req: { headers: accepts.Headers }): accepts.Accepts;
 
 export = accepts;
diff --git a/angular-gridster/index.d.ts b/angular-gridster/index.d.ts
index de60d6377b..fc0e990d41 100644
--- a/angular-gridster/index.d.ts
+++ b/angular-gridster/index.d.ts
@@ -32,7 +32,7 @@ declare module "angular" {
             // width of grid columns. "auto" will divide the width of the grid evenly among the columns
             colWidth?: string;
 
-            // height of grid rows. 'match' will make it the same as the column width, a numeric value will be interpreted as pixels, 
+            // height of grid rows. 'match' will make it the same as the column width, a numeric value will be interpreted as pixels,
             // '/2' is half the column width, '*5' is five times the column width, etc.
             rowHeight?: string;
 
@@ -84,7 +84,7 @@ declare module "angular" {
             // options to pass to resizable handler
             resizable?: {
 
-                // whether the items are resizable 
+                // whether the items are resizable
                 enabled?: boolean;
 
                 // location of the resize handles
@@ -104,7 +104,7 @@ declare module "angular" {
             // options to pass to draggable handler
             draggable?: {
 
-                // whether the items are resizable 
+                // whether the items are resizable
                 enabled?: boolean;
 
                 // Distance in pixels from the edge of the viewport after which the viewport should scroll, relative to pointer
@@ -142,4 +142,4 @@ declare module "angular" {
             col: number;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/angular-mocks/angular-mocks-tests.ts b/angular-mocks/angular-mocks-tests.ts
index 8ea42e4122..cabbf7c578 100644
--- a/angular-mocks/angular-mocks-tests.ts
+++ b/angular-mocks/angular-mocks-tests.ts
@@ -118,6 +118,7 @@ httpBackendService.flush();
 httpBackendService.flush(1234);
 httpBackendService.resetExpectations();
 httpBackendService.verifyNoOutstandingExpectation();
+httpBackendService.verifyNoOutstandingExpectation(false);
 httpBackendService.verifyNoOutstandingRequest();
 
 requestHandler = httpBackendService.expect('GET', 'http://test.local');
diff --git a/angular-mocks/index.d.ts b/angular-mocks/index.d.ts
index ddded4d0a8..8b94fab445 100644
--- a/angular-mocks/index.d.ts
+++ b/angular-mocks/index.d.ts
@@ -132,8 +132,9 @@ declare module 'angular' {
 
     /**
       * Verifies that all of the requests defined via the expect api were made. If any of the requests were not made, verifyNoOutstandingExpectation throws an exception.
+      * @param digest Do digest before checking expectation. Pass anything except false to trigger digest. NOTE this flag is purposely undocumented by Angular, which means it's not to be used in normal client code.
       */
-    verifyNoOutstandingExpectation(): void;
+    verifyNoOutstandingExpectation(digest?: boolean): void;
 
     /**
       * Verifies that there are no outstanding requests that need to be flushed.
diff --git a/angular/angular-component-router.d.ts b/angular/angular-component-router.d.ts
index 99ae821c72..92458331d6 100644
--- a/angular/angular-component-router.d.ts
+++ b/angular/angular-component-router.d.ts
@@ -1,9 +1,9 @@
+/* tslint:disable:dt-header variable-name */
 // Type definitions for Angular JS 1.5 component router
 // Project: http://angularjs.org
 // Definitions by: David Reher <http://github.com/davidreher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 declare namespace angular {
     /**
      * `Instruction` is a tree of {@link ComponentInstruction}s with all the information needed
@@ -263,7 +263,7 @@ declare namespace angular {
         /**
          * Subscribe to URL updates from the router
          */
-        subscribe(onNext: (value: any) => void): Object;
+        subscribe(onNext: (value: any) => void): {};
 
         /**
          * Removes the contents of this router's outlet and all descendant outlets
diff --git a/angular/angular-tests.ts b/angular/angular-tests.ts
index c6ee7c7a00..cca4dfc420 100644
--- a/angular/angular-tests.ts
+++ b/angular/angular-tests.ts
@@ -1,4 +1,3 @@
-
 // issue: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/369
 // https://github.com/witoldsz/angular-http-auth/blob/master/src/angular-http-auth.js
 /**
@@ -7,12 +6,14 @@
  * License: MIT
  */
 
+/* tslint:disable:no-empty no-shadowed-variable */
+
 class AuthService {
     /**
       * Holds all the requests which failed due to 401 response,
       * so they can be re-requested in future, once login is completed.
       */
-    buffer: { config: ng.IRequestConfig; deferred: ng.IDeferred<any>; }[] = [];
+    buffer: Array<{ config: ng.IRequestConfig; deferred: ng.IDeferred<any>; }> = [];
 
     /**
      * Required by HTTP interceptor.
@@ -20,34 +21,35 @@ class AuthService {
      */
     pushToBuffer = function(config: ng.IRequestConfig, deferred: ng.IDeferred<any>) {
         this.buffer.push({
-            config: config,
-            deferred: deferred
+            config,
+            deferred
         });
-    }
+    };
 
     $get = [
-        '$rootScope', '$injector', <any>function($rootScope: ng.IScope, $injector: ng.auto.IInjectorService) {
-            var $http: ng.IHttpService; //initialized later because of circular dependency problem
+        '$rootScope', '$injector', function($rootScope: ng.IScope, $injector: ng.auto.IInjectorService) {
+            let $http: ng.IHttpService; //initialized later because of circular dependency problem
             function retry(config: ng.IRequestConfig, deferred: ng.IDeferred<any>) {
                 $http = $http || $injector.get<ng.IHttpService>('$http');
-                $http(config).then(function (response) {
+                $http(config).then(function(response) {
                     deferred.resolve(response);
                 });
             }
             function retryAll() {
-                for (var i = 0; i < this.buffer.length; ++i) {
-                    retry(this.buffer[i].config, this.buffer[i].deferred);
+                for (const request of this.buffer) {
+                    retry(request.config, request.deferred);
                 }
+
                 this.buffer = [];
             }
 
             return {
-                loginConfirmed: function () {
+                loginConfirmed() {
                     $rootScope.$broadcast('event:auth-loginConfirmed');
                     retryAll();
                 }
-            }
-        }
+            };
+        } as any
     ];
 }
 
@@ -59,20 +61,20 @@ angular.module('http-auth-interceptor', [])
  * $http interceptor.
  * On 401 response - it stores the request and broadcasts 'event:angular-auth-loginRequired'.
  */
-    .config(['$httpProvider', 'authServiceProvider', <any>function ($httpProvider: ng.IHttpProvider, authServiceProvider: any) {
+    .config(['$httpProvider', 'authServiceProvider', function($httpProvider: ng.IHttpProvider, authServiceProvider: any) {
 
-        $httpProvider.defaults.headers.common = {'Authorization': 'Bearer token'};
+        $httpProvider.defaults.headers.common = {Authorization: 'Bearer token'};
         $httpProvider.defaults.headers.get['Authorization'] = 'Bearer token';
-        $httpProvider.defaults.headers.post['Authorization'] = function (config:ng.IRequestConfig):string { return 'Bearer token'; }
+        $httpProvider.defaults.headers.post['Authorization'] = function(config: ng.IRequestConfig): string { return 'Bearer token'; };
 
-        var interceptor = ['$rootScope', '$q', <any>function ($rootScope: ng.IScope, $q: ng.IQService) {
+        const interceptor = ['$rootScope', '$q', function($rootScope: ng.IScope, $q: ng.IQService) {
             function success(response: ng.IHttpPromiseCallbackArg<any>) {
                 return response;
             }
 
             function error(response: ng.IHttpPromiseCallbackArg<any>) {
                 if (response.status === 401) {
-                    var deferred = $q.defer<void>();
+                    const deferred = $q.defer<void>();
                     authServiceProvider.pushToBuffer(response.config, deferred);
                     $rootScope.$broadcast('event:auth-loginRequired');
                     return deferred.promise;
@@ -81,14 +83,13 @@ angular.module('http-auth-interceptor', [])
                 return $q.reject(response);
             }
 
-          return function (promise: ng.IHttpPromise<any>) {
+          return function(promise: ng.IHttpPromise<any>) {
                 return promise.then(success, error);
-            }
+            };
 
-      }];
+      } as any];
         $httpProvider.interceptors.push(interceptor);
-    }]);
-
+    } as any]);
 
 namespace HttpAndRegularPromiseTests {
     interface Person {
@@ -96,7 +97,7 @@ namespace HttpAndRegularPromiseTests {
         lastName: string;
     }
 
-    interface ExpectedResponse extends Person { }
+    type ExpectedResponse = Person;
 
     interface SomeControllerScope extends ng.IScope {
         person: Person;
@@ -106,13 +107,13 @@ namespace HttpAndRegularPromiseTests {
         nothing?: string;
     }
 
-    var someController: Function = ($scope: SomeControllerScope, $http: ng.IHttpService, $q: ng.IQService) => {
-        $http.get<ExpectedResponse>("http://somewhere/some/resource")
+    function someController($scope: SomeControllerScope, $http: ng.IHttpService, $q: ng.IQService) {
+        $http.get<ExpectedResponse>('http://somewhere/some/resource')
             .success((data: ExpectedResponse) => {
                 $scope.person = data;
             });
 
-        $http.get<ExpectedResponse>("http://somewhere/some/resource")
+        $http.get<ExpectedResponse>('http://somewhere/some/resource')
             .then((response: ng.IHttpPromiseCallbackArg<ExpectedResponse>) => {
                 // typing lost, so something like
                 // var i: number = response.data
@@ -120,7 +121,7 @@ namespace HttpAndRegularPromiseTests {
                 $scope.person = response.data;
             });
 
-        $http.get<ExpectedResponse>("http://somewhere/some/resource")
+        $http.get<ExpectedResponse>('http://somewhere/some/resource')
             .then((response: ng.IHttpPromiseCallbackArg<ExpectedResponse>) => {
                 // typing lost, so something like
                 // var i: number = response.data
@@ -128,47 +129,48 @@ namespace HttpAndRegularPromiseTests {
                 $scope.person = response.data;
             });
 
-        var aPromise: ng.IPromise<Person> = $q.when({ firstName: "Jack", lastName: "Sparrow" });
+        const aPromise: ng.IPromise<Person> = $q.when({ firstName: 'Jack', lastName: 'Sparrow' });
         aPromise.then((person: Person) => {
             $scope.person = person;
         });
 
-        var bPromise: ng.IPromise<number> = $q.when(42);
+        const bPromise: ng.IPromise<number> = $q.when(42);
         bPromise.then((answer: number) => {
             $scope.theAnswer = answer;
         });
 
-        var cPromise: ng.IPromise<string[]> = $q.when(["a", "b", "c"]);
+        const cPromise: ng.IPromise<string[]> = $q.when(['a', 'b', 'c']);
         cPromise.then((letters: string[]) => {
             $scope.letters = letters;
         });
 
         // When $q.when is passed an IPromise<T>, it returns an IPromise<T>
-        var dPromise: ng.IPromise<string> = $q.when($q.when("ALBATROSS!"));
+        const dPromise: ng.IPromise<string> = $q.when($q.when('ALBATROSS!'));
         dPromise.then((snack: string) => {
             $scope.snack = snack;
         });
 
         // $q.when may be called without arguments
-        var ePromise: ng.IPromise<void> = $q.when();
+        const ePromise: ng.IPromise<void> = $q.when();
         ePromise.then(() => {
-            $scope.nothing = "really nothing";
+            $scope.nothing = 'really nothing';
         });
     }
 
-  // Test that we can pass around a type-checked success/error Promise Callback
-  var anotherController: Function = ($scope: SomeControllerScope, $http:
-        ng.IHttpService, $q: ng.IQService) => {
-
-        var buildFooData: Function = () => 42;
-
-        var doFoo: Function = (callback: ng.IHttpPromiseCallback<ExpectedResponse>) => {
-            $http.get<ExpectedResponse>('/foo', buildFooData())
-                .success(callback);
+    // Test that we can pass around a type-checked success/error Promise Callback
+    function anotherController($scope: SomeControllerScope, $http: ng.IHttpService, $q: ng.IQService) {
+        function buildFooData(): ng.IRequestShortcutConfig {
+            return {};
         }
 
-    doFoo((data: any) => console.log(data));
-    }
+        function doFoo(callback: ng.IHttpPromiseCallback<ExpectedResponse>) {
+            $http
+                .get<ExpectedResponse>('/foo', buildFooData())
+                .success(callback);
+        };
+
+        doFoo((data: any) => console.log(data));
+    };
 }
 
 // Test for AngularJS Syntax
@@ -178,9 +180,9 @@ namespace My.Namespace {
 }
 
 // IModule Registering Test
-var mod = angular.module('tests', []);
-mod.controller('name', function ($scope: ng.IScope) { });
-mod.controller('name', ['$scope', function ($scope: ng.IScope) { }]);
+let mod = angular.module('tests', []);
+mod.controller('name', function($scope: ng.IScope) { });
+mod.controller('name', ['$scope', function($scope: ng.IScope) { }]);
 mod.controller('name', class {
     // Uncommenting the next line should lead to a type error because this signature isn't compatible
     // with the signature of the `$onChanges` hook:
@@ -188,7 +190,7 @@ mod.controller('name', class {
 });
 mod.controller({
     MyCtrl: class{},
-    MyCtrl2: function() {},
+    MyCtrl2: function() {}, // tslint:disable-line:object-literal-shorthand
     MyCtrl3: ['$fooService', function($fooService: any) { }]
 });
 mod.directive('myDirectiveA', ($rootScope: ng.IRootScopeService) => {
@@ -201,7 +203,7 @@ mod.directive('myDirectiveA', ($rootScope: ng.IRootScopeService) => {
         scope.$watch(() => foo, () => el.text(foo));
     };
 });
-mod.directive('myDirectiveB', ['$rootScope', function ($rootScope: ng.IRootScopeService) {
+mod.directive('myDirectiveB', ['$rootScope', function($rootScope: ng.IRootScopeService) {
     return {
         link(scope, el, attrs) {
             el.click(e => {
@@ -218,38 +220,37 @@ mod.directive({
         template: 'my-bar-dir.tpl.html'
     })]
 });
-mod.factory('name', function ($scope: ng.IScope) { })
-mod.factory('name', ['$scope', function ($scope: ng.IScope) { }])
+mod.factory('name', function($scope: ng.IScope) { });
+mod.factory('name', ['$scope', function($scope: ng.IScope) { }]);
 mod.factory({
-    name1: function (foo: any) { },
-    name2: ['foo', function (foo: any) { }]
+    name1: function(foo: any) { }, // tslint:disable-line:object-literal-shorthand
+    name2: ['foo', function(foo: any) { }]
 });
-mod.filter('name', function ($scope: ng.IScope) { })
-mod.filter('name', ['$scope', function ($scope: ng.IScope) { }])
+mod.filter('name', function($scope: ng.IScope) { });
+mod.filter('name', ['$scope', function($scope: ng.IScope) { }]);
 mod.filter({
-    name1: function (foo: any) { },
-    name2: ['foo', function (foo: any) { }]
+    name1: function(foo: any) { }, // tslint:disable-line:object-literal-shorthand
+    name2: ['foo', function(foo: any) { }]
 });
-mod.provider('name', function ($scope: ng.IScope) { return { $get: () => { } } })
+mod.provider('name', function($scope: ng.IScope) { return { $get: () => { } }; });
 mod.provider('name', TestProvider);
-mod.provider('name', ['$scope', <any>function ($scope: ng.IScope) { }])
+mod.provider('name', ['$scope', function($scope: ng.IScope) { } as any]);
 mod.provider(My.Namespace);
-mod.service('name', function ($scope: ng.IScope) { })
-mod.service('name', ['$scope', <any>function ($scope: ng.IScope) { }])
+mod.service('name', function($scope: ng.IScope) { });
+mod.service('name', ['$scope', function($scope: ng.IScope) { } as any]);
 mod.service({
     MyCtrl: class{},
-    MyCtrl2: function() {},
+    MyCtrl2: function() {}, // tslint:disable-line:object-literal-shorthand
     MyCtrl3: ['$fooService', function($fooService: any) { }]
 });
 mod.constant('name', 23);
-mod.constant('name', "23");
+mod.constant('name', '23');
 mod.constant(My.Namespace);
 mod.value('name', 23);
-mod.value('name', "23");
+mod.value('name', '23');
 mod.value(My.Namespace);
-mod.decorator('name', function($scope:ng.IScope){ });
-mod.decorator('name', ['$scope', <any>function($scope: ng.IScope){ }]);
-
+mod.decorator('name', function($scope: ng.IScope) {});
+mod.decorator('name', ['$scope', function($scope: ng.IScope) {} as any]);
 
 class TestProvider implements ng.IServiceProvider {
     constructor(private $scope: ng.IScope) {
@@ -261,27 +262,37 @@ class TestProvider implements ng.IServiceProvider {
 
 // QProvider tests
 angular.module('qprovider-test', [])
-    .config(['$qProvider', function ($qProvider: ng.IQProvider) {
+    .config(['$qProvider', function($qProvider: ng.IQProvider) {
         const provider: ng.IQProvider = $qProvider.errorOnUnhandledRejections(false);
         const currentValue: boolean = $qProvider.errorOnUnhandledRejections();
     }]);
 
 // Promise signature tests
-var foo: ng.IPromise<number>;
+let foo: ng.IPromise<number>;
 foo.then((x) => {
     // x is inferred to be a number
-    return "asdf";
+    x.toFixed();
+    return 'asdf';
 }).then((x) => {
     // x is inferred to be string
-    x.length;
+    const len = x.length;
     return 123;
+}, (e) => {
+    return anyOf2([123], toPromise([123])); // IPromise<T> | T, both are good for the 2nd arg of .then()
 }).then((x) => {
-    // x is infered to be a number
-    x.toFixed();
+    // x is infered to be a number or number[]
+    if (Array.isArray(x)) {
+        x[0].toFixed();
+    } else {
+        x.toFixed();
+    }
     return;
-}).then((x) => {
-    // x is infered to be void
-    // Typescript will prevent you to actually use x as a local variable
+}).catch(e => {
+    return foo || 123; // IPromise<T> | T, both are good for .catch()
+}).then(x => {
+    // x is infered to be void | number
+    x && x.toFixed();
+    // Typescript will prevent you to actually use x as a local variable before you check it is not void
     // Try object:
     return { a: 123 };
 }).then((x) => {
@@ -289,7 +300,8 @@ foo.then((x) => {
     x.a = 123;
     //Try a promise
     var y: ng.IPromise<number>;
-    return y;
+    var condition: boolean;
+    return condition ? y : x.a; // IPromise<T> | T, both are good for the 1st arg of .then()
 }).then((x) => {
     // x is infered to be a number, which is the resolved value of a promise
     x.toFixed();
@@ -306,14 +318,22 @@ namespace TestQ {
         e: number;
         f: boolean;
     }
+    interface TOther {
+        g: string;
+        h: number;
+    }
     var tResult: TResult;
     var promiseTResult: angular.IPromise<TResult>;
     var tValue: TValue;
     var promiseTValue: angular.IPromise<TValue>;
+    var tOther: TOther;
+    var promiseTOther: angular.IPromise<TOther>;
 
     var $q: angular.IQService;
     var promiseAny: angular.IPromise<any>;
 
+    const assertPromiseType = <T>(arg: angular.IPromise<T>) => arg;
+
     // $q constructor
     {
         let result: angular.IPromise<TResult>;
@@ -336,26 +356,32 @@ namespace TestQ {
         result = $q.all<TResult>([promiseAny, promiseAny]);
     }
     {
-        let result: angular.IPromise<{[id: string]: any;}>;
+        let result: angular.IPromise<{[id: string]: any; }>;
         result = $q.all({a: promiseAny, b: promiseAny});
     }
     {
-        let result: angular.IPromise<{a: number; b: string;}>;
-        result = $q.all<{a: number; b: string;}>({a: promiseAny, b: promiseAny});
+        let result: angular.IPromise<{a: number; b: string; }>;
+        result = $q.all<{a: number; b: string; }>({a: promiseAny, b: promiseAny});
     }
 
-
     // $q.defer
     {
         let result: angular.IDeferred<TResult>;
         result = $q.defer<TResult>();
+        result.resolve(tResult);
+        var anyValue: any;
+        result.reject(anyValue);
+        result.promise.then(result => {
+            return $q.resolve<TResult>(result);
+        });
     }
 
     // $q.reject
     {
-        let result: angular.IPromise<any>;
+        let result: angular.IPromise<never>;
         result = $q.reject();
         result = $q.reject('');
+        result.catch(() => 5).then(x => x.toFixed());
     }
 
     // $q.resolve
@@ -367,6 +393,8 @@ namespace TestQ {
         let result: angular.IPromise<TResult>;
         result = $q.resolve<TResult>(tResult);
         result = $q.resolve<TResult>(promiseTResult);
+        result = $q.resolve<TResult | TOther>(Math.random() > 0.5 ? tResult : promiseTOther);
+        result = $q.resolve(Math.random() > 0.5 ? tResult : promiseTOther);
     }
 
     // $q.when
@@ -376,6 +404,8 @@ namespace TestQ {
     }
     {
         let result: angular.IPromise<TResult>;
+        let resultOther: angular.IPromise<TOther>;
+
         result = $q.when<TResult>(tResult);
         result = $q.when<TResult>(promiseTResult);
 
@@ -384,24 +414,27 @@ namespace TestQ {
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => tResult, (any) => any, (any) => any);
 
         result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => tResult);
-        result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => tResult, (any) => any);
-        result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => tResult, (any) => any, (any) => any);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => tOther);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => tOther, (any) => any);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => promiseTOther);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => promiseTOther, (any) => any);
 
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => promiseTResult);
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => promiseTResult, (any) => any);
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => promiseTResult, (any) => any, (any) => any);
 
         result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => promiseTResult);
-        result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => any);
-        result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => any, (any) => any);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => tOther);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => tOther, (any) => any);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => promiseTOther);
+        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => promiseTOther, (any) => any);
     }
 }
 
-
-var httpFoo: ng.IHttpPromise<number>;
+let httpFoo: ng.IHttpPromise<number>;
 httpFoo.then((x) => {
     // When returning a promise the generic type must be inferred.
-    var innerPromise : ng.IPromise<number>;
+    var innerPromise: ng.IPromise<number>;
     return innerPromise;
 }).then((x) => {
     // must still be number.
@@ -409,13 +442,12 @@ httpFoo.then((x) => {
 });
 
 httpFoo.success((data, status, headers, config) => {
-    var h = headers("test");
+    const h = headers('test');
     h.charAt(0);
-    var hs = headers();
-    hs["content-type"].charAt(1);
+    const hs = headers();
+    hs['content-type'].charAt(1);
 });
 
-
 // Deferred signature tests
 namespace TestDeferred {
     var any: any;
@@ -432,8 +464,8 @@ namespace TestDeferred {
     // deferred.resolve
     {
         let result: void;
-        result = <void>deferred.resolve();
-        result = <void>deferred.resolve(tResult);
+        result = deferred.resolve() as void;
+        result = deferred.resolve(tResult) as void;
     }
 
     // deferred.reject
@@ -458,7 +490,7 @@ namespace TestDeferred {
 }
 
 namespace TestInjector {
-    let $injector: angular.auto.IInjectorService;
+    var $injector: angular.auto.IInjectorService;
 
     $injector.strictDi = true;
 
@@ -466,23 +498,28 @@ namespace TestInjector {
     $injector.annotate(() => {}, true);
 }
 
-
 // Promise signature tests
 namespace TestPromise {
-    var result: any;
     var any: any;
 
     interface TResult {
+        kind: 'result';
         a: number;
         b: string;
         c: boolean;
     }
+
     interface TOther {
+        kind: 'other';
         d: number;
         e: string;
         f: boolean;
     }
 
+    function isTResult(x: TResult | TOther): x is TResult {
+        return x.kind === 'result';
+    }
+
     var tresult: TResult;
     var tresultPromise: ng.IPromise<TResult>;
     var tresultHttpPromise: ng.IHttpPromise<TResult>;
@@ -492,65 +529,101 @@ namespace TestPromise {
     var totherHttpPromise: ng.IHttpPromise<TOther>;
 
     var promise: angular.IPromise<TResult>;
+    var $q: angular.IQService;
+
+    const assertPromiseType = <T>(arg: angular.IPromise<T>) => arg;
+    const reject = $q.reject();
 
     // promise.then
-    result = <angular.IPromise<any>>promise.then((result) => any);
-    result = <angular.IPromise<any>>promise.then((result) => any, (any) => any);
-    result = <angular.IPromise<any>>promise.then((result) => any, (any) => any, (any) => any);
+    assertPromiseType<any>(promise.then((result) => any));
+    assertPromiseType<any>(promise.then((result) => any, (any) => any));
+    assertPromiseType<any>(promise.then((result) => any, (any) => any, (any) => any));
 
-    result = <angular.IPromise<TResult>>promise.then((result) => result);
-    result = <angular.IPromise<TResult>>promise.then((result) => result, (any) => any);
-    result = <angular.IPromise<TResult>>promise.then((result) => result, (any) => any, (any) => any);
-    result = <angular.IPromise<TResult>>promise.then((result) => tresultPromise);
-    result = <angular.IPromise<TResult>>promise.then((result) => tresultPromise, (any) => any);
-    result = <angular.IPromise<TResult>>promise.then((result) => tresultPromise, (any) => any, (any) => any);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.then((result) => tresultHttpPromise);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.then((result) => tresultHttpPromise, (any) => any);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.then((result) => tresultHttpPromise, (any) => any, (any) => any);
+    assertPromiseType<never>(promise.then((result) => reject));
+    assertPromiseType<never>(promise.then((result) => reject, (any) => reject));
+    assertPromiseType<never>(promise.then((result) => reject, (any) => reject, (any) => any));
 
-    result = <angular.IPromise<TOther>>promise.then((result) => tother);
-    result = <angular.IPromise<TOther>>promise.then((result) => tother, (any) => any);
-    result = <angular.IPromise<TOther>>promise.then((result) => tother, (any) => any, (any) => any);
-    result = <angular.IPromise<TOther>>promise.then((result) => totherPromise);
-    result = <angular.IPromise<TOther>>promise.then((result) => totherPromise, (any) => any);
-    result = <angular.IPromise<TOther>>promise.then((result) => totherPromise, (any) => any, (any) => any);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.then((result) => totherHttpPromise);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.then((result) => totherHttpPromise, (any) => any);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.then((result) => totherHttpPromise, (any) => any, (any) => any);
+    assertPromiseType<TResult>(promise.then((result) => result));
+    assertPromiseType<TResult>(promise.then((result) => tresult));
+    assertPromiseType<TResult>(promise.then((result) => tresultPromise));
+    assertPromiseType<TResult>(promise.then((result) => result, (any) => any));
+    assertPromiseType<TResult>(promise.then((result) => result, (any) => any, (any) => any));
+    assertPromiseType<TResult>(promise.then((result) => result, (any) => reject, (any) => any));
+
+    assertPromiseType<TResult>(promise.then((result) => anyOf2(reject, result)));
+    assertPromiseType<TResult>(promise.then((result) => anyOf3(result, tresultPromise, reject)));
+    assertPromiseType<TResult>(promise.then(
+        (result) => anyOf3(reject, result, tresultPromise),
+        (reason) => anyOf3(reject, tresult, tresultPromise)
+    ));
+
+
+    assertPromiseType<ng.IHttpPromiseCallbackArg<TResult>>(promise.then((result) => tresultHttpPromise));
+
+    assertPromiseType<TResult | TOther>(promise.then((result) => result, (any) => tother));
+    assertPromiseType<TResult | TOther>(promise.then(
+        (result) => anyOf3(reject, result, totherPromise),
+        (reason) => anyOf3(reject, tother, tresultPromise)
+    ));
+
+    assertPromiseType<TResult | TOther>(promise.then<TResult | TOther, TResult>(
+        (result) => anyOf3(tresultPromise, result, totherPromise)
+    ));
+
+    assertPromiseType<TResult | TOther>(promise.then((result) => result, (any) => tother, (any) => any));
+    assertPromiseType<TResult | TOther>(promise.then((result) => tresultPromise, (any) => totherPromise));
+    assertPromiseType<TResult | TOther>(promise.then((result) => tresultPromise, (any) => totherPromise, (any) => any));
+    assertPromiseType<ng.IHttpPromiseCallbackArg<TResult | TOther>>(promise.then((result) => tresultHttpPromise, (any) => totherHttpPromise));
+    assertPromiseType<ng.IHttpPromiseCallbackArg<TResult | TOther>>(promise.then((result) => tresultHttpPromise, (any) => totherHttpPromise, (any) => any));
+
+    assertPromiseType<TOther>(promise.then((result) => tother));
+    assertPromiseType<TOther>(promise.then((result) => tother, (any) => any));
+    assertPromiseType<TOther>(promise.then((result) => tother, (any) => any, (any) => any));
+    assertPromiseType<TOther>(promise.then((result) => totherPromise));
+    assertPromiseType<TOther>(promise.then((result) => totherPromise, (any) => any));
+    assertPromiseType<TOther>(promise.then((result) => totherPromise, (any) => any, (any) => any));
+    assertPromiseType<ng.IHttpPromiseCallbackArg<TOther>>(promise.then((result) => totherHttpPromise));
+    assertPromiseType<ng.IHttpPromiseCallbackArg<TOther>>(promise.then((result) => totherHttpPromise, (any) => any));
+    assertPromiseType<ng.IHttpPromiseCallbackArg<TOther>>(promise.then((result) => totherHttpPromise, (any) => any, (any) => any));
+
+    assertPromiseType<boolean>(promise.then((result) => tresult, (any) => tother).then(ambiguous => isTResult(ambiguous) ? ambiguous.c : ambiguous.f));
 
     // promise.catch
-    result = <angular.IPromise<any>>promise.catch((err) => any);
-    result = <angular.IPromise<TResult>>promise.catch((err) => tresult);
-    result = <angular.IPromise<TResult>>promise.catch((err) => tresultPromise);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.catch((err) => tresultHttpPromise);
-    result = <angular.IPromise<TOther>>promise.catch((err) => tother);
-    result = <angular.IPromise<TOther>>promise.catch((err) => totherPromise);
-    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.catch((err) => totherHttpPromise);
+    assertPromiseType<any>(promise.catch((err) => err));
+    assertPromiseType<any>(promise.catch((err) => any));
+    assertPromiseType<TResult>(promise.catch((err) => tresult));
+    assertPromiseType<TResult>(promise.catch((err) => anyOf2(tresult, reject)));
+    assertPromiseType<TResult>(promise.catch((err) => anyOf3(tresult, tresultPromise, reject)));
+    assertPromiseType<TResult>(promise.catch((err) => tresultPromise));
+    assertPromiseType<ng.IHttpPromiseCallbackArg<TResult>>(promise.catch((err) => tresultHttpPromise));
+    assertPromiseType<TResult | TOther>(promise.catch((err) => tother));
+    assertPromiseType<TResult | TOther>(promise.catch((err) => totherPromise));
+    assertPromiseType<TResult | ng.IHttpPromiseCallbackArg<TOther>>(promise.catch((err) => totherHttpPromise));
+
+    assertPromiseType<boolean>(promise.catch((err) => tother).then(ambiguous => isTResult(ambiguous) ? ambiguous.c : ambiguous.f));
 
     // promise.finally
-    result = <angular.IPromise<TResult>>promise.finally(() => any);
-    result = <angular.IPromise<TResult>>promise.finally(() => tresult);
-    result = <angular.IPromise<TResult>>promise.finally(() => tother);
+    assertPromiseType<TResult>(promise.finally(() => any));
+    assertPromiseType<TResult>(promise.finally(() => tresult));
+    assertPromiseType<TResult>(promise.finally(() => tother));
 }
 
-
 function test_angular_forEach() {
-    var values: { [key: string]: string } = { name: 'misko', gender: 'male' };
-    var log: string[] = [];
-    angular.forEach(values, function (value, key) {
+    const values: { [key: string]: string } = { name: 'misko', gender: 'male' };
+    const log: string[] = [];
+    angular.forEach(values, function(value, key) {
         this.push(key + ': ' + value);
     }, log);
     //expect(log).toEqual(['name: misko', 'gender: male']);
 }
 
 // angular.element() tests
-var element = angular.element("div.myApp");
-var scope: ng.IScope = element.scope();
-var isolateScope: ng.IScope = element.isolateScope();
+let element = angular.element('div.myApp');
+let scope: ng.IScope = element.scope();
+let isolateScope: ng.IScope = element.isolateScope();
 isolateScope = element.find('div.foo').isolateScope();
 isolateScope = element.children().isolateScope();
 
-
 // $timeout signature tests
 namespace TestTimeout {
     interface TResult {
@@ -590,25 +663,24 @@ namespace TestTimeout {
     }
 }
 
-
-function test_IAttributes(attributes: ng.IAttributes){
+function test_IAttributes(attributes: ng.IAttributes) {
     return attributes;
 }
 
 test_IAttributes({
-    $normalize: function (classVal){ return "foo" },
-    $addClass: function (classVal){},
-    $removeClass: function(classVal){},
-    $updateClass: function(newClass, oldClass){},
-    $set: function(key, value){},
-    $observe: function(name: any, fn: any){
+    $normalize(classVal) { return 'foo'; },
+    $addClass(classVal) {},
+    $removeClass(classVal) {},
+    $updateClass(newClass, oldClass) {},
+    $set(key, value) {},
+    $observe(name: any, fn: any) {
         return fn;
     },
     $attr: {}
 });
 
 class SampleDirective implements ng.IDirective {
-    public restrict = 'A';
+    restrict = 'A';
     name = 'doh';
 
     compile(templateElement: ng.IAugmentedJQuery) {
@@ -617,7 +689,7 @@ class SampleDirective implements ng.IDirective {
         };
     }
 
-    static instance():ng.IDirective {
+    static instance(): ng.IDirective {
         return new SampleDirective();
     }
 
@@ -627,7 +699,7 @@ class SampleDirective implements ng.IDirective {
 }
 
 class SampleDirective2 implements ng.IDirective {
-    public restrict = 'EAC';
+    restrict = 'EAC';
 
     compile(templateElement: ng.IAugmentedJQuery) {
         return {
@@ -635,7 +707,7 @@ class SampleDirective2 implements ng.IDirective {
         };
     }
 
-    static instance():ng.IDirective {
+    static instance(): ng.IDirective {
         return new SampleDirective2();
     }
 
@@ -654,7 +726,7 @@ angular.module('AnotherSampleDirective', []).directive('myDirective', ['$interpo
             $interpolate('', true)(scope);
             $interpolate('', true, 'html')(scope);
             $interpolate('', true, 'html', true)(scope);
-            var defer = $q.defer();
+            const defer = $q.defer();
             defer.reject();
             defer.resolve();
             defer.promise.then(function(d) {
@@ -670,7 +742,7 @@ angular.module('AnotherSampleDirective', []).directive('myDirective', ['$interpo
             .finally((): any => {
                 return null;
             });
-            var promise = new $q((resolve) => {
+            let promise = new $q((resolve) => {
                 resolve();
             });
 
@@ -785,25 +857,25 @@ angular.module('docsTimeDirective', [])
     .directive('myCurrentTime', ['$interval', 'dateFilter', function($interval: any, dateFilter: any) {
 
         return {
-            link: function(scope: ng.IScope, element: ng.IAugmentedJQuery, attrs:ng.IAttributes) {
-                var format: any,
+            link(scope: ng.IScope, element: ng.IAugmentedJQuery, attrs: ng.IAttributes) {
+                let format: any,
                     timeoutId: any;
 
                 function updateTime() {
                     element.text(dateFilter(new Date(), format));
                 }
 
-                scope.$watch(attrs['myCurrentTime'], function (value: any) {
+                scope.$watch(attrs['myCurrentTime'], function(value: any) {
                     format = value;
                     updateTime();
                 });
 
-                element.on('$destroy', function () {
+                element.on('$destroy', function() {
                     $interval.cancel(timeoutId);
                 });
 
                 // start the UI update process; save the timeoutId for canceling
-                timeoutId = $interval(function () {
+                timeoutId = $interval(function() {
                     updateTime(); // update DOM
                 }, 1000);
             }
@@ -832,19 +904,18 @@ angular.module('docsTransclusionExample', [])
             transclude: true,
             scope: {},
             templateUrl: 'my-dialog.html',
-            link: function (scope: ng.IScope, element: ng.IAugmentedJQuery) {
+            link(scope: ng.IScope, element: ng.IAugmentedJQuery) {
                 scope['name'] = 'Jeff';
             }
         };
     });
 
-
 angular.module('docsIsoFnBindExample', [])
     .controller('Controller', ['$scope', '$timeout', function($scope: any, $timeout: any) {
         $scope.name = 'Tobias';
-        $scope.hideDialog = function () {
+        $scope.hideDialog = function() {
             $scope.dialogIsHidden = true;
-            $timeout(function () {
+            $timeout(function() {
                 $scope.dialogIsHidden = false;
             }, 2000);
         };
@@ -854,7 +925,7 @@ angular.module('docsIsoFnBindExample', [])
             restrict: 'E',
             transclude: true,
             scope: {
-                'close': '&onClose'
+                close: '&onClose'
             },
             templateUrl: 'my-dialog-close.html'
         };
@@ -863,7 +934,7 @@ angular.module('docsIsoFnBindExample', [])
 angular.module('dragModule', [])
     .directive('myDraggable', ['$document', function($document: any) {
         return function(scope: any, element: any, attr: any) {
-            var startX = 0, startY = 0, x = 0, y = 0;
+            let startX = 0, startY = 0, x = 0, y = 0;
 
             element.css({
                 position: 'relative',
@@ -903,8 +974,8 @@ angular.module('docsTabsExample', [])
             restrict: 'E',
             transclude: true,
             scope: {},
-            controller: function($scope: ng.IScope) {
-                var panes: any = $scope['panes'] = [];
+            controller($scope: ng.IScope) {
+                const panes: any = $scope['panes'] = [];
 
                 $scope['select'] = function(pane: any) {
                     angular.forEach(panes, function(pane: any) {
@@ -931,7 +1002,7 @@ angular.module('docsTabsExample', [])
             scope: {
                 title: '@'
             },
-            link: function(scope: ng.IScope, element: ng.IAugmentedJQuery, attrs: ng.IAttributes, tabsCtrl: any) {
+            link(scope: ng.IScope, element: ng.IAugmentedJQuery, attrs: ng.IAttributes, tabsCtrl: any) {
                 tabsCtrl.addPane(scope);
             },
             templateUrl: 'my-pane.html'
@@ -945,7 +1016,7 @@ angular.module('multiSlotTranscludeExample', [])
                 button: 'button',
                 list: 'ul',
             },
-            link: function(scope, element, attrs, ctrl, transclude) {
+            link(scope, element, attrs, ctrl, transclude) {
                 // without scope
                 transclude().appendTo(element);
                 transclude(clone => clone.appendTo(element));
@@ -960,52 +1031,52 @@ angular.module('multiSlotTranscludeExample', [])
 
 angular.module('componentExample', [])
     .component('counter', {
-        require: {'ctrl': '^ctrl'},
+        require: {ctrl: '^ctrl'},
         bindings: {
             count: '='
         },
         controller: 'CounterCtrl',
         controllerAs: 'counterCtrl',
-        template: function () {
+        template() {
             return '';
         },
         transclude: {
-            'el': 'target'
+            el: 'target'
         }
     })
     .component('anotherCounter', {
-        controller: function(){},
+        controller() {},
         require: {
-            'parent': '^parentCtrl'
+            parent: '^parentCtrl'
         },
         template: '',
         transclude: true
     });
 
-interface copyExampleUser {
+interface ICopyExampleUser {
     name?: string;
     email?: string;
     gender?: string;
 }
 
-interface copyExampleScope {
+interface ICopyExampleScope {
 
-    user: copyExampleUser;
-    master: copyExampleUser;
-    update: (copyExampleUser: copyExampleUser) => any;
+    user: ICopyExampleUser;
+    master: ICopyExampleUser;
+    update: (copyExampleUser: ICopyExampleUser) => any;
     reset: () => any;
 }
 
 angular.module('copyExample', [])
-    .controller('ExampleController', ['$scope', function ($scope: copyExampleScope) {
+    .controller('ExampleController', ['$scope', function($scope: ICopyExampleScope) {
         $scope.master = { };
 
-        $scope.update = function (user) {
+        $scope.update = function(user) {
             // Example with 1 argument
             $scope.master = angular.copy(user);
         };
 
-        $scope.reset = function () {
+        $scope.reset = function() {
             // Example with 2 arguments
             angular.copy($scope.master, $scope.user);
         };
@@ -1022,9 +1093,14 @@ namespace locationTests {
      */
 
     // given url http://example.com/#/some/path?foo=bar&baz=xoxo
-    var searchObject = $location.search();
+    const searchObject = $location.search();
     // => {foo: 'bar', baz: 'xoxo'}
 
+    function assert(condition: boolean) {
+        if (!condition) {
+            throw new Error();
+        }
+    }
 
     // set foo to 'yipee'
     $location.search('foo', 'yipee');
@@ -1041,29 +1117,29 @@ namespace locationTests {
     // in browser with HTML5 history support:
     // open http://example.com/#!/a -> rewrite to http://example.com/a
     // (replacing the http://example.com/#!/a history record)
-    $location.path() == '/a'
+    assert($location.path() === '/a');
 
     $location.path('/foo');
-    $location.absUrl() == 'http://example.com/foo'
+    assert($location.absUrl() === 'http://example.com/foo');
 
-    $location.search() == {}
+    assert($location.search() === {});
     $location.search({ a: 'b', c: true });
-    $location.absUrl() == 'http://example.com/foo?a=b&c'
+    assert($location.absUrl() === 'http://example.com/foo?a=b&c');
 
     $location.path('/new').search('x=y');
-    $location.url() == 'new?x=y'
-    $location.absUrl() == 'http://example.com/new?x=y'
+    assert($location.url() === 'new?x=y');
+    assert($location.absUrl() === 'http://example.com/new?x=y');
 
     // in browser without html5 history support:
     // open http://example.com/new?x=y -> redirect to http://example.com/#!/new?x=y
     // (again replacing the http://example.com/new?x=y history item)
-    $location.path() == '/new'
-    $location.search() == { x: 'y' }
+    assert($location.path() === '/new');
+    assert($location.search() === { x: 'y' });
 
     $location.path('/foo/bar');
-    $location.path() == '/foo/bar'
-    $location.url() == '/foo/bar?x=y'
-    $location.absUrl() == 'http://example.com/#!/foo/bar?x=y'
+    assert($location.path() === '/foo/bar');
+    assert($location.url() === '/foo/bar?x=y');
+    assert($location.absUrl() === 'http://example.com/#!/foo/bar?x=y');
 }
 
 // NgModelController
@@ -1074,7 +1150,7 @@ function NgModelControllerTyping() {
 
     // See https://docs.angularjs.org/api/ng/type/ngModel.NgModelController#$validators
     ngModel.$validators['validCharacters'] = function(modelValue, viewValue) {
-        var value = modelValue || viewValue;
+        const value = modelValue || viewValue;
         return /[0-9]+/.test(value) &&
             /[a-z]+/.test(value) &&
             /[A-Z]+/.test(value) &&
@@ -1082,7 +1158,7 @@ function NgModelControllerTyping() {
     };
 
     ngModel.$asyncValidators['uniqueUsername'] = function(modelValue, viewValue) {
-        var value = modelValue || viewValue;
+        const value = modelValue || viewValue;
         return $http.get('/api/users/' + value).
             then(function resolved() {
                 return $q.reject('exists');
@@ -1092,67 +1168,67 @@ function NgModelControllerTyping() {
     };
 }
 
-var $filter: angular.IFilterService;
+let $filter: angular.IFilterService;
 
 function testFilter() {
 
     var items: string[];
-    $filter("filter")(items, "test");
-    $filter("filter")(items, {name: "test"});
-    $filter("filter")(items, (val, index, array) => {
+    $filter('filter')(items, 'test');
+    $filter('filter')(items, {name: 'test'});
+    $filter('filter')(items, (val, index, array) => {
         return true;
     });
-    $filter("filter")(items, (val, index, array) => {
+    $filter('filter')(items, (val, index, array) => {
       return true;
     }, (actual, expected) => {
-        return actual == expected;
+        return actual === expected;
     });
 }
 
 function testCurrency() {
-    $filter("currency")(126);
-    $filter("currency")(126, "$", 2);
+    $filter('currency')(126);
+    $filter('currency')(126, '$', 2);
 }
 
 function testNumber() {
-    $filter("number")(167);
-    $filter("number")(167, 2);
+    $filter('number')(167);
+    $filter('number')(167, 2);
 }
 
 function testDate() {
-    $filter("date")(new Date());
-    $filter("date")(new Date(), 'yyyyMMdd');
-    $filter("date")(new Date(), 'yyyyMMdd', '+0430');
+    $filter('date')(new Date());
+    $filter('date')(new Date(), 'yyyyMMdd');
+    $filter('date')(new Date(), 'yyyyMMdd', '+0430');
 }
 
 function testJson() {
-    var json: string = $filter("json")({test:true}, 2);
+    const json: string = $filter('json')({test: true}, 2);
 }
 
 function testLowercase() {
-    var lower: string = $filter("lowercase")('test');
+    const lower: string = $filter('lowercase')('test');
 }
 
 function testUppercase() {
-    var lower: string = $filter("uppercase")('test');
+    const lower: string = $filter('uppercase')('test');
 }
 
 function testLimitTo() {
-    var limitTo = $filter("limitTo");
-    var filtered: number[] = $filter("limitTo")([1,2,3], 5);
-    filtered = $filter("limitTo")([1,2,3], 5, 2);
+    const limitTo = $filter('limitTo');
+    let filtered: number[] = $filter('limitTo')([1, 2, 3], 5);
+    filtered = $filter('limitTo')([1, 2, 3], 5, 2);
 
-    var filteredString: string = $filter("limitTo")("124", 4);
-    filteredString = $filter("limitTo")(124, 4);
+    let filteredString: string = $filter('limitTo')('124', 4);
+    filteredString = $filter('limitTo')(124, 4);
 }
 
 function testOrderBy() {
-    var filtered: number[] = $filter("orderBy")([1,2,3], "test");
-    filtered = $filter("orderBy")([1,2,3], "test", true);
-    filtered = $filter("orderBy")([1,2,3], ['prop1', 'prop2']);
-    filtered = $filter("orderBy")([1,2,3], (val: number) => 1);
-    var filtered2: string[] = $filter("orderBy")(["1","2","3"], (val: string) => 1);
-    filtered2 = $filter("orderBy")(["1","2","3"], [
+    let filtered: number[] = $filter('orderBy')([1, 2, 3], 'test');
+    filtered = $filter('orderBy')([1, 2, 3], 'test', true);
+    filtered = $filter('orderBy')([1, 2, 3], ['prop1', 'prop2']);
+    filtered = $filter('orderBy')([1, 2, 3], (val: number) => 1);
+    let filtered2: string[] = $filter('orderBy')(['1', '2', '3'], (val: string) => 1);
+    filtered2 = $filter('orderBy')(['1', '2', '3'], [
         (val: string) => 1,
         (val: string) => 2
     ]);
@@ -1160,28 +1236,26 @@ function testOrderBy() {
 
 function testDynamicFilter() {
     // Test with separate variables
-    var dateFilter = $filter("date");
-    var myDate = new Date();
-    dateFilter(myDate , "EEE, MMM d");
+    const dateFilter = $filter('date');
+    const myDate = new Date();
+    dateFilter(myDate , 'EEE, MMM d');
 
     // Test with dynamic name
-    var filterName = 'date';
-    var dynDateFilter = $filter<ng.IFilterDate>(filterName);
+    const filterName = 'date';
+    const dynDateFilter = $filter<ng.IFilterDate>(filterName);
     dynDateFilter(new Date());
 }
 
-interface MyCustomFilter {
-    (value: string): string;
-}
+type MyCustomFilter = (value: string) => string;
 
 function testCustomFilter() {
-    var filterCustom = $filter<MyCustomFilter>('custom');
-    var filtered: string = filterCustom("test");
+    const filterCustom = $filter<MyCustomFilter>('custom');
+    const filtered: string = filterCustom('test');
 }
 
 function parseTyping() {
     var $parse: angular.IParseService;
-    var compiledExp = $parse('a.b.c');
+    const compiledExp = $parse('a.b.c');
     if (compiledExp.constant) {
         return compiledExp({});
     } else if (compiledExp.literal) {
@@ -1191,8 +1265,8 @@ function parseTyping() {
 
 function parseWithParams() {
     var $parse: angular.IParseService;
-    var compiledExp = $parse('a.b.c', () => null);
-    var compiledExp = $parse('a.b.c', null, false);
+    const compiledExp1 = $parse('a.b.c', () => null);
+    const compiledExp2 = $parse('a.b.c', null, false);
 }
 
 function doBootstrap(element: Element | JQuery, mode: string): ng.auto.IInjectorService {
@@ -1211,8 +1285,22 @@ function doBootstrap(element: Element | JQuery, mode: string): ng.auto.IInjector
 }
 
 function testIHttpParamSerializerJQLikeProvider() {
-    let serializer: angular.IHttpParamSerializer;
+    var serializer: angular.IHttpParamSerializer;
     serializer({
-        a: "b"
+        a: 'b'
     });
 }
+
+function anyOf2<T1, T2>(v1: T1, v2: T2) {
+    return Math.random() < 1/2 ? v1 : v2;
+}
+
+function anyOf3<T1, T2, T3>(v1: T1, v2: T2, v3: T3) {
+    const rnd = Math.random();
+    return rnd < 1/3 ? v1 : rnd < 2/3 ? v2 : v3;
+}
+
+function toPromise<T>(val: T): ng.IPromise<T> {
+    var p: ng.IPromise<T>;
+    return p;
+}
diff --git a/angular/index.d.ts b/angular/index.d.ts
index f3f9fc87a6..73535e9922 100644
--- a/angular/index.d.ts
+++ b/angular/index.d.ts
@@ -27,7 +27,7 @@ import ng = angular;
 ///////////////////////////////////////////////////////////////////////////////
 declare namespace angular {
 
-    type Injectable<T extends Function> = T | (string | T)[];
+    type Injectable<T extends Function> = T | Array<string | T>;
 
     // not directly implemented, but ensures that constructed class implements $get
     interface IServiceProviderClass {
@@ -64,7 +64,7 @@ declare namespace angular {
          * @param config an object for defining configuration options for the application. The following keys are supported:
          *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
          */
-        bootstrap(element: string|Element|JQuery|Document, modules?: (string|Function|any[])[], config?: IAngularBootstrapConfig): auto.IInjectorService;
+        bootstrap(element: string|Element|JQuery|Document, modules?: Array<string|Function|any[]>, config?: IAngularBootstrapConfig): auto.IInjectorService;
 
         /**
          * Creates a deep copy of source, which should be an object or an array.
@@ -122,7 +122,7 @@ declare namespace angular {
         fromJson(json: string): any;
         identity<T>(arg?: T): T;
         injector(modules?: any[], strictDi?: boolean): auto.IInjectorService;
-        isArray(value: any): value is Array<any>;
+        isArray(value: any): value is any[];
         isDate(value: any): value is Date;
         isDefined(value: any): boolean;
         isElement(value: any): boolean;
@@ -514,7 +514,7 @@ declare namespace angular {
         $watchCollection<T>(watchExpression: (scope: IScope) => T, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void;
 
         $watchGroup(watchExpressions: any[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void;
-        $watchGroup(watchExpressions: { (scope: IScope): any }[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void;
+        $watchGroup(watchExpressions: Array<{ (scope: IScope): any }>, listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void;
 
         $parent: IScope;
         $root: IRootScopeService;
@@ -662,9 +662,9 @@ declare namespace angular {
     }
 
     interface IFilterOrderByItem {
-        value: any,
-        type: string,
-        index: any
+        value: any;
+        type: string;
+        index: any;
     }
 
     interface IFilterOrderByComparatorFunc {
@@ -756,7 +756,7 @@ declare namespace angular {
          * @param comparator Function used to determine the relative order of value pairs.
          * @return An array containing the items from the specified collection, ordered by a comparator function based on the values computed using the expression predicate.
          */
-        <T>(array: T[], expression: string|((value: T) => any)|(((value: T) => any)|string)[], reverse?: boolean, comparator?: IFilterOrderByComparatorFunc): T[];
+        <T>(array: T[], expression: string|((value: T) => any)|Array<((value: T) => any)|string>, reverse?: boolean, comparator?: IFilterOrderByComparatorFunc): T[];
     }
 
     /**
@@ -1023,7 +1023,7 @@ declare namespace angular {
         all<T1, T2, T3, T4>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>]): IPromise<[T1, T2, T3, T4]>;
         all<T1, T2, T3>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>]): IPromise<[T1, T2, T3]>;
         all<T1, T2>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>]): IPromise<[T1, T2]>;
-        all<TAll>(promises: IPromise<TAll>[]): IPromise<TAll[]>;
+        all<TAll>(promises: Array<IPromise<TAll>>): IPromise<TAll[]>;
         /**
          * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
          *
@@ -1044,13 +1044,14 @@ declare namespace angular {
          *
          * @param reason Constant, message, exception or an object representing the rejection reason.
          */
-        reject(reason?: any): IPromise<any>;
+        reject(reason?: any): IPromise<never>;
         /**
          * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
          *
          * @param value Value or a promise
          */
         resolve<T>(value: IPromise<T>|T): IPromise<T>;
+        resolve<T1, T2>(value: IPromise<T1>|T2): IPromise<T1|T2>;
         /**
          * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
          */
@@ -1061,7 +1062,10 @@ declare namespace angular {
          * @param value Value or a promise
          */
         when<T>(value: IPromise<T>|T): IPromise<T>;
-        when<TResult, T>(value: IPromise<T>|T, successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
+        when<T1, T2>(value: IPromise<T1>|T2): IPromise<T1|T2>;
+        when<TResult, T>(value: IPromise<T>|T, successCallback: (promiseValue: T) => IPromise<TResult>|TResult): IPromise<TResult>;
+        when<TResult, T>(value: T, successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback: null | undefined | ((reason: any) => any), notifyCallback?: (state: any) => any): IPromise<TResult>;
+        when<TResult, TResult2, T>(value: IPromise<T>, successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback: (reason: any) => TResult2 | IPromise<TResult2>, notifyCallback?: (state: any) => any): IPromise<TResult | TResult2>;
         /**
          * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
          */
@@ -1090,15 +1094,20 @@ declare namespace angular {
     interface IPromise<T> {
         /**
          * Regardless of when the promise was or will be resolved or rejected, then calls one of the success or error callbacks asynchronously as soon as the result is available. The callbacks are called with a single argument: the result or rejection reason. Additionally, the notify callback may be called zero or more times to provide a progress indication, before the promise is resolved or rejected.
-         * The successCallBack may return IPromise<void> for when a $q.reject() needs to be returned
+         * The successCallBack may return IPromise<never> for when a $q.reject() needs to be returned
          * This method returns a new promise which is resolved or rejected via the return value of the successCallback, errorCallback. It also notifies via the return value of the notifyCallback method. The promise can not be resolved or rejected from the notifyCallback method.
          */
-        then<TResult>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
+        then<TResult>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: null | undefined, notifyCallback?: (state: any) => any): IPromise<TResult>;
+        then<TResult1, TResult2>(successCallback: (promiseValue: T) => IPromise<TResult1>|TResult2, errorCallback?: null | undefined, notifyCallback?: (state: any) => any): IPromise<TResult1 | TResult2>;
+
+        then<TResult, TCatch>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback: (reason: any) => IPromise<TCatch>|TCatch, notifyCallback?: (state: any) => any): IPromise<TResult | TCatch>;
+        then<TResult1, TResult2, TCatch1, TCatch2>(successCallback: (promiseValue: T) => IPromise<TResult1>|TResult2, errorCallback: (reason: any) => IPromise<TCatch1>|TCatch2, notifyCallback?: (state: any) => any): IPromise<TResult1 | TResult2 | TCatch1 | TCatch2>;
 
         /**
          * Shorthand for promise.then(null, errorCallback)
          */
-        catch<TResult>(onRejected: (reason: any) => IPromise<TResult>|TResult): IPromise<TResult>;
+        catch<TCatch>(onRejected: (reason: any) => IPromise<TCatch>|TCatch): IPromise<T | TCatch>;
+        catch<TCatch1, TCatch2>(onRejected: (reason: any) => IPromise<TCatch1>|TCatch2): IPromise<T | TCatch1 | TCatch2>;
 
         /**
          * Allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful to release resources or do some clean-up that needs to be done whether the promise was rejected or resolved. See the full specification for more information.
@@ -1284,11 +1293,11 @@ declare namespace angular {
     }
 
     interface ITemplateLinkingFunctionOptions {
-        parentBoundTranscludeFn?: ITranscludeFunction,
+        parentBoundTranscludeFn?: ITranscludeFunction;
         transcludeControllers?: {
             [controller: string]: { instance: IController }
-        },
-        futureParentElement?: JQuery
+        };
+        futureParentElement?: JQuery;
     }
 
     /**
@@ -1510,7 +1519,9 @@ declare namespace angular {
         (data: any, headersGetter: IHttpHeadersGetter, status: number): any;
     }
 
-    type HttpHeaderType = {[requestType: string]:string|((config:IRequestConfig) => string)};
+    interface HttpHeaderType {
+        [requestType: string]: string|((config: IRequestConfig) => string);
+    }
 
     interface IHttpRequestConfigHeaders {
         [requestType: string]: any;
@@ -1593,7 +1604,7 @@ declare namespace angular {
          * Register service factories (names or implementations) for interceptors which are called before and after
          * each request.
          */
-        interceptors: (string | Injectable<IHttpInterceptorFactory>)[];
+        interceptors: Array<string | Injectable<IHttpInterceptorFactory>>;
         useApplyAsync(): boolean;
         useApplyAsync(value: boolean): IHttpProvider;
 
@@ -1603,7 +1614,7 @@ declare namespace angular {
          * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
          *    otherwise, returns the current configured value.
          */
-        useLegacyPromiseExtensions(value:boolean) : boolean | IHttpProvider;
+        useLegacyPromiseExtensions(value: boolean): boolean | IHttpProvider;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -1687,16 +1698,15 @@ declare namespace angular {
         valueOf(value: any): any;
     }
 
-
     ///////////////////////////////////////////////////////////////////////////
     // SCEDelegateProvider
     // see http://docs.angularjs.org/api/ng.$sceDelegateProvider
     ///////////////////////////////////////////////////////////////////////////
     interface ISCEDelegateProvider extends IServiceProvider {
-        resourceUrlBlacklist(blacklist: any[]): void;
-        resourceUrlWhitelist(whitelist: any[]): void;
         resourceUrlBlacklist(): any[];
+        resourceUrlBlacklist(blacklist: any[]): void;
         resourceUrlWhitelist(): any[];
+        resourceUrlWhitelist(whitelist: any[]): void;
     }
 
     /**
@@ -1936,33 +1946,33 @@ declare namespace angular {
             annotate(fn: Function, strictDi?: boolean): string[];
             annotate(inlineAnnotatedFunction: any[]): string[];
             get<T>(name: string, caller?: string): T;
-            get(name: '$anchorScroll'): IAnchorScrollService
-            get(name: '$cacheFactory'): ICacheFactoryService
-            get(name: '$compile'): ICompileService
-            get(name: '$controller'): IControllerService
-            get(name: '$document'): IDocumentService
-            get(name: '$exceptionHandler'): IExceptionHandlerService
-            get(name: '$filter'): IFilterService
-            get(name: '$http'): IHttpService
-            get(name: '$httpBackend'): IHttpBackendService
-            get(name: '$httpParamSerializer'): IHttpParamSerializer
-            get(name: '$httpParamSerializerJQLike'): IHttpParamSerializer
-            get(name: '$interpolate'): IInterpolateService
-            get(name: '$interval'): IIntervalService
-            get(name: '$locale'): ILocaleService
-            get(name: '$location'): ILocationService
-            get(name: '$log'): ILogService
-            get(name: '$parse'): IParseService
-            get(name: '$q'): IQService
-            get(name: '$rootElement'): IRootElementService
-            get(name: '$rootScope'): IRootScopeService
-            get(name: '$sce'): ISCEService
-            get(name: '$sceDelegate'): ISCEDelegateService
-            get(name: '$templateCache'): ITemplateCacheService
-            get(name: '$templateRequest'): ITemplateRequestService
-            get(name: '$timeout'): ITimeoutService
-            get(name: '$window'): IWindowService
-            get<T>(name: '$xhrFactory'): IXhrFactory<T>
+            get(name: '$anchorScroll'): IAnchorScrollService;
+            get(name: '$cacheFactory'): ICacheFactoryService;
+            get(name: '$compile'): ICompileService;
+            get(name: '$controller'): IControllerService;
+            get(name: '$document'): IDocumentService;
+            get(name: '$exceptionHandler'): IExceptionHandlerService;
+            get(name: '$filter'): IFilterService;
+            get(name: '$http'): IHttpService;
+            get(name: '$httpBackend'): IHttpBackendService;
+            get(name: '$httpParamSerializer'): IHttpParamSerializer;
+            get(name: '$httpParamSerializerJQLike'): IHttpParamSerializer;
+            get(name: '$interpolate'): IInterpolateService;
+            get(name: '$interval'): IIntervalService;
+            get(name: '$locale'): ILocaleService;
+            get(name: '$location'): ILocationService;
+            get(name: '$log'): ILogService;
+            get(name: '$parse'): IParseService;
+            get(name: '$q'): IQService;
+            get(name: '$rootElement'): IRootElementService;
+            get(name: '$rootScope'): IRootScopeService;
+            get(name: '$sce'): ISCEService;
+            get(name: '$sceDelegate'): ISCEDelegateService;
+            get(name: '$templateCache'): ITemplateCacheService;
+            get(name: '$templateRequest'): ITemplateRequestService;
+            get(name: '$timeout'): ITimeoutService;
+            get(name: '$window'): IWindowService;
+            get<T>(name: '$xhrFactory'): IXhrFactory<T>;
             has(name: string): boolean;
             instantiate<T>(typeConstructor: Function, locals?: any): T;
             invoke(inlineAnnotatedFunction: any[]): any;
diff --git a/angular/tslint.json b/angular/tslint.json
new file mode 100644
index 0000000000..75f86620b4
--- /dev/null
+++ b/angular/tslint.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../tslint.json",
+  "rules": {
+    "class-name": true,
+    "curly": true,
+    "no-consecutive-blank-lines": true,
+    "no-shadowed-variable": true,
+    "quotemark": [true, "single"],
+    "align": true,
+    "callable-types": false,
+    "forbidden-types": false,
+    "indent": [true, "spaces"],
+    "interface-name": false,
+    "linebreak-style": [true, "LF"],
+    "no-empty-interface": false,
+    "unified-signatures": false,
+    "variable-name": [true, "check-format"],
+    "void-return": false
+  }
+}
diff --git a/archiver/index.d.ts b/archiver/index.d.ts
index ea117239ac..665624143e 100644
--- a/archiver/index.d.ts
+++ b/archiver/index.d.ts
@@ -31,7 +31,6 @@ declare namespace archiver {
     }
 
     export interface Archiver extends STREAM.Transform {
-        pipe(writeStream: FS.WriteStream): void;
         append(source: STREAM.Readable | Buffer | string, name: nameInterface): void;
 
         directory(dirpath: string, destpath: nameInterface | string): void;
diff --git a/auth0-js/auth0-js-tests.ts b/auth0-js/auth0-js-tests.ts
index 197256ddd5..68d4e1797b 100644
--- a/auth0-js/auth0-js-tests.ts
+++ b/auth0-js/auth0-js-tests.ts
@@ -1,23 +1,151 @@
 /// <reference types="auth0-js" />
 
-var auth0 = new Auth0({
+let webAuth = new auth0.WebAuth({
     domain: 'mine.auth0.com',
-    clientID: 'dsa7d77dsa7d7',
-    callbackURL: 'http://my-app.com/callback',
-    callbackOnLocationHash: true
+    clientID: 'dsa7d77dsa7d7'
 });
 
-auth0.login({
-    connection: 'google-oauth2',
-    popup: true,
-    popupOptions: {
-        width: 450,
-        height: 800
+webAuth.authorize({
+    audience: 'https://mystore.com/api/v2',
+    scope: 'read:order write:order',
+    responseType: 'token',
+    redirectUri: 'https://example.com/auth/callback'
+});
+
+webAuth.parseHash(window.location.hash, (err, authResult) => {
+    if (err) {
+        return console.log(err);
     }
-}, (err, profile, idToken, accessToken, state) => {
-        if (err) {
-            alert("something went wrong: " + err.message);
-            return;
-        }
-        alert('hello ' + profile.name);
+
+  // The contents of authResult depend on which authentication parameters were used.
+  // It can include the following:
+  // authResult.accessToken - access token for the API specified by `audience`
+  // authResult.expiresIn - string with the access token's expiration time in seconds
+  // authResult.idToken - ID token JWT containing user profile information
+
+    webAuth.client.userInfo(authResult.accessToken, (err, user) => {
+        // Now you have the user's information
     });
+});
+
+webAuth.renewAuth({
+    audience: 'https://mystore.com/api/v2',
+    scope: 'read:order write:order',
+    redirectUri: 'https://example.com/auth/silent-callback',
+
+    // this will use postMessage to comunicate between the silent callback
+    // and the SPA. When false the SDK will attempt to parse the url hash
+    // should ignore the url hash and no extra behaviour is needed.
+    usePostMessage: true
+}, function (err, authResult) {
+      // Renewed tokens or error
+});
+
+webAuth.changePassword({connection: 'the_connection',
+    email: 'me@example.com',
+    password: '123456'
+}, (err) => {});
+
+webAuth.passwordlessStart({
+    connection: 'the_connection',
+    email: 'me@example.com',
+    send: 'code'
+}, (err, data) => {});
+
+webAuth.signupAndAuthorize({
+    connection: 'the_connection',
+    email: 'me@example.com',
+    password: '123456',
+    scope: 'openid'
+}, function (err, data) {
+
+});
+
+
+
+webAuth.client.login({
+    ealm: 'Username-Password-Authentication', //connection name or HRD domain
+    username: 'info@auth0.com',
+    password: 'areallystrongpassword',
+    audience: 'https://mystore.com/api/v2',
+    scope: 'read:order write:order',
+}, function(err, authResult) {
+    // Auth tokens in the result or an error
+});
+
+let authentication = new auth0.Authentication({
+    domain: 'me.auth0.com',
+    clientID: '...',
+    redirectUri: 'http://page.com/callback',
+    responseType: 'code',
+    _sendTelemetry: false
+});
+
+authentication.buildAuthorizeUrl({state:'1234'});
+authentication.buildAuthorizeUrl({
+    responseType: 'token',
+    redirectUri: 'http://anotherpage.com/callback2',
+    prompt: 'none',
+    state: '1234',
+    connection_scope: 'scope1,scope2'
+});
+
+authentication.buildLogoutUrl('asdfasdfds');
+authentication.buildLogoutUrl();
+authentication.userInfo('abcd1234', (err, data) => {
+  //user info retrieved
+});
+
+authentication.delegation({
+    grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+    refresh_token: 'your_refresh_token',
+    api_type: 'app'
+}, (err, data) => {
+
+});
+
+authentication.loginWithDefaultDirectory({
+    username: 'someUsername',
+    password: '123456'
+}, (err, data) => {
+
+});
+
+authentication.oauthToken({
+    username: 'someUsername',
+    password: '123456',
+    grantType: 'password'
+}, (err, data) => {
+
+});
+
+authentication.getUserCountry((err, data) => {
+
+});
+
+authentication.getSSOData();
+authentication.getSSOData(true, (err, data) => {});
+
+authentication.dbConnection.signup({connection: 'bla', email: 'blabla', password: '123456'}, () => {});
+authentication.dbConnection.changePassword({connection: 'bla', email: 'blabla', password: '123456'}, () => {});
+
+authentication.passwordless.start({ connection: 'bla', send: 'blabla' }, () => {});
+authentication.passwordless.verify({ connection: 'bla', send: 'link', verificationCode: 'asdfasd', email: 'me@example.com' }, () => {});
+
+authentication.loginWithResourceOwner({
+    username: 'the username',
+    password: 'the password',
+    connection: 'the_connection',
+    scope: 'openid'
+}, (err, data) => {});
+
+let management = new auth0.Management({
+    domain: 'me.auth0.com',
+    token: 'token'
+});
+
+management.getUser('asd', (err, user) => {});
+
+management.patchUserMetadata('asd', {role: 'admin'}, (err, user) => {});
+
+management.linkUser('asd', 'eqwe', (err, user) => {});
diff --git a/auth0-js/index.d.ts b/auth0-js/index.d.ts
index bd97fed1cc..0a0e004303 100644
--- a/auth0-js/index.d.ts
+++ b/auth0-js/index.d.ts
@@ -1,136 +1,456 @@
-// Type definitions for Auth0.js
+// Type definitions for Auth0.js v8.1.3
 // Project: https://github.com/auth0/auth0.js
-// Definitions by: Robert McLaws <https://github.com/advancedrei>
+// Definitions by: Adrian Chia <https://github.com/adrianchia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/** Extensions to the browser Window object. */
-interface Window {
-    /** Allows you to pass the id_token to other APIs, as specified in https://docs.auth0.com/apps-apis */
-    token: string;
-}
-
-/** This is the interface for the main Auth0 client. */
-interface Auth0Static {
-
-    new(options: Auth0ClientOptions): Auth0Static;
-    changePassword(options: any, callback?: Function): void;
-    decodeJwt(jwt: string): any;
-    login(options: any, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): void;
-    loginWithPopup(options: Auth0LoginOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): void;
-    loginWithResourceOwner(options: Auth0LoginOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: any) => any): void;
-    loginWithUsernamePassword(options: Auth0LoginOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): void;
-    logout(query: string): void;
-    getConnections(callback?: Function): void;
-    refreshToken(refreshToken: string, callback: (error?: Auth0Error, delegationResult?: Auth0DelegationToken) => any): void;
-    getDelegationToken(options: any, callback: (error?: Auth0Error, delegationResult?: Auth0DelegationToken) => any): void;
-    getProfile(id_token: string, callback?: Function): Auth0UserProfile;
-    getSSOData(withActiveDirectories: any, callback?: Function): void;
-    parseHash(hash: string): Auth0DecodedHash;
-    signup(options: Auth0SignupOptions, callback: Function): void;
-    validateUser(options: any, callback: (error?: Auth0Error, valid?: any) => any): void;
-}
-
-/** Represents constructor options for the Auth0 client. */
-interface Auth0ClientOptions {
-    clientID: string;
-    callbackURL: string;
-    callbackOnLocationHash?: boolean;
-    responseType?: string;
-    domain: string;
-    forceJSONP?: boolean;
-}
-
-/** Represents a normalized UserProfile. */
-interface Auth0UserProfile {
-    email: string;
-    email_verified: boolean;
-    family_name: string;
-    gender: string;
-    given_name: string;
-    locale: string;
-    name: string;
-    nickname: string;
-    picture: string;
-    user_id: string;
-    /** Represents one or more Identities that may be associated with the User. */
-    identities: Auth0Identity[];
-    user_metadata?: any;
-    app_metadata?: any;
-}
-
-/** Represents an Auth0UserProfile that has a Microsoft Account as the primary identity. */
-interface MicrosoftUserProfile extends Auth0UserProfile {
-    emails: string[];
-}
-
-/** Represents an Auth0UserProfile that has an Office365 account as the primary identity. */
-interface Office365UserProfile extends Auth0UserProfile {
-    tenantid: string;
-    upn: string;
-}
-
-/** Represents an Auth0UserProfile that has an Active Directory account as the primary identity. */
-interface AdfsUserProfile extends Auth0UserProfile {
-    issuer: string;
-}
-
-/** Represents multiple identities assigned to a user. */
-interface Auth0Identity {
-    access_token: string;
-    connection: string;
-    isSocial: boolean;
-    provider: string;
-    user_id: string;
-}
-
-interface Auth0DecodedHash {
-    access_token: string;
-    idToken: string;
-    profile: Auth0UserProfile;
-    state: any;
-    error: string;
-}
-
-interface Auth0PopupOptions {
-    width: number;
-    height: number;
-}
-
-interface Auth0LoginOptions {
-    auto_login?: boolean;
-    responseType?: string;
-    connection?: string;
-    email?: string;
-    username?: string;
-    password?: string;
-    popup?: boolean;
-    popupOptions?: Auth0PopupOptions;
-}
-
-interface Auth0SignupOptions extends Auth0LoginOptions {
-    auto_login: boolean;
-}
-
-interface Auth0Error {
-    code: any;
-    details: any;
-    name: string;
-    message: string;
-    status: any;
-}
-
-/** Represents the response from an API Token Delegation request. */
-interface Auth0DelegationToken {
-    /** The length of time in seconds the token is valid for. */
-    expires_in: string;
-    /** The JWT for delegated access.  */
-    id_token: string;
-    /** The type of token being returned. Possible values: "Bearer"  */
-    token_type: string;
-}
-
-declare const Auth0: Auth0Static;
-
-declare module "auth0-js" {
-    export = Auth0
+declare namespace auth0 {
+
+    export class Authentication {
+        constructor(options: AuthOptions);
+
+        passwordless: PasswordlessAuthentication;
+        dbConnection: DBConnection;
+
+        /**
+         * Builds and returns the `/authorize` url in order to initialize a new authN/authZ transaction
+         *
+         * @method buildAuthorizeUrl
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
+         */
+        buildAuthorizeUrl(options: any): string;
+
+        /**
+         * Builds and returns the Logout url in order to initialize a new authN/authZ transaction
+         *
+         * @method buildLogoutUrl
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--v2-logout
+         */
+        buildLogoutUrl(options?: any): string;
+
+        /**
+         * Makes a call to the `oauth/token` endpoint with `password` grant type
+         *
+         * @method loginWithDefaultDirectory
+         * @param {Object} options: https://auth0.com/docs/api-auth/grant/password
+         * @param {Function} callback
+         */
+        loginWithDefaultDirectory(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Makes a call to the `/ro` endpoint
+         * @param {any}      options
+         * @param {Function} callback
+         * @deprecated `loginWithResourceOwner` will be soon deprecated, user `login` instead.
+         */
+        loginWithResourceOwner(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Makes a call to the `oauth/token` endpoint with `password-realm` grant type
+         * @param {any}     options
+         * @param {Function} callback
+         */
+        login(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Makes a call to the `oauth/token` endpoint
+         * @param {any}      options
+         * @param {Function} callback
+         */
+        oauthToken(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Makes a call to the `/ssodata` endpoint
+         *
+         * @method getSSOData
+         * @param {Boolean} withActiveDirectories
+         * @param {Function} callback
+         * @deprecated `getSSOData` will be soon deprecated.
+         */
+        getSSOData(callback?: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Makes a call to the `/ssodata` endpoint
+         *
+         * @method getSSOData
+         * @param {Boolean} withActiveDirectories
+         * @param {Function} callback
+         * @deprecated `getSSOData` will be soon deprecated.
+         */
+        getSSOData(withActiveDirectories: boolean, callback?: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Makes a call to the `/userinfo` endpoint and returns the user profile
+         *
+         * @method userInfo
+         * @param {String} accessToken
+         * @param {Function} callback
+         */
+        userInfo(token: string, callback: (error?: Auth0Error, user?: any) => any): void;
+
+        /**
+         * Makes a call to the `/delegation` endpoint
+         *
+         * @method delegation
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--delegation
+         * @param {Function} callback
+         * @deprecated `delegation` will be soon deprecated.
+         */
+        delegation(options: any, callback: (error?: Auth0Error, authResult?: Auth0DelegationToken) => any): any;
+
+        /**
+         * Fetches the user country based on the ip.
+         *
+         * @method getUserCountry
+         * @param {Function} callback
+         */
+        getUserCountry(callback: (error?: Auth0Error, result?: any) => any): void;
+    }
+
+    export class PasswordlessAuthentication {
+        constructor(request: any, option: any);
+
+        /**
+         * Builds and returns the passwordless TOTP verify url in order to initialize a new authN/authZ transaction
+         *
+         * @method buildVerifyUrl
+         * @param {Object} options
+         * @param {Function} callback
+         */
+        buildVerifyUrl(options: any): string;
+
+        /**
+         * Initializes a new passwordless authN/authZ transaction
+         *
+         * @method start
+         * @param {Object} options: https://auth0.com/docs/api/authentication#passwordless
+         * @param {Function} callback
+         */
+        start(options: PasswordlessStartOptions, callback: any): void;
+
+        /**
+         * Verifies the passwordless TOTP and returns an error if any.
+         *
+         * @method buildVerifyUrl
+         * @param {Object} options
+         * @param {Function} callback
+         */
+        verify(options: any, callback: any): void;
+    }
+
+    export class DBConnection {
+        constructor(request: any, option: any);
+
+        /**
+         * Signup a new user
+         *
+         * @method signup
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+         * @param {Function} calback
+         */
+        signup(options: any, callback: any): void;
+
+        /**
+         * Initializes the change password flow
+         *
+         * @method signup
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
+         * @param {Function} callback
+         */
+        changePassword(options: ChangePasswordOptions, callback: any): void;
+    }
+
+    export class Management {
+        constructor(options: ManagementOptions);
+
+        /**
+         * Returns the user profile. https://auth0.com/docs/api/management/v2#!/Users/get_users_by_id
+         *
+         * @method getUser
+         * @param {String} userId
+         * @param {Function} callback
+         */
+        getUser(userId: string, callback: (error?: Auth0Error, user?: any) => any): void;
+
+        /**
+         * Updates the user metdata. It will patch the user metdata with the attributes sent.
+         * https://auth0.com/docs/api/management/v2#!/Users/patch_users_by_id
+         *
+         * @method patchUserMetadata
+         * @param {String} userId
+         * @param {Object} userMetadata
+         * @param {Function} callback
+         */
+        patchUserMetadata(userId: string, userMetadata: any, callback: (error?: Auth0Error, user?: any) => any): void;
+
+        /**
+         * Link two users. https://auth0.com/docs/api/management/v2#!/Users/post_identities
+         *
+         * @method linkUser
+         * @param {String} userId
+         * @param {String} secondaryUserToken
+         * @param {Function} callback
+         */
+        linkUser(userId: string, secondaryUserToken: string, callback: (error?: Auth0Error, user?: any) => any): void;
+    }
+
+    export class WebAuth {
+        constructor(options: AuthOptions);
+        client: Authentication;
+        popup: Popup;
+        redirect: Redirect;
+
+        /**
+         * Redirects to the hosted login page (`/authorize`) in order to initialize a new authN/authZ transaction
+         *
+         * @method authorize
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
+         */
+        authorize(options: any): void;
+
+        /**
+         * Parse the url hash and extract the returned tokens depending on the transaction.
+         *
+         * Only validates id_tokens signed by Auth0 using the RS256 algorithm using the public key exposed
+         * by the `/.well-known/jwks.json` endpoint. Id tokens signed with other algorithms will not be
+         * accepted.
+         *
+         * @method parseHash
+         * @param {Object} options:
+         * @param {String} options.state [OPTIONAL] to verify the response
+         * @param {String} options.nonce [OPTIONAL] to verify the id_token
+         * @param {String} options.hash [OPTIONAL] the url hash. If not provided it will extract from window.location.hash
+         * @param {Function} callback: any(err, token_payload)
+         */
+        parseHash(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Decodes the id_token and verifies  the nonce.
+         *
+         * @method validateToken
+         * @param {String} token
+         * @param {String} state
+         * @param {String} nonce
+         * @param {Function} callback: function(err, {payload, transaction})
+         */
+        validateToken(token: string, state: string, nonce: string, callback: any): void;
+
+        /**
+         * Executes a silent authentication transaction under the hood in order to fetch a new token.
+         *
+         * @method renewAuth
+         * @param {Object} options: any valid oauth2 parameter to be sent to the `/authorize` endpoint
+         * @param {Function} callback
+         */
+        renewAuth(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Initialices a change password transaction
+         *
+         * @method changePassword
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
+         * @param {Function} callback
+         */
+        changePassword(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Signs up a new user
+         *
+         * @method signup
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+         * @param {Function} callback
+         */
+        signup(options: any, callback: any): void;
+
+        /**
+         * Signs up a new user, automatically logs the user in after the signup and returns the user token.
+         * The login will be done using /oauth/token with password-realm grant type.
+         *
+         * @method signupAndAuthorize
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+         * @param {Function} callback
+         */
+        signupAndAuthorize(options: any, callback: (error?: Auth0Error, authResult?: any) => any): void;
+
+        /**
+         * Redirects to the auth0 logout page
+         *
+         * @method logout
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--v2-logout
+         */
+        logout(options: any): void;
+
+        passwordlessStart(options: PasswordlessStartOptions, callback: (error?: Auth0Error, data?: any) => any): void;
+
+        /**
+         * Verifies the passwordless TOTP and redirects to finish the passwordless transaction
+         *
+         * @method passwordlessVerify
+         * @param {Object} options:
+         * @param {Object} options.type: `sms` or `email`
+         * @param {Object} options.phoneNumber: only if type = sms
+         * @param {Object} options.email: only if type = email
+         * @param {Object} options.connection: the connection name
+         * @param {Object} options.verificationCode: the TOTP code
+         * @param {Function} callback
+         */
+        passwordlessVerify(options: any, callback: any): void;
+    }
+
+    export class Redirect {
+        constructor(client: any, options: any);
+
+        /**
+         * Initializes the legacy Lock login flow in a popup
+         *
+         * @method loginWithCredentials
+         * @param {Object} options
+         * @param {Function} callback
+         * @deprecated `webauth.popup.loginWithCredentials` will be soon deprecated, use `webauth.client.login` instead.
+         */
+        loginWithCredentials(options: any, callback: any): void;
+
+        /**
+         * Signs up a new user and automatically logs the user in after the signup.
+         *
+         * @method signupAndLogin
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+         * @param {Function} callback
+         */
+        signupAndLogin(options: any, callback: any): void;
+    }
+
+    export class Popup {
+        constructor(client: any, options: any);
+
+        /**
+         * Initializes the popup window and returns the instance to be used later in order to avoid being blocked by the browser.
+         *
+         * @method preload
+         * @param {Object} options: receives the window height and width and any other window feature to be sent to window.open
+         */
+        preload(options: any): any;
+
+        /**
+         * Internal use.
+         *
+         * @method getPopupHandler
+         */
+        getPopupHandler(options: any, preload: boolean): any;
+        /**
+         * Opens in a popup the hosted login page (`/authorize`) in order to initialize a new authN/authZ transaction
+         *
+         * @method authorize
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
+         * @param {Function} callback
+         */
+        authorize(options: any, callback: any): void;
+
+        /**
+         * Initializes the legacy Lock login flow in a popup
+         *
+         * @method loginWithCredentials
+         * @param {Object} options
+         * @param {Function} callback
+         * @deprecated `webauth.popup.loginWithCredentials` will be soon deprecated, use `webauth.client.login` instead.
+         */
+        loginWithCredentials(options: any, callback: any): void;
+
+        /**
+         * Verifies the passwordless TOTP and returns the requested token
+         *
+         * @method passwordlessVerify
+         * @param {Object} options:
+         * @param {Object} options.type: `sms` or `email`
+         * @param {Object} options.phoneNumber: only if type = sms
+         * @param {Object} options.email: only if type = email
+         * @param {Object} options.connection: the connection name
+         * @param {Object} options.verificationCode: the TOTP code
+         * @param {Function} callback
+         */
+        passwordlessVerify(options: any, callback: any): void;
+
+        /**
+         * Signs up a new user and automatically logs the user in after the signup.
+         *
+         * @method signupAndLogin
+         * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+         * @param {Function} callback
+         */
+         signupAndLogin(options: any, callback: any): void;
+    }
+
+    interface ManagementOptions {
+        domain: string;
+        token: string;
+        _sendTelemetry?: boolean;
+        _telemetryInfo?: any;
+    }
+
+    interface AuthOptions {
+        domain: string;
+        clientID: string;
+        responseType?: string;
+        responseMode?: string;
+        redirectUri?: string;
+        scope?: string;
+        audience?: string;
+        leeway?: number;
+        _disableDeprecationWarnings?: boolean;
+        _sendTelemetry?: boolean;
+        _telemetryInfo?: any;
+    }
+
+    interface PasswordlessAuthOptions {
+        connection: string;
+        verificationCode: string;
+        phoneNumber: string;
+        email: string;
+    }
+
+    interface Auth0Error {
+        error: any;
+        errorDescription: string
+    }
+
+    interface Auth0DecodedHash {
+        accessToken?: string;
+        idToken?: string;
+        idTokenPayload?: any;
+        refreshToken?: string;
+        state?: string;
+        expiresIn?: number;
+        tokenType?: string;
+    }
+
+    /** Represents the response from an API Token Delegation request. */
+    interface Auth0DelegationToken {
+        /** The length of time in seconds the token is valid for. */
+        ExpiresIn: number;
+        /** The JWT for delegated access.  */
+        idToken: string;
+        /** The type of token being returned. Possible values: "Bearer"  */
+        tokenType: string;
+    }
+
+    interface ChangePasswordOptions {
+        connection: string;
+        email: string;
+        password?: string;
+    }
+
+    interface PasswordlessStartOptions {
+        connection: string;
+        send: string;
+        phoneNumber?: string;
+        email?: string,
+        authParams?: any;
+    }
+
+    interface PasswordlessVerifyOptions {
+        connection: string;
+        verificationCode: string;
+        phoneNumber?: string;
+        email?: string;
+    }
+
 }
diff --git a/auth0-js/v7/auth0-js-tests.ts b/auth0-js/v7/auth0-js-tests.ts
new file mode 100644
index 0000000000..d5ca0250d4
--- /dev/null
+++ b/auth0-js/v7/auth0-js-tests.ts
@@ -0,0 +1,22 @@
+/// <reference types="auth0-js/v7" />
+var auth0 = new Auth0({
+    domain: 'mine.auth0.com',
+    clientID: 'dsa7d77dsa7d7',
+    callbackURL: 'http://my-app.com/callback',
+    callbackOnLocationHash: true
+});
+
+auth0.login({
+    connection: 'google-oauth2',
+    popup: true,
+    popupOptions: {
+        width: 450,
+        height: 800
+    }
+}, (err, profile, idToken, accessToken, state) => {
+        if (err) {
+            alert("something went wrong: " + err.message);
+            return;
+        }
+        alert('hello ' + profile.name);
+    });
diff --git a/auth0-js/v7/index.d.ts b/auth0-js/v7/index.d.ts
new file mode 100644
index 0000000000..ee834d5c61
--- /dev/null
+++ b/auth0-js/v7/index.d.ts
@@ -0,0 +1,136 @@
+// Type definitions for Auth0.js v7.x
+// Project: https://github.com/auth0/auth0.js
+// Definitions by: Robert McLaws <https://github.com/advancedrei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/** Extensions to the browser Window object. */
+interface Window {
+    /** Allows you to pass the id_token to other APIs, as specified in https://docs.auth0.com/apps-apis */
+    token: string;
+}
+
+/** This is the interface for the main Auth0 client. */
+interface Auth0Static {
+
+    new(options: Auth0ClientOptions): Auth0Static;
+    changePassword(options: any, callback?: Function): void;
+    decodeJwt(jwt: string): any;
+    login(options: any, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): void;
+    loginWithPopup(options: Auth0LoginOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): void;
+    loginWithResourceOwner(options: Auth0LoginOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: any) => any): void;
+    loginWithUsernamePassword(options: Auth0LoginOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): void;
+    logout(query: string): void;
+    getConnections(callback?: Function): void;
+    refreshToken(refreshToken: string, callback: (error?: Auth0Error, delegationResult?: Auth0DelegationToken) => any): void;
+    getDelegationToken(options: any, callback: (error?: Auth0Error, delegationResult?: Auth0DelegationToken) => any): void;
+    getProfile(id_token: string, callback?: Function): Auth0UserProfile;
+    getSSOData(withActiveDirectories: any, callback?: Function): void;
+    parseHash(hash: string): Auth0DecodedHash;
+    signup(options: Auth0SignupOptions, callback: Function): void;
+    validateUser(options: any, callback: (error?: Auth0Error, valid?: any) => any): void;
+}
+
+/** Represents constructor options for the Auth0 client. */
+interface Auth0ClientOptions {
+    clientID: string;
+    callbackURL: string;
+    callbackOnLocationHash?: boolean;
+    responseType?: string;
+    domain: string;
+    forceJSONP?: boolean;
+}
+
+/** Represents a normalized UserProfile. */
+interface Auth0UserProfile {
+    email: string;
+    email_verified: boolean;
+    family_name: string;
+    gender: string;
+    given_name: string;
+    locale: string;
+    name: string;
+    nickname: string;
+    picture: string;
+    user_id: string;
+    /** Represents one or more Identities that may be associated with the User. */
+    identities: Auth0Identity[];
+    user_metadata?: any;
+    app_metadata?: any;
+}
+
+/** Represents an Auth0UserProfile that has a Microsoft Account as the primary identity. */
+interface MicrosoftUserProfile extends Auth0UserProfile {
+    emails: string[];
+}
+
+/** Represents an Auth0UserProfile that has an Office365 account as the primary identity. */
+interface Office365UserProfile extends Auth0UserProfile {
+    tenantid: string;
+    upn: string;
+}
+
+/** Represents an Auth0UserProfile that has an Active Directory account as the primary identity. */
+interface AdfsUserProfile extends Auth0UserProfile {
+    issuer: string;
+}
+
+/** Represents multiple identities assigned to a user. */
+interface Auth0Identity {
+    access_token: string;
+    connection: string;
+    isSocial: boolean;
+    provider: string;
+    user_id: string;
+}
+
+interface Auth0DecodedHash {
+    access_token: string;
+    idToken: string;
+    profile: Auth0UserProfile;
+    state: any;
+    error: string;
+}
+
+interface Auth0PopupOptions {
+    width: number;
+    height: number;
+}
+
+interface Auth0LoginOptions {
+    auto_login?: boolean;
+    responseType?: string;
+    connection?: string;
+    email?: string;
+    username?: string;
+    password?: string;
+    popup?: boolean;
+    popupOptions?: Auth0PopupOptions;
+}
+
+interface Auth0SignupOptions extends Auth0LoginOptions {
+    auto_login: boolean;
+}
+
+interface Auth0Error {
+    code: any;
+    details: any;
+    name: string;
+    message: string;
+    status: any;
+}
+
+/** Represents the response from an API Token Delegation request. */
+interface Auth0DelegationToken {
+    /** The length of time in seconds the token is valid for. */
+    expires_in: string;
+    /** The JWT for delegated access.  */
+    id_token: string;
+    /** The type of token being returned. Possible values: "Bearer"  */
+    token_type: string;
+}
+
+declare const Auth0: Auth0Static;
+
+declare module "auth0-js" {
+    export = Auth0
+}
diff --git a/auth0-js/v7/tsconfig.json b/auth0-js/v7/tsconfig.json
new file mode 100644
index 0000000000..7413e97f44
--- /dev/null
+++ b/auth0-js/v7/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "auth0-js": [
+                "auth0-js/v7"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "auth0-js-tests.ts"
+    ]
+}
diff --git a/auth0-lock/auth0-lock-tests.ts b/auth0-lock/auth0-lock-tests.ts
index deb046f3e7..4b72edcfa1 100644
--- a/auth0-lock/auth0-lock-tests.ts
+++ b/auth0-lock/auth0-lock-tests.ts
@@ -1,4 +1,4 @@
-/// <reference types="auth0-js" />
+/// <reference types="auth0-js/v7" />
 /// <reference path="index.d.ts" />
 
 const CLIENT_ID = "YOUR_AUTH0_APP_CLIENTID";
diff --git a/auth0-lock/index.d.ts b/auth0-lock/index.d.ts
index fc9a047115..09c3f4fedd 100644
--- a/auth0-lock/index.d.ts
+++ b/auth0-lock/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Brian Caruso <https://github.com/carusology>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="auth0-js" />
+/// <reference types="auth0-js/v7" />
 
 interface Auth0LockAdditionalSignUpFieldOption {
   value: string;
diff --git a/auth0.widget/auth0.widget-tests.ts b/auth0.widget/auth0.widget-tests.ts
index ec5502ca7e..6277d4cc3a 100644
--- a/auth0.widget/auth0.widget-tests.ts
+++ b/auth0.widget/auth0.widget-tests.ts
@@ -1,4 +1,4 @@
-/// <reference types="auth0-js" />
+/// <reference types="auth0-js/v7" />
 
 
 var widget: Auth0WidgetStatic = new Auth0Widget({
diff --git a/auth0.widget/index.d.ts b/auth0.widget/index.d.ts
index 1c30d83b6f..cdefd9e0fd 100644
--- a/auth0.widget/index.d.ts
+++ b/auth0.widget/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Robert McLaws <https://github.com/advancedrei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="auth0-js" />
+/// <reference types="auth0-js/v7" />
 
 
 interface Auth0WidgetStatic {
diff --git a/axios/axios-tests.ts b/axios/axios-tests.ts
index eb98e2710c..2587222b36 100644
--- a/axios/axios-tests.ts
+++ b/axios/axios-tests.ts
@@ -13,6 +13,13 @@ interface Issue {
   title: string;
 }
 
+function makePromise(val: any) {
+  return <Axios.IPromise<any>>{
+    then: () => val,
+    catch: () => val
+  };
+}
+
 axios.interceptors.request.use<any>(config => {
     console.log("Method:" + config.method + " Url:" +config.url);
     return config;
@@ -30,12 +37,23 @@ const requestId: number = axios.interceptors.request.use<any>(
 axios.interceptors.request.eject(requestId);
 axios.interceptors.request.eject(7);
 
+const requestId2: number = axios.interceptors.request.use<any>(
+  (config) => {
+    console.log("Method:" + config.method + " Url:" +config.url);
+    return makePromise(config);
+  },
+  (error: any) => error);
 
 axios.interceptors.response.use<any>(config => {
     console.log("Status:" + config.status);
     return config;
 });
 
+axios.interceptors.response.use<any>(config => {
+  console.log("Status:" + config.status);
+  return makePromise(config);
+});
+
 const responseId: number = axios.interceptors.response.use<any>(
     config => {
         console.log("Status:" + config.status);
@@ -104,4 +122,4 @@ axios.defaults.baseURL = 'https://api.example.com';
 axios.defaults.headers.common['Authorization'] = "AUTH_TOKEN";
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 
-axiosInstance.defaults.headers.common['Authorization'] = "AUTH_TOKEN";
\ No newline at end of file
+axiosInstance.defaults.headers.common['Authorization'] = "AUTH_TOKEN";
diff --git a/axios/index.d.ts b/axios/index.d.ts
index 681fefc806..b32a78ebe0 100644
--- a/axios/index.d.ts
+++ b/axios/index.d.ts
@@ -99,10 +99,10 @@ declare namespace Axios {
          * change the response data to be made before it is passed to then/catch
          */
         transformResponse?: <U>(data: T) => U;
-     
-        /** 
-         * defines whether to resolve or reject the promise for a given HTTP response status code. 
-         * If returns `true` (or is set to `null` or `undefined`), the promise will be resolved; 
+
+        /**
+         * defines whether to resolve or reject the promise for a given HTTP response status code.
+         * If returns `true` (or is set to `null` or `undefined`), the promise will be resolved;
          * otherwise, the promise will be rejected
          */
         validateStatus?: (status: number) => boolean | undefined;
@@ -199,6 +199,12 @@ declare namespace Axios {
                rejectedFn: (error: any) => any)
             : InterceptorId;
 
+        use<U>(fulfilledFn: (config: AxiosXHRConfig<U>) => IPromise<AxiosXHRConfig<U>>): InterceptorId;
+
+        use<U>(fulfilledFn: (config: AxiosXHRConfig<U>) => IPromise<AxiosXHRConfig<U>>,
+               rejectedFn: (error: any) => any)
+          : InterceptorId;
+
         eject(interceptorId: InterceptorId): void;
     }
 
@@ -209,10 +215,16 @@ declare namespace Axios {
 
         use<T>(fulfilledFn: (config: Axios.AxiosXHR<T>) => Axios.AxiosXHR<T>): InterceptorId;
 
+        use<T>(fulfilledFn: (config: Axios.AxiosXHR<T>) => IPromise<Axios.AxiosXHR<T>>): InterceptorId;
+
         use<T>(fulfilledFn: (config: Axios.AxiosXHR<T>) => Axios.AxiosXHR<T>,
                rejectedFn: (error: any) => any)
             : InterceptorId;
 
+        use<T>(fulfilledFn: (config: Axios.AxiosXHR<T>) => IPromise<Axios.AxiosXHR<T>>,
+               rejectedFn: (error: any) => any)
+          : InterceptorId;
+
         eject(interceptorId: InterceptorId): void;
     }
 
diff --git a/bufferstream/index.d.ts b/bufferstream/index.d.ts
index ab048e437f..1d1ffcdb10 100644
--- a/bufferstream/index.d.ts
+++ b/bufferstream/index.d.ts
@@ -58,7 +58,7 @@ declare class BufferStream extends stream.Duplex {
 		shortcut for buffer.length
 	*/
 	length: number;
-}
+} // https://github.com/dodo/node-bufferstream/blob/master/src/buffer-stream.coffee#L28
 declare namespace BufferStream {
 
 	export interface Opts {
diff --git a/c3/index.d.ts b/c3/index.d.ts
index aa960b0b60..5edb096395 100644
--- a/c3/index.d.ts
+++ b/c3/index.d.ts
@@ -248,6 +248,15 @@ declare namespace c3 {
              */
             width?: number;
         };
+
+        spline?: {
+            interpolation?: {
+                /**
+                 * Set custom spline interpolation
+                 */
+                type?: 'linear' | 'linear-closed' | 'basis' | 'basis-open' | 'basis-closed' | 'bundle' | 'cardinal' | 'cardinal-open' | 'cardinal-closed' | 'monotone';
+            };
+        };
     }
 
     interface Data {
diff --git a/chai-json-schema/chai-json-schema-tests.ts b/chai-json-schema/chai-json-schema-tests.ts
index 8559d3caae..d0c1234e17 100644
--- a/chai-json-schema/chai-json-schema-tests.ts
+++ b/chai-json-schema/chai-json-schema-tests.ts
@@ -9,19 +9,19 @@ import ChaiJsonSchema = require('chai-json-schema');
 chai.use(ChaiJsonSchema);
 chai.should();
 
-let goodApple = {
+const goodApple = {
     skin: 'thin',
     colors: ['red', 'green', 'yellow'],
     taste: 10
 };
 
-let badApple = {
+const badApple = {
     colors: ['brown'],
     taste: 0,
     worms: 2
 };
 
-let fruitSchema = {
+const fruitSchema = {
     title: 'fresh fruit schema v1',
     type: 'object',
     required: ['skin', 'colors', 'taste'],
@@ -54,3 +54,17 @@ badApple.should.not.be.jsonSchema(fruitSchema);
 //tdd style
 assert.jsonSchema(goodApple, fruitSchema);
 assert.notJsonSchema(badApple, fruitSchema);
+
+// tv4
+const schema = {
+    items: {
+        type: 'boolean'
+    }
+};
+
+const data1 = [true, false];
+const data2 = [true, 123];
+
+expect(chai.tv4.validate(data1, schema)).to.be.true;
+expect(chai.tv4.validate(data2, schema)).to.be.false;
+
diff --git a/chai-json-schema/index.d.ts b/chai-json-schema/index.d.ts
index e66e2c96af..1498510f9f 100644
--- a/chai-json-schema/index.d.ts
+++ b/chai-json-schema/index.d.ts
@@ -5,6 +5,7 @@
 
 // <reference types="node"/>
 // <reference types="chai" />
+import tv4 = require('tv4');
 
 declare global {
 	namespace Chai {
@@ -16,6 +17,10 @@ declare global {
 		export interface LanguageChains {
 			jsonSchema(schema: any, msg?: string): void;
 		}
+
+		export interface ChaiStatic {
+			tv4: tv4.TV4;
+		}
 	}
 }
 
diff --git a/comment-json/comment-json-tests.ts b/comment-json/comment-json-tests.ts
new file mode 100644
index 0000000000..af91ff422f
--- /dev/null
+++ b/comment-json/comment-json-tests.ts
@@ -0,0 +1,16 @@
+import * as commentJson from 'comment-json';
+
+const result = commentJson.parse(`
+/**
+ block comment at the top
+ */
+// comment at the top
+{
+  // comment for a
+  // comment line 2 for a
+  /* block comment */
+  "a": 1 // comment at right
+}
+// comment at the bottom
+`);
+const str = commentJson.stringify(result);
diff --git a/comment-json/index.d.ts b/comment-json/index.d.ts
new file mode 100644
index 0000000000..9c2652f34e
--- /dev/null
+++ b/comment-json/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for comment-json 1.1
+// Project: https://github.com/kaelzhang/node-comment-json
+// Definitions by: Jason Dent <https://github.com/Jason3S>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type Reviver = (k: number | string, v: any) => any;
+export function parse(json: string, reviver?: Reviver, removes_comments?: boolean): any;
+export function stringify(value: any, replacer?: any, space?: string | number): string;
diff --git a/comment-json/tsconfig.json b/comment-json/tsconfig.json
new file mode 100644
index 0000000000..342694cbb3
--- /dev/null
+++ b/comment-json/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "comment-json-tests.ts"
+    ]
+}
diff --git a/comment-json/tslint.json b/comment-json/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/comment-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/cron/index.d.ts b/cron/index.d.ts
index e962a9eb27..d4fa027c93 100644
--- a/cron/index.d.ts
+++ b/cron/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cron 1.0.9
+// Type definitions for cron 1.2
 // Project: https://www.npmjs.com/package/cron
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,9 +6,9 @@
 
 
 interface CronJobStatic {
-    new (cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any): CronJob;
+    new (cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean): CronJob;
     new (options: {
-        cronTime: string | Date; onTick: () => void; onComplete?: () => void; start?: boolean; timeZone?: string; context?: any
+        cronTime: string | Date; onTick: () => void; onComplete?: () => void; start?: boolean; timeZone?: string; context?: any; runOnInit?: boolean
     }): CronJob;
 }
 interface CronJob {
diff --git a/crypto-js/aes/index.d.ts b/crypto-js/aes/index.d.ts
new file mode 100644
index 0000000000..4f435688c5
--- /dev/null
+++ b/crypto-js/aes/index.d.ts
@@ -0,0 +1,3 @@
+import { AES } from '../index';
+
+export = AES;
diff --git a/crypto-js/core/index.d.ts b/crypto-js/core/index.d.ts
new file mode 100644
index 0000000000..c5d6e00410
--- /dev/null
+++ b/crypto-js/core/index.d.ts
@@ -0,0 +1,3 @@
+import * as Core from '../index';
+
+export = Core;
diff --git a/crypto-js/enc-base64/index.d.ts b/crypto-js/enc-base64/index.d.ts
new file mode 100644
index 0000000000..55001a7115
--- /dev/null
+++ b/crypto-js/enc-base64/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Base64: typeof enc.Base64;
+export = Base64;
diff --git a/crypto-js/enc-hex/index.d.ts b/crypto-js/enc-hex/index.d.ts
new file mode 100644
index 0000000000..3718860123
--- /dev/null
+++ b/crypto-js/enc-hex/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Hex: typeof enc.Hex;
+export = Hex;
diff --git a/crypto-js/enc-latin1/index.d.ts b/crypto-js/enc-latin1/index.d.ts
new file mode 100644
index 0000000000..7f27822daf
--- /dev/null
+++ b/crypto-js/enc-latin1/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Latin1: typeof enc.Latin1;
+export = Latin1;
diff --git a/crypto-js/enc-utf16/index.d.ts b/crypto-js/enc-utf16/index.d.ts
new file mode 100644
index 0000000000..76fa98774a
--- /dev/null
+++ b/crypto-js/enc-utf16/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Utf16: typeof enc.Utf16;
+export = Utf16;
diff --git a/crypto-js/enc-utf8/index.d.ts b/crypto-js/enc-utf8/index.d.ts
new file mode 100644
index 0000000000..828dcb9391
--- /dev/null
+++ b/crypto-js/enc-utf8/index.d.ts
@@ -0,0 +1,4 @@
+import { enc } from '../index';
+
+declare const Utf8: typeof enc.Utf8;
+export = Utf8;
diff --git a/crypto-js/evpkdf/index.d.ts b/crypto-js/evpkdf/index.d.ts
new file mode 100644
index 0000000000..8946b9d3a1
--- /dev/null
+++ b/crypto-js/evpkdf/index.d.ts
@@ -0,0 +1,3 @@
+import { EvpKDF } from '../index';
+
+export = EvpKDF;
diff --git a/crypto-js/format-hex/index.d.ts b/crypto-js/format-hex/index.d.ts
new file mode 100644
index 0000000000..1b0f573824
--- /dev/null
+++ b/crypto-js/format-hex/index.d.ts
@@ -0,0 +1,4 @@
+import { format } from '../index';
+
+declare const Hex: typeof format.Hex;
+export = Hex;
diff --git a/crypto-js/format-openssl/index.d.ts b/crypto-js/format-openssl/index.d.ts
new file mode 100644
index 0000000000..02c35a3688
--- /dev/null
+++ b/crypto-js/format-openssl/index.d.ts
@@ -0,0 +1,4 @@
+import { format } from '../index';
+
+declare const OpenSSL: typeof format.OpenSSL;
+export = OpenSSL;
diff --git a/crypto-js/hmac-md5/index.d.ts b/crypto-js/hmac-md5/index.d.ts
new file mode 100644
index 0000000000..7240576710
--- /dev/null
+++ b/crypto-js/hmac-md5/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacMD5 } from '../index';
+
+export = HmacMD5;
diff --git a/crypto-js/hmac-ripemd160/index.d.ts b/crypto-js/hmac-ripemd160/index.d.ts
new file mode 100644
index 0000000000..6c371e9435
--- /dev/null
+++ b/crypto-js/hmac-ripemd160/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacRIPEMD160 } from '../index';
+
+export = HmacRIPEMD160;
diff --git a/crypto-js/hmac-sha1/index.d.ts b/crypto-js/hmac-sha1/index.d.ts
new file mode 100644
index 0000000000..1995cf87f6
--- /dev/null
+++ b/crypto-js/hmac-sha1/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA1 } from '../index';
+
+export = HmacSHA1;
diff --git a/crypto-js/hmac-sha224/index.d.ts b/crypto-js/hmac-sha224/index.d.ts
new file mode 100644
index 0000000000..f25334c64c
--- /dev/null
+++ b/crypto-js/hmac-sha224/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA224 } from '../index';
+
+export = HmacSHA224;
diff --git a/crypto-js/hmac-sha256/index.d.ts b/crypto-js/hmac-sha256/index.d.ts
new file mode 100644
index 0000000000..ca1a1ca267
--- /dev/null
+++ b/crypto-js/hmac-sha256/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA256 } from '../index';
+
+export = HmacSHA256;
diff --git a/crypto-js/hmac-sha3/index.d.ts b/crypto-js/hmac-sha3/index.d.ts
new file mode 100644
index 0000000000..0fa0db9321
--- /dev/null
+++ b/crypto-js/hmac-sha3/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA3 } from '../index';
+
+export = HmacSHA3;
diff --git a/crypto-js/hmac-sha384/index.d.ts b/crypto-js/hmac-sha384/index.d.ts
new file mode 100644
index 0000000000..2e17420c1b
--- /dev/null
+++ b/crypto-js/hmac-sha384/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA384 } from '../index';
+
+export = HmacSHA384;
diff --git a/crypto-js/hmac-sha512/index.d.ts b/crypto-js/hmac-sha512/index.d.ts
new file mode 100644
index 0000000000..439b2ffd5e
--- /dev/null
+++ b/crypto-js/hmac-sha512/index.d.ts
@@ -0,0 +1,3 @@
+import { HmacSHA512 } from '../index';
+
+export = HmacSHA512;
diff --git a/crypto-js/index.d.ts b/crypto-js/index.d.ts
index 5fdf193254..07a8d18dfc 100644
--- a/crypto-js/index.d.ts
+++ b/crypto-js/index.d.ts
@@ -114,4 +114,3 @@ declare namespace CryptoJS {
 		};
 	}
 }
-
diff --git a/crypto-js/lib-typedarrays/index.d.ts b/crypto-js/lib-typedarrays/index.d.ts
new file mode 100644
index 0000000000..761e38b1cd
--- /dev/null
+++ b/crypto-js/lib-typedarrays/index.d.ts
@@ -0,0 +1,2 @@
+declare const LibTypedarrays: any;
+export = LibTypedarrays;
diff --git a/crypto-js/md5/index.d.ts b/crypto-js/md5/index.d.ts
new file mode 100644
index 0000000000..faa064511e
--- /dev/null
+++ b/crypto-js/md5/index.d.ts
@@ -0,0 +1,3 @@
+import { MD5 } from '../index';
+
+export = MD5;
diff --git a/crypto-js/mode-cfb/index.d.ts b/crypto-js/mode-cfb/index.d.ts
new file mode 100644
index 0000000000..74c5c6e3d1
--- /dev/null
+++ b/crypto-js/mode-cfb/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const CFB: typeof mode.CFB;
+export = CFB;
diff --git a/crypto-js/mode-ctr-gladman/index.d.ts b/crypto-js/mode-ctr-gladman/index.d.ts
new file mode 100644
index 0000000000..3ca8f8b367
--- /dev/null
+++ b/crypto-js/mode-ctr-gladman/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const CTRGladman: typeof mode.CTRGladman;
+export = CTRGladman;
diff --git a/crypto-js/mode-ctr/index.d.ts b/crypto-js/mode-ctr/index.d.ts
new file mode 100644
index 0000000000..6007a4ca88
--- /dev/null
+++ b/crypto-js/mode-ctr/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const CTR: typeof mode.CTR;
+export = CTR;
diff --git a/crypto-js/mode-ecb/index.d.ts b/crypto-js/mode-ecb/index.d.ts
new file mode 100644
index 0000000000..569d2b2286
--- /dev/null
+++ b/crypto-js/mode-ecb/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const ECB: typeof mode.ECB;
+export = ECB;
diff --git a/crypto-js/mode-ofb/index.d.ts b/crypto-js/mode-ofb/index.d.ts
new file mode 100644
index 0000000000..484406979d
--- /dev/null
+++ b/crypto-js/mode-ofb/index.d.ts
@@ -0,0 +1,4 @@
+import { mode } from '../index';
+
+declare const OFB: typeof mode.OFB;
+export = OFB;
diff --git a/crypto-js/pad-ansix923/index.d.ts b/crypto-js/pad-ansix923/index.d.ts
new file mode 100644
index 0000000000..2bb6c2dffb
--- /dev/null
+++ b/crypto-js/pad-ansix923/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const AnsiX923: typeof pad.AnsiX923;
+export = AnsiX923;
diff --git a/crypto-js/pad-iso10126/index.d.ts b/crypto-js/pad-iso10126/index.d.ts
new file mode 100644
index 0000000000..6e52e96197
--- /dev/null
+++ b/crypto-js/pad-iso10126/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const Iso10126: typeof pad.Iso10126;
+export = Iso10126;
diff --git a/crypto-js/pad-iso97971/index.d.ts b/crypto-js/pad-iso97971/index.d.ts
new file mode 100644
index 0000000000..0ab1cecbfb
--- /dev/null
+++ b/crypto-js/pad-iso97971/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const Iso97971: typeof pad.Iso97971;
+export = Iso97971;
diff --git a/crypto-js/pad-nopadding/index.d.ts b/crypto-js/pad-nopadding/index.d.ts
new file mode 100644
index 0000000000..f71bb2de73
--- /dev/null
+++ b/crypto-js/pad-nopadding/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const NoPadding: typeof pad.NoPadding;
+export = NoPadding;
diff --git a/crypto-js/pad-pkcs7/index.d.ts b/crypto-js/pad-pkcs7/index.d.ts
new file mode 100644
index 0000000000..1b194673a2
--- /dev/null
+++ b/crypto-js/pad-pkcs7/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const Pkcs7: typeof pad.Pkcs7;
+export = Pkcs7;
diff --git a/crypto-js/pad-zeropadding/index.d.ts b/crypto-js/pad-zeropadding/index.d.ts
new file mode 100644
index 0000000000..cf481402ab
--- /dev/null
+++ b/crypto-js/pad-zeropadding/index.d.ts
@@ -0,0 +1,4 @@
+import { pad } from '../index';
+
+declare const ZeroPadding: typeof pad.ZeroPadding;
+export = ZeroPadding;
diff --git a/crypto-js/pbkdf2/index.d.ts b/crypto-js/pbkdf2/index.d.ts
new file mode 100644
index 0000000000..e242e6fe05
--- /dev/null
+++ b/crypto-js/pbkdf2/index.d.ts
@@ -0,0 +1,3 @@
+import { PBKDF2 } from '../index';
+
+export = PBKDF2;
diff --git a/crypto-js/rabbit-legacy/index.d.ts b/crypto-js/rabbit-legacy/index.d.ts
new file mode 100644
index 0000000000..6befe37563
--- /dev/null
+++ b/crypto-js/rabbit-legacy/index.d.ts
@@ -0,0 +1,3 @@
+import { RabbitLegacy } from '../index';
+
+export = RabbitLegacy;
diff --git a/crypto-js/rabbit/index.d.ts b/crypto-js/rabbit/index.d.ts
new file mode 100644
index 0000000000..f708a6f20b
--- /dev/null
+++ b/crypto-js/rabbit/index.d.ts
@@ -0,0 +1,3 @@
+import { Rabbit } from '../index';
+
+export = Rabbit;
diff --git a/crypto-js/rc4/index.d.ts b/crypto-js/rc4/index.d.ts
new file mode 100644
index 0000000000..38a929f490
--- /dev/null
+++ b/crypto-js/rc4/index.d.ts
@@ -0,0 +1,3 @@
+import { RC4 } from '../index';
+
+export = RC4;
diff --git a/crypto-js/ripemd160/index.d.ts b/crypto-js/ripemd160/index.d.ts
new file mode 100644
index 0000000000..90e3e770ce
--- /dev/null
+++ b/crypto-js/ripemd160/index.d.ts
@@ -0,0 +1,3 @@
+import { RIPEMD160 } from '../index';
+
+export = RIPEMD160;
diff --git a/crypto-js/sha1/index.d.ts b/crypto-js/sha1/index.d.ts
new file mode 100644
index 0000000000..14fb4d2a6b
--- /dev/null
+++ b/crypto-js/sha1/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA1 } from '../index';
+
+export = SHA1;
diff --git a/crypto-js/sha224/index.d.ts b/crypto-js/sha224/index.d.ts
new file mode 100644
index 0000000000..3ff1ff4596
--- /dev/null
+++ b/crypto-js/sha224/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA224 } from '../index';
+
+export = SHA224;
diff --git a/crypto-js/sha256/index.d.ts b/crypto-js/sha256/index.d.ts
new file mode 100644
index 0000000000..59781b01f3
--- /dev/null
+++ b/crypto-js/sha256/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA256 } from '../index';
+
+export = SHA256;
diff --git a/crypto-js/sha3/index.d.ts b/crypto-js/sha3/index.d.ts
new file mode 100644
index 0000000000..241574a711
--- /dev/null
+++ b/crypto-js/sha3/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA3 } from '../index';
+
+export = SHA3;
diff --git a/crypto-js/sha384/index.d.ts b/crypto-js/sha384/index.d.ts
new file mode 100644
index 0000000000..5bad55498a
--- /dev/null
+++ b/crypto-js/sha384/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA384 } from '../index';
+
+export = SHA384;
diff --git a/crypto-js/sha512/index.d.ts b/crypto-js/sha512/index.d.ts
new file mode 100644
index 0000000000..0f764329e2
--- /dev/null
+++ b/crypto-js/sha512/index.d.ts
@@ -0,0 +1,3 @@
+import { SHA512 } from '../index';
+
+export = SHA512;
diff --git a/crypto-js/test/submodule-tests.ts b/crypto-js/test/submodule-tests.ts
new file mode 100644
index 0000000000..0cfd8cd83f
--- /dev/null
+++ b/crypto-js/test/submodule-tests.ts
@@ -0,0 +1,184 @@
+import Core = require('../core');
+import X64Core = require('../x64-core');
+import LibTypedarrays = require('../lib-typedarrays');
+// ---
+import MD5 = require('../md5');
+import SHA1 = require('../sha1');
+import SHA256 = require('../sha256');
+import SHA224 = require('../sha224');
+import SHA512 = require('../sha512');
+import SHA384 = require('../sha384');
+import SHA3 = require('../sha3');
+import RIPEMD160 = require('../ripemd160');
+// ---
+import HmacMD5 = require('../hmac-md5');
+import HmacSHA1 = require('../hmac-sha1');
+import HmacSHA256 = require('../hmac-sha256');
+import HmacSHA224 = require('../hmac-sha224');
+import HmacSHA512 = require('../hmac-sha512');
+import HmacSHA384 = require('../hmac-sha384');
+import HmacSHA3 = require('../hmac-sha3');
+import HmacRIPEMD160 = require('../hmac-ripemd160');
+// ---
+import PBKDF2 = require('../pbkdf2');
+// ---
+import AES = require('../aes');
+import TripleDES = require('../tripledes');
+import RC4 = require('../rc4');
+import Rabbit = require('../rabbit');
+import RabbitLegacy = require('../rabbit-legacy');
+import EvpKDF = require('../evpkdf');
+// ---
+import FormatOpenSSL = require('../format-openssl');
+import FormatHex = require('../format-hex');
+// ---
+import EncLatin1 = require('../enc-latin1');
+import EncUtf8 = require('../enc-utf8');
+import EncHex = require('../enc-hex');
+import EncUtf16 = require('../enc-utf16');
+import EncBase64 = require('../enc-base64');
+// ---
+import ModeCFB = require('../mode-cfb');
+import ModeCTR = require('../mode-ctr');
+import ModeCTRGladman = require('../mode-ctr-gladman');
+import ModeOFB = require('../mode-ofb');
+import ModeECB = require('../mode-ecb');
+// ---
+import PadPkcs7 = require('../pad-pkcs7');
+import PadAnsiX923 = require('../pad-ansix923');
+import PadIso10126 = require('../pad-iso10126');
+import PadIso97971 = require('../pad-iso97971');
+import PadZeroPadding = require('../pad-zeropadding');
+import PadNoPadding = require('../pad-nopadding');
+
+// Hashers
+var str: string;
+str = MD5('some message');
+str = MD5('some message', 'some key');
+
+str = SHA1('some message');
+str = SHA1('some message', 'some key', { any: true });
+
+str = FormatOpenSSL('some message');
+str = FormatOpenSSL('some message', 'some key');
+
+
+// Ciphers
+var encrypted: CryptoJS.WordArray;
+var decrypted: CryptoJS.DecryptedMessage;
+
+encrypted = <CryptoJS.WordArray>AES.encrypt("Message", "Secret Passphrase");
+decrypted = AES.decrypt(encrypted, "Secret Passphrase");
+
+encrypted = <CryptoJS.WordArray>Core.DES.encrypt("Message", "Secret Passphrase");
+decrypted = Core.DES.decrypt(encrypted, "Secret Passphrase");
+
+encrypted = TripleDES.encrypt("Message", "Secret Passphrase");
+decrypted = TripleDES.decrypt(encrypted, "Secret Passphrase");
+
+
+encrypted = Rabbit.encrypt("Message", "Secret Passphrase");
+decrypted = Rabbit.decrypt(encrypted, "Secret Passphrase");
+
+encrypted = RC4.encrypt("Message", "Secret Passphrase");
+decrypted = RC4.decrypt(encrypted, "Secret Passphrase");
+
+encrypted = Core.RC4Drop.encrypt("Message", "Secret Passphrase");
+encrypted = Core.RC4Drop.encrypt("Message", "Secret Passphrase", { drop: 3072 / 4 });
+decrypted = Core.RC4Drop.decrypt(encrypted, "Secret Passphrase", { drop: 3072 / 4 });
+
+var key = EncHex.parse('000102030405060708090a0b0c0d0e0f');
+var iv = EncHex.parse('101112131415161718191a1b1c1d1e1f');
+encrypted = AES.encrypt("Message", key, { iv: iv });
+
+encrypted = AES.encrypt("Message", "Secret Passphrase", {
+	mode: ModeCFB,
+	padding: PadAnsiX923
+});
+
+
+// The Cipher Output
+encrypted = AES.encrypt("Message", "Secret Passphrase");
+alert(encrypted.key);
+// 74eb593087a982e2a6f5dded54ecd96d1fd0f3d44a58728cdcd40c55227522223
+alert(encrypted.iv);
+// 7781157e2629b094f0e3dd48c4d786115
+alert(encrypted.salt);
+// 7a25f9132ec6a8b34
+alert(encrypted.ciphertext);
+// 73e54154a15d1beeb509d9e12f1e462a0
+alert(encrypted);
+// U2FsdGVkX1+iX5Ey7GqLND5UFUoV0b7rUJ2eEvHkYqA=
+
+var JsonFormatter = {
+	stringify: function(cipherParams: any) {
+		// create json object with ciphertext
+		var jsonObj: any = {
+			ct: cipherParams.ciphertext.toString(EncBase64)
+		};
+		// optionally add iv and salt
+		if (cipherParams.iv) {
+			jsonObj.iv = cipherParams.iv.toString();
+		}
+		if (cipherParams.salt) {
+			jsonObj.s = cipherParams.salt.toString();
+		}
+		// stringify json object
+		return JSON.stringify(jsonObj);
+	},
+	parse: function (jsonStr: any) {
+		// parse json string
+		var jsonObj = JSON.parse(jsonStr);
+		// extract ciphertext from json object, and create cipher params object
+		var cipherParams = (<any>Core).lib.CipherParams.create({
+			ciphertext: EncBase64.parse(jsonObj.ct)
+		});
+		// optionally extract iv and salt
+		if (jsonObj.iv) {
+			cipherParams.iv = EncHex.parse(jsonObj.iv);
+		}
+		if (jsonObj.s) {
+			cipherParams.salt = EncHex.parse(jsonObj.s);
+		} return cipherParams;
+	}
+};
+encrypted = AES.encrypt("Message", "Secret Passphrase", {
+	format: JsonFormatter
+});
+alert(encrypted);
+// {"ct":"tZ4MsEnfbcDOwqau68aOrQ==","iv":"8a8c8fd8fe33743d3638737ea4a00698","s":"ba06373c8f57179c"}
+decrypted = AES.decrypt(encrypted, "Secret Passphrase", {
+	format: JsonFormatter
+});
+alert(decrypted.toString(EncUtf8)); // Message
+
+
+// Progressive Ciphering
+var key = EncHex.parse('000102030405060708090a0b0c0d0e0f');
+var iv = EncHex.parse('101112131415161718191a1b1c1d1e1f');
+var aesEncryptor = Core.algo.AES.createEncryptor(key, { iv: iv });
+var ciphertextPart1 = aesEncryptor.process("Message Part 1");
+var ciphertextPart2 = aesEncryptor.process("Message Part 2");
+var ciphertextPart3 = aesEncryptor.process("Message Part 3");
+var ciphertextPart4 = aesEncryptor.finalize();
+var aesDecryptor = Core.algo.AES.createDecryptor(key, { iv: iv });
+var plaintextPart1 = aesDecryptor.process(ciphertextPart1);
+var plaintextPart2 = aesDecryptor.process(ciphertextPart2);
+var plaintextPart3 = aesDecryptor.process(ciphertextPart3);
+var plaintextPart4 = aesDecryptor.process(ciphertextPart4);
+var plaintextPart5 = aesDecryptor.finalize();
+
+
+// Encoders
+var words = EncBase64.parse('SGVsbG8sIFdvcmxkIQ==');
+var base64 = EncBase64.stringify(words);
+var words = EncLatin1.parse('Hello, World!');
+var latin1 = EncLatin1.stringify(words);
+var words = EncHex.parse('48656c6c6f2c20576f726c6421');
+var hex = EncHex.stringify(words);
+var words = EncUtf8.parse('𤭢');
+var utf8 = EncUtf8.stringify(words);
+var words = EncUtf16.parse('Hello, World!');
+var utf16 = EncUtf16.stringify(words);
+var words = Core.enc.Utf16LE.parse('Hello, World!');
+var utf16 = Core.enc.Utf16LE.stringify(words);
diff --git a/crypto-js/tripledes/index.d.ts b/crypto-js/tripledes/index.d.ts
new file mode 100644
index 0000000000..ea22173d98
--- /dev/null
+++ b/crypto-js/tripledes/index.d.ts
@@ -0,0 +1,3 @@
+import { TripleDES } from '../index';
+
+export = TripleDES;
diff --git a/crypto-js/tsconfig.json b/crypto-js/tsconfig.json
index 94793c83ae..10865613d3 100644
--- a/crypto-js/tsconfig.json
+++ b/crypto-js/tsconfig.json
@@ -18,6 +18,51 @@
     },
     "files": [
         "index.d.ts",
-        "crypto-js-tests.ts"
+        "crypto-js-tests.ts",
+        "test/submodule-tests.ts",
+        "core/index.d.ts",
+        "x64-core/index.d.ts",
+        "lib-typedarrays/index.d.ts",
+        "md5/index.d.ts",
+        "sha1/index.d.ts",
+        "sha256/index.d.ts",
+        "sha224/index.d.ts",
+        "sha512/index.d.ts",
+        "sha384/index.d.ts",
+        "sha3/index.d.ts",
+        "ripemd160/index.d.ts",
+        "hmac-md5/index.d.ts",
+        "hmac-sha1/index.d.ts",
+        "hmac-sha256/index.d.ts",
+        "hmac-sha224/index.d.ts",
+        "hmac-sha512/index.d.ts",
+        "hmac-sha384/index.d.ts",
+        "hmac-sha3/index.d.ts",
+        "hmac-ripemd160/index.d.ts",
+        "pbkdf2/index.d.ts",
+        "aes/index.d.ts",
+        "tripledes/index.d.ts",
+        "rc4/index.d.ts",
+        "rabbit/index.d.ts",
+        "rabbit-legacy/index.d.ts",
+        "evpkdf/index.d.ts",
+        "format-openssl/index.d.ts",
+        "format-hex/index.d.ts",
+        "enc-latin1/index.d.ts",
+        "enc-utf8/index.d.ts",
+        "enc-hex/index.d.ts",
+        "enc-utf16/index.d.ts",
+        "enc-base64/index.d.ts",
+        "mode-cfb/index.d.ts",
+        "mode-ctr/index.d.ts",
+        "mode-ctr-gladman/index.d.ts",
+        "mode-ofb/index.d.ts",
+        "mode-ecb/index.d.ts",
+        "pad-pkcs7/index.d.ts",
+        "pad-ansix923/index.d.ts",
+        "pad-iso10126/index.d.ts",
+        "pad-iso97971/index.d.ts",
+        "pad-zeropadding/index.d.ts",
+        "pad-nopadding/index.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/crypto-js/x64-core/index.d.ts b/crypto-js/x64-core/index.d.ts
new file mode 100644
index 0000000000..1ef7a67477
--- /dev/null
+++ b/crypto-js/x64-core/index.d.ts
@@ -0,0 +1,3 @@
+import * as X64Core  from '../index';
+
+export = X64Core;
diff --git a/d3-hierarchy/d3-hierarchy-tests.ts b/d3-hierarchy/d3-hierarchy-tests.ts
index ce7354afe3..7079fae827 100644
--- a/d3-hierarchy/d3-hierarchy-tests.ts
+++ b/d3-hierarchy/d3-hierarchy-tests.ts
@@ -125,6 +125,13 @@ hierarchyRootNode = hierarchyRootNode.sum(function (d) { return d.val; });
 
 num = hierarchyRootNode.value;
 
+// count() and value ----------------------------------------------------------
+
+hierarchyRootNode = hierarchyRootNode.count();
+
+num = hierarchyRootNode.value;
+
+
 // sort ---------------------------------------------------------------------
 
 hierarchyRootNode = hierarchyRootNode.sort(function (a, b) {
@@ -307,6 +314,12 @@ clusterRootNode = clusterRootNode.sum(function (d) { return d.val; });
 
 num = clusterRootNode.value;
 
+// count() and value ----------------------------------------------------------
+
+clusterRootNode = clusterRootNode.count();
+
+num = clusterRootNode.value;
+
 // sort ---------------------------------------------------------------------
 
 clusterRootNode = clusterRootNode.sort(function (a, b) {
@@ -584,6 +597,11 @@ treemapRootNode = treemapRootNode.sum(function (d) { return d.val; });
 
 num = treemapRootNode.value;
 
+// count() and value ----------------------------------------------------------
+
+treemapRootNode = treemapRootNode.count();
+
+num = treemapRootNode.value;
 // sort ---------------------------------------------------------------------
 
 treemapRootNode = treemapRootNode.sort(function (a, b) {
@@ -766,6 +784,11 @@ packRootNode = packRootNode.sum(function (d) { return d.val; });
 
 num = packRootNode.value;
 
+// count() and value ----------------------------------------------------------
+
+packRootNode = packRootNode.count();
+
+num = packRootNode.value;
 // sort ---------------------------------------------------------------------
 
 packRootNode = packRootNode.sort(function (a, b) {
diff --git a/d3-hierarchy/index.d.ts b/d3-hierarchy/index.d.ts
index 7eef444875..bfe750b31e 100644
--- a/d3-hierarchy/index.d.ts
+++ b/d3-hierarchy/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for D3JS d3-hierarchy module v1.0.2
+// Type definitions for D3JS d3-hierarchy module 1.1
 // Project: https://github.com/d3/d3-hierarchy/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// Last module patch version validated against: 1.1.1
+
 // -----------------------------------------------------------------------
 // Hierarchy
 // -----------------------------------------------------------------------
@@ -20,7 +22,7 @@ export interface HierarchyNode<Datum> {
     parent: HierarchyNode<Datum> | null;
     children?: Array<HierarchyNode<Datum>>;
     /**
-     * Aggregated numeric value as calculated by sum(value),
+     * Aggregated numeric value as calculated by sum(value) or count(),
      * if previously invoked.
      */
     readonly value?: number;
@@ -35,6 +37,7 @@ export interface HierarchyNode<Datum> {
     path(target: HierarchyNode<Datum>): Array<HierarchyNode<Datum>>;
     links(): Array<HierarchyLink<Datum>>;
     sum(value: (d: Datum) => number): this;
+    count(): this;
     sort(compare: (a: HierarchyNode<Datum>, b: HierarchyNode<Datum>) => number): this;
     each(func: (node: HierarchyNode<Datum>) => void): this;
     eachAfter(func: (node: HierarchyNode<Datum>) => void): this;
@@ -43,7 +46,7 @@ export interface HierarchyNode<Datum> {
 }
 
 
-export function hierarchy<Datum>(data: Datum, children?: (d: Datum) => (Array<Datum> | null)): HierarchyNode<Datum>;
+export function hierarchy<Datum>(data: Datum, children?: (d: Datum) => (Datum[] | null)): HierarchyNode<Datum>;
 
 // -----------------------------------------------------------------------
 // Stratify
@@ -53,11 +56,11 @@ export function hierarchy<Datum>(data: Datum, children?: (d: Datum) => (Array<Da
 
 
 export interface StratifyOperator<Datum> {
-    (data: Array<Datum>): HierarchyNode<Datum>;
-    id(): (d: Datum, i: number, data: Array<Datum>) => (string | null | '' | undefined);
-    id(id: (d: Datum, i?: number, data?: Array<Datum>) => (string | null | '' | undefined)): this;
-    parentId(): (d: Datum, i: number, data: Array<Datum>) => (string | null | '' | undefined);
-    parentId(parentId: (d: Datum, i?: number, data?: Array<Datum>) => (string | null | '' | undefined)): this;
+    (data: Datum[]): HierarchyNode<Datum>;
+    id(): (d: Datum, i: number, data: Datum[]) => (string | null | '' | undefined);
+    id(id: (d: Datum, i?: number, data?: Datum[]) => (string | null | '' | undefined)): this;
+    parentId(): (d: Datum, i: number, data: Datum[]) => (string | null | '' | undefined);
+    parentId(parentId: (d: Datum, i?: number, data?: Datum[]) => (string | null | '' | undefined)): this;
 }
 
 export function stratify<Datum>(): StratifyOperator<Datum>;
@@ -80,7 +83,7 @@ export interface HierarchyPointNode<Datum> {
     parent: HierarchyPointNode<Datum> | null;
     children?: Array<HierarchyPointNode<Datum>>;
     /**
-     * Aggregated numeric value as calculated by sum(value),
+     * Aggregated numeric value as calculated by sum(value) or count(),
      * if previously invoked.
      */
     readonly value?: number;
@@ -95,6 +98,7 @@ export interface HierarchyPointNode<Datum> {
     path(target: HierarchyPointNode<Datum>): Array<HierarchyPointNode<Datum>>;
     links(): Array<HierarchyPointLink<Datum>>;
     sum(value: (d: Datum) => number): this;
+    count(): this;
     sort(compare: (a: HierarchyPointNode<Datum>, b: HierarchyPointNode<Datum>) => number): this;
     each(func: (node: HierarchyPointNode<Datum>) => void): this;
     eachAfter(func: (node: HierarchyPointNode<Datum>) => void): this;
@@ -150,7 +154,7 @@ export interface HierarchyRectangularNode<Datum> {
     parent: HierarchyRectangularNode<Datum> | null;
     children?: Array<HierarchyRectangularNode<Datum>>;
     /**
-     * Aggregated numeric value as calculated by sum(value),
+     * Aggregated numeric value as calculated by sum(value) or count(),
      * if previously invoked.
      */
     readonly value?: number;
@@ -165,6 +169,7 @@ export interface HierarchyRectangularNode<Datum> {
     path(target: HierarchyRectangularNode<Datum>): Array<HierarchyRectangularNode<Datum>>;
     links(): Array<HierarchyRectangularLink<Datum>>;
     sum(value: (d: Datum) => number): this;
+    count(): this;
     sort(compare: (a: HierarchyRectangularNode<Datum>, b: HierarchyRectangularNode<Datum>) => number): this;
     each(func: (node: HierarchyRectangularNode<Datum>) => void): this;
     eachAfter(func: (node: HierarchyRectangularNode<Datum>) => void): this;
@@ -258,7 +263,7 @@ export interface HierarchyCircularNode<Datum> {
     parent: HierarchyCircularNode<Datum> | null;
     children?: Array<HierarchyCircularNode<Datum>>;
     /**
-     * Aggregated numeric value as calculated by sum(value),
+     * Aggregated numeric value as calculated by sum(value) or count(),
      * if previously invoked.
      */
     readonly value?: number;
@@ -273,6 +278,7 @@ export interface HierarchyCircularNode<Datum> {
     path(target: HierarchyCircularNode<Datum>): Array<HierarchyCircularNode<Datum>>;
     links(): Array<HierarchyCircularLink<Datum>>;
     sum(value: (d: Datum) => number): this;
+    count(): this;
     sort(compare: (a: HierarchyCircularNode<Datum>, b: HierarchyCircularNode<Datum>) => number): this;
     each(func: (node: HierarchyCircularNode<Datum>) => void): this;
     eachAfter(func: (node: HierarchyCircularNode<Datum>) => void): this;
@@ -310,6 +316,6 @@ export interface PackCircle {
 // For invocation of packEnclose the x and y coordinates are mandatory. It seems easier to just comment
 // on the mandatory nature, then to create separate interfaces and having to deal with recasting.
 
-export function packSiblings<Datum extends PackCircle>(circles: Array<Datum>): Array<Datum>;
+export function packSiblings<Datum extends PackCircle>(circles: Datum[]): Datum[];
 
-export function packEnclose<Datum extends PackCircle>(circles: Array<Datum>): { r: number, x: number, y: number };
+export function packEnclose<Datum extends PackCircle>(circles: Datum[]): { r: number, x: number, y: number };
diff --git a/d3/index.d.ts b/d3/index.d.ts
index 61953fe148..bf7fa8e6b6 100644
--- a/d3/index.d.ts
+++ b/d3/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for D3JS d3 standard bundle 4.4
+// Type definitions for D3JS d3 standard bundle 4.5
 // Project: https://github.com/d3/d3
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/dockerode/dockerode-tests.ts b/dockerode/dockerode-tests.ts
new file mode 100644
index 0000000000..e1533e91f7
--- /dev/null
+++ b/dockerode/dockerode-tests.ts
@@ -0,0 +1,58 @@
+import * as Docker from 'dockerode';
+
+// Code samples from Dockerode 'Getting started'
+const docker = new Docker();
+const docker1 = new Docker({ socketPath: '/var/run/docker.sock' });
+const docker2 = new Docker({ host: 'http://192.168.1.10', port: 3000 });
+const docker3 = new Docker({ protocol: 'http', host: '127.0.0.1', port: 3000 });
+const docker4 = new Docker({ host: '127.0.0.1', port: 3000 });
+
+const docker5 = new Docker({
+  host: '192.168.1.10',
+  port: process.env.DOCKER_PORT || 2375,
+  ca: 'ca',
+  cert: 'cert',
+  key: 'key'
+});
+
+const docker6 = new Docker({
+  protocol: 'https', //you can enforce a protocol
+  host: '192.168.1.10',
+  port: process.env.DOCKER_PORT || 2375,
+  ca: 'ca',
+  cert: 'cert',
+  key: 'key'
+});
+
+const container = docker.getContainer('container-id');
+container.inspect((err, data) => {
+  // NOOP
+});
+
+container.start((err, data) => {
+  // NOOP
+});
+
+container.remove((err, data) => {
+  // NOOP
+});
+
+docker.listContainers((err, containers) => {
+  containers.forEach(container => {
+    docker
+      .getContainer(container.Id)
+      .stop((err, data) => {
+        // NOOP
+      });
+  });
+});
+
+docker.buildImage('archive.tar', { t: 'imageName' }, (err, response) => {
+  // NOOP
+});
+
+docker.createContainer({ Tty: true }, (err, container) => {
+  container.start((err, data) => {
+    // NOOP
+  });
+});
\ No newline at end of file
diff --git a/dockerode/index.d.ts b/dockerode/index.d.ts
new file mode 100644
index 0000000000..2c5caaf9cc
--- /dev/null
+++ b/dockerode/index.d.ts
@@ -0,0 +1,643 @@
+// Type definitions for dockerode 2.3
+// Project: https://github.com/apocas/dockerode
+// Definitions by: Carl Winkler <https://github.com/seikho>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from 'stream';
+import * as events from 'events';
+
+
+declare namespace Dockerode {
+  interface Container {
+    inspect(options: {}, callback: Callback<ContainerInspectInfo>): void;
+    inspect(callback: Callback<ContainerInspectInfo>): void;
+    inspect(options?: {}): { id: string };
+
+    rename(options: {}, callback: Callback<any>): void;
+
+    update(options: {}, callback: Callback<any>): void;
+
+    top(options: {}, callback: Callback<any>): void;
+    top(callback: Callback<any>): void;
+
+    changes(callback: Callback<any>): void;
+
+    export(callback: Callback<NodeJS.ReadableStream>): void;
+
+    start(options: {}, callback: Callback<any>): void;
+    start(callback: Callback<any>): void;
+
+    pause(options: {}, callback: Callback<any>): void;
+    pause(callback: Callback<any>): void;
+
+    unpause(options: {}, callback: Callback<any>): void;
+    unpause(callback: Callback<any>): void;
+
+    exec(options: {}, callback: Callback<any>): void;
+
+    commit(options: {}, callback: Callback<any>): void;
+    commit(callback: Callback<any>): void;
+
+    stop(options: {}, callback: Callback<any>): void;
+    stop(callback: Callback<any>): void;
+
+    restart(options: {}, callback: Callback<any>): void;
+    restart(callback: Callback<any>): void;
+
+    kill(options: {}, callback: Callback<any>): void;
+    kill(callback: Callback<any>): void;
+
+    resize(options: {}, callback: Callback<any>): void;
+    resize(callback: Callback<any>): void;
+
+    wait(callback: Callback<any>): void;
+
+    remove(options: {}, callback: Callback<any>): void;
+    remove(callback: Callback<any>): void;
+
+    /** Deprecated since RAPI v1.20 */
+    copy(options: {}, callback: Callback<any>): void;
+    /** Deprecated since RAPI v1.20 */
+    copy(callback: Callback<any>): void;
+
+    getArchive(options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+
+    infoArchive(options: {}, callback: Callback<any>): void;
+
+    /** @param file Filename (will read synchronously), Buffer or stream */
+    putArchive(file: string | Buffer | NodeJS.ReadableStream, options: {}, callback: Callback<NodeJS.WritableStream>): void;
+
+    logs(options: { stdout?: boolean, stderr?: boolean, follow?: boolean, since?: number, details?: boolean, tail?: number, timestamps?: boolean }, callback: Callback<NodeJS.ReadableStream>): void;
+    logs(callback: Callback<NodeJS.ReadableStream>): void;
+
+    stats(options: {}, callback: Callback<any>): void;
+    stats(callback: Callback<any>): void;
+
+    attach(options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+
+    modem: any;
+    id?: string;
+  }
+
+  interface Image {
+    inspect(callback: Callback<ImageInspectInfo>): void;
+
+    history(callback: Callback<any>): void;
+
+    get(callback: Callback<NodeJS.ReadableStream>): void;
+
+    push(options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+    push(callback: Callback<NodeJS.ReadableStream>): void;
+
+    tag(options: {}, callback: Callback<any>): void;
+    tag(callback: Callback<any>): void;
+
+    remove(options: {}, callback: Callback<any>): void;
+    remove(callback: Callback<any>): void;
+
+    modem: any;
+    id?: string;
+  }
+
+  interface Volume {
+    inspect(callback: Callback<any>): void;
+
+    remove(options: {}, callback: Callback<any>): void;
+    remove(callback: Callback<any>): void;
+
+    modem: any;
+    name?: string;
+  }
+
+  interface Service {
+    inspect(callback: Callback<any>): void;
+
+    remove(options: {}, callback: Callback<any>): void;
+    remove(callback: Callback<any>): void;
+
+    update(options: {}, callback: Callback<any>): void;
+
+    modem: any;
+    id?: string;
+  }
+
+  interface Task {
+    inspect(callback: Callback<any>): void;
+
+    modem: any;
+    id?: string;
+  }
+
+  interface Node {
+    inspect(callback: Callback<any>): void;
+
+    modem: any;
+    id?: string;
+  }
+
+  interface Network {
+    inspect(callback: Callback<any>): void;
+
+    remove(options: {}, callback: Callback<any>): void;
+    remove(callback: Callback<any>): void;
+
+    connect(options: {}, callback: Callback<any>): void;
+    connect(callback: Callback<any>): void;
+
+    disconnect(options: {}, callback: Callback<any>): void;
+    disconnect(callback: Callback<any>): void;
+
+    modem: any;
+    id?: string;
+  }
+
+  interface Exec {
+    inspect(callback: Callback<any>): void;
+
+    start(options: {}, callback: Callback<any>): void;
+
+    resize(options: {}, callback: Callback<any>): void;
+
+    modem: any;
+    id?: string;
+  }
+
+  interface ImageInfo {
+    Id: string;
+    ParentId: string;
+    RepoTags: string[];
+    RepoDigests?: string[];
+    Created: number;
+    Size: number;
+    VirtualSize: number;
+    Labels: { [label: string]: string };
+  }
+
+  interface ContainerInfo {
+    Id: string;
+    Names: string[];
+    Image: string;
+    ImageID: string;
+    Command: string;
+    Created: number;
+    Ports: Port[];
+    Labels: { [label: string]: string };
+    Status: string;
+    HostConfig: {
+      NetworkMode: string;
+    };
+    NetworkSettings: {
+      Networks: { [networkType: string]: NetworkInfo }
+    };
+  }
+
+  interface Port {
+    IP: string;
+    PrivatePort: number;
+    PublicPort: number;
+    Type: string;
+  }
+
+  interface NetworkInfo {
+    IPAMConfig?: any;
+    Links?: any;
+    Aliases?: any;
+    NetworkID: string;
+    EndpointID: string;
+    Gateway: string;
+    IPAddress: string;
+    IPPrefixLen: number;
+    IPv6Gateway: string;
+    GlobalIPv6Address: string;
+    GlobalIPv6PrefixLen: number;
+    MacAddress: string;
+  }
+
+  interface ContainerInspectInfo {
+    Id: string;
+    Created: string;
+    Path: string;
+    Args: string[];
+    State: {
+      Status: string;
+      Running: boolean;
+      Paused: boolean;
+      Restarting: boolean;
+      OOMKilled: boolean;
+      Dead: boolean;
+      Pid: number;
+      ExitCode: number;
+      Error: string;
+      StartedAt: string;
+      FinishedAt: string;
+    };
+    Image: string;
+    ResolvConfPath: string;
+    HostnamePath: string;
+    HostsPath: string;
+    LogPath: string;
+    Name: string;
+    RestartCount: number;
+    Driver: string;
+    MountLabel: string;
+    ProcessLabel: string;
+    AppArmorProfile: string;
+    ExecIDs?: any;
+    HostConfig: HostConfig;
+    GraphDriver: {
+      Name: string;
+      Data: {
+        DeviceId: string;
+        DeviceName: string;
+        DeviceSize: string;
+      }
+    };
+    Mounts: Array<{
+      Source: string;
+      Destination: string;
+      Mode: string;
+      RW: boolean;
+      Propagation: string;
+    }>;
+    Config: {
+      Hostname: string;
+      Domainname: string;
+      User: string;
+      AttachStdin: boolean;
+      AttachStdout: boolean;
+      AttachStderr: boolean;
+      ExposedPorts: { [portAndProtocol: string]: {} };
+      Tty: boolean;
+      OpenStdin: boolean;
+      StdinOnce: boolean;
+      Env: string[];
+      Cmd: string[];
+      Image: string;
+      Volumes: { [volume: string]: {} };
+      WorkingDir: string;
+      Entrypoint?: any;
+      OnBuild?: any;
+      Labels: { [label: string]: string }
+    };
+    NetworkSettings: {
+      Bridge: string;
+      SandboxID: string;
+      HairpinMode: boolean;
+      LinkLocalIPv6Address: string;
+      LinkLocalIPv6PrefixLen: number;
+      Ports: {
+        [portAndProtocol: string]: {
+          HostIp: string;
+          HostPort: string;
+        }
+      };
+      SandboxKey: string;
+      SecondaryIPAddresses?: any;
+      SecondaryIPv6Addresses?: any;
+      EndpointID: string;
+      Gateway: string;
+      GlobalIPv6Address: string;
+      GlobalIPv6PrefixLen: number;
+      IPAddress: string;
+      IPPrefixLen: number;
+      IPv6Gateway: string;
+      MacAddress: string;
+      Networks: {
+        [type: string]: {
+          IPAMConfig?: any;
+          Links?: any;
+          Aliases?: any;
+          NetworkID: string;
+          EndpointID: string;
+          Gateway: string;
+          IPAddress: string;
+          IPPrefixLen: number;
+          IPv6Gateway: string;
+          GlobalIPv6Address: string;
+          GlobalIPv6PrefixLen: number;
+          MacAddress: string;
+        }
+      }
+    };
+  }
+
+  interface HostConfig {
+    Binds: string[];
+    ContainerIDFile: string;
+    LogConfig: {
+      Type: string;
+      Config: any;
+    };
+    NetworkMode: string;
+    PortBindings?: any;
+    RestartPolicy: {
+      Name: string;
+      MaximumRetryCount: number;
+    };
+    VolumeDriver: string;
+    VolumesFrom?: any;
+    CapAdd?: any;
+    CapDrop?: any;
+    Dns: any[];
+    DnsOptions: any[];
+    DnsSearch: any[];
+    ExtraHosts?: any;
+    IpcMode: string;
+    Links?: any;
+    OomScoreAdj: number;
+    PidMode: string;
+    Privileged: boolean;
+    PublishAllPorts: boolean;
+    ReadonlyRootfs: boolean;
+    SecurityOpt?: any;
+    UTSMode: string;
+    ShmSize: number;
+    ConsoleSize: number[];
+    Isolation: string;
+    CpuShares: number;
+    CgroupParent: string;
+    BlkioWeight: number;
+    BlkioWeightDevice?: any;
+    BlkioDeviceReadBps?: any;
+    BlkioDeviceWriteBps?: any;
+    BlkioDeviceReadIOps?: any;
+    BlkioDeviceWriteIOps?: any;
+    CpuPeriod: number;
+    CpuQuota: number;
+    CpusetCpus: string;
+    CpusetMems: string;
+    Devices?: any;
+    KernelMemory: number;
+    Memory: number;
+    MemoryReservation: number;
+    MemorySwap: number;
+    MemorySwappiness: number;
+    OomKillDisable: boolean;
+    PidsLimit: number;
+    Ulimits?: any;
+  }
+
+  interface ImageInspectInfo {
+    Id: string;
+    RepoTags: string[];
+    RepoDigests: string[];
+    Parent: string;
+    Comment: string;
+    Created: string;
+    Container: string;
+    ContainerConfig:
+    {
+      Hostname: string;
+      Domainname: string;
+      User: string;
+      AttachStdin: boolean;
+      AttachStdout: boolean;
+      AttachStderr: boolean;
+      ExposedPorts: { [portAndProtocol: string]: {} };
+      Tty: boolean;
+      OpenStdin: boolean;
+      StdinOnce: boolean;
+      Env: string[];
+      Cmd: string[];
+      ArgsEscaped: boolean;
+      Image: string;
+      Volumes: { [path: string]: {} },
+      WorkingDir: string;
+      Entrypoint?: any;
+      OnBuild?: any[];
+      Labels: { [label: string]: string }
+    };
+    DockerVersion: string;
+    Author: string;
+    Config:
+    {
+      Hostname: string;
+      Domainname: string;
+      User: string;
+      AttachStdin: boolean;
+      AttachStdout: boolean;
+      AttachStderr: boolean;
+      ExposedPorts: { [portAndProtocol: string]: {} }
+      Tty: boolean;
+      OpenStdin: boolean;
+      StdinOnce: boolean;
+      Env: string[];
+      Cmd: string[];
+      ArgsEscaped: boolean;
+      Image: string;
+      Volumes: { [path: string]: {} },
+      WorkingDir: string;
+      Entrypoint?: any;
+      OnBuild: any[];
+      Labels: { [label: string]: string }
+    };
+    Architecture: string;
+    Os: string;
+    Size: number;
+    VirtualSize: number;
+    GraphDriver:
+    {
+      Name: string;
+      Data:
+      {
+        DeviceId: string;
+        DeviceName: string;
+        DeviceSize: string;
+      }
+    };
+  }
+
+  interface ContainerCreateOptions {
+    name?: string;
+    Hostname?: string;
+    Domainname?: string;
+    User?: string;
+    AttachStdin?: boolean;
+    AttachStdout?: boolean;
+    AttachStderr?: boolean;
+    Tty?: boolean;
+    OpenStdin?: boolean;
+    StdinOnce?: boolean;
+    Env?: string[];
+    Cmd?: string[];
+    Entrypoint?: string;
+    Image?: string;
+    Labels?: { [label: string]: string };
+    Volumes?: { [volume: string]: {} };
+    WorkingDir?: string;
+    NetworkDisabled?: boolean;
+    MacAddress?: boolean;
+    ExposedPorts?: { [port: string]: {} };
+    StopSignal?: string;
+    HostConfig?: {
+      Binds?: string[];
+      Links?: string[];
+      Memory?: number;
+      MemorySwap?: number;
+      MemoryReservation?: number;
+      KernelMemory?: number;
+      CpuPercent?: number;
+      CpuShares?: number;
+      CpuPeriod?: number;
+      CpuQuota?: number;
+      CpusetMems?: string;
+      MaximumIOps?: number;
+      MaxmimumIOBps?: number;
+      BlkioWeightDevice?: Array<{}>;
+      BlkioDeviceReadBps?: Array<{}>;
+      BlkioDeviceReadIOps?: Array<{}>;
+      BlkioDeviceWriteBps?: Array<{}>;
+      BlkioDeviceWriteIOps?: Array<{}>;
+      MemorySwappiness?: number;
+      OomKillDisable?: boolean;
+      OomScoreAdj?: number;
+      PidMode?: string;
+      PidsLimit?: number;
+      PortBindings?: { [portAndProtocol: string]: Array<{ [index: string]: string }> };
+      PublishAllPorts?: boolean;
+      Privileged?: boolean;
+      ReadonlyRootfs?: boolean;
+      Dns?: string[];
+      DnsOptions?: string[];
+      DnsSearch?: string[];
+      ExtraHosts?: any;
+      VolumesFrom?: string[];
+      CapAdd?: string[];
+      CapDrop?: string[];
+      GroupAdd?: string[];
+      RestartPolicy?: { [index: string]: number | string };
+      NetworkMode?: string;
+      Devices?: any[];
+      Sysctls?: { [index: string]: string };
+      Ulimits?: Array<{}>;
+      LogConfig?: { [index: string]: string | {} };
+      SecurityOpt?: { [index: string]: any };
+      CgroupParent?: string;
+      VolumeDriver?: string;
+      ShmSize?: number;
+    };
+    NetworkingConfig?: {
+      EndpointsConfig?: {
+        [index: string]: any;
+        isolated_nw?: {
+          [index: string]: any;
+          IPAMConfig?: {
+            IPv4Address?: string;
+            IPv6Adress?: string;
+            LinkLocalIPs?: string[];
+          }
+          Links?: string[];
+          Aliases?: string[];
+        }
+      }
+    };
+  }
+
+  interface DockerOptions {
+    socketPath?: string;
+    host?: string;
+    port?: number;
+    ca?: string;
+    cert?: string;
+    key?: string;
+    protocol?: "https" | "http";
+    timeout?: number;
+  }
+}
+
+type Callback<T> = (error?: any, result?: T) => void;
+
+declare class Dockerode {
+  constructor(options?: Dockerode.DockerOptions);
+
+  createContainer(options: Dockerode.ContainerCreateOptions, callback: Callback<Dockerode.Container>): void;
+
+  createImage(options: {}, callback: Callback<Dockerode.Image>): void;
+  createImage(auth: any, options: {}, callback: Callback<Dockerode.Image>): void;
+
+  loadImage(file: string, options: {}, callback: Callback<any>): void;
+  loadImage(file: string, callback: Callback<any>): void;
+
+  importImage(file: string, options: {}, callback: Callback<any>): void;
+  importImage(file: string, callback: Callback<any>): void;
+
+  checkAuth(options: any, callback: Callback<any>): void;
+
+  buildImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<any>): void;
+  buildImage(file: string | NodeJS.ReadableStream, callback: Callback<any>): void;
+
+  getContainer(id: string): Dockerode.Container;
+
+  getImage(name: string): Dockerode.Image;
+
+  getVolume(name: string): Dockerode.Volume;
+
+  getService(id: string): Dockerode.Service;
+
+  getTask(id: string): Dockerode.Task;
+
+  getNode(id: string): Node;
+
+  getNetwork(id: string): Dockerode.Network;
+
+  getExec(id: string): Dockerode.Exec;
+
+  listContainers(options: {}, callback: Callback<Dockerode.ContainerInfo[]>): void;
+  listContainers(callback: Callback<Dockerode.ContainerInfo[]>): void;
+
+  listImages(options: {}, callback: Callback<Dockerode.ImageInfo[]>): void;
+  listImages(callback: Callback<Dockerode.ImageInfo[]>): void;
+
+  listServices(options: {}, callback: Callback<any[]>): void;
+  listServices(callback: Callback<any[]>): void;
+
+  listNodes(options: {}, callback: Callback<any[]>): void;
+  listNodes(callback: Callback<any[]>): void;
+
+  listTasks(options: {}, callback: Callback<any[]>): void;
+  listTasks(callback: Callback<any[]>): void;
+
+  listVolumes(options: {}, callback: Callback<any[]>): void;
+  listVolumes(callback: Callback<any[]>): void;
+
+  listNetworks(options: {}, callback: Callback<any[]>): void;
+  listNetworks(callback: Callback<any[]>): void;
+
+  createVolume(options: {}, callback: Callback<any>): void;
+
+  createService(options: {}, callback: Callback<any>): void;
+
+  createNetwork(options: {}, callback: Callback<any>): void;
+
+  searchImages(options: {}, callback: Callback<any>): void;
+
+  info(callback: Callback<any>): void;
+
+  version(callback: Callback<any>): void;
+
+  ping(callback: Callback<any>): void;
+
+  getEvents(options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+  getEvents(callback: Callback<NodeJS.ReadableStream>): void;
+
+  pull(repoTag: string, options: {}, callback: Callback<any>, auth?: {}): Dockerode.Image;
+
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions: {}, startOptions: {}, callback: Callback<any>): events.EventEmitter;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, startOptions: {}, callback: Callback<any>): events.EventEmitter;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, callback: Callback<any>): events.EventEmitter;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions: {}, callback: Callback<any>): events.EventEmitter;
+
+  swarmInit(options: {}, callback: Callback<any>): void;
+
+  swarmJoin(options: {}, callback: Callback<any>): void;
+
+  swarmLeave(options: {}, callback: Callback<any>): void;
+
+  swarmUpdate(options: {}, callback: Callback<any>): void;
+
+  modem: any;
+}
+
+export = Dockerode;
\ No newline at end of file
diff --git a/dockerode/tsconfig.json b/dockerode/tsconfig.json
new file mode 100644
index 0000000000..a077f02e3c
--- /dev/null
+++ b/dockerode/tsconfig.json
@@ -0,0 +1,20 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es6",
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": false,
+		"baseUrl": "../",
+		"typeRoots": [
+			"../"
+		],
+		"types": [],
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true
+	},
+	"files": [
+		"index.d.ts",
+		"dockerode-tests.ts"
+	]
+}
\ No newline at end of file
diff --git a/dockerode/tslint.json b/dockerode/tslint.json
new file mode 100644
index 0000000000..785a601162
--- /dev/null
+++ b/dockerode/tslint.json
@@ -0,0 +1,3 @@
+{
+	"extends": "../tslint.json"
+}
\ No newline at end of file
diff --git a/dot-object/index.d.ts b/dot-object/index.d.ts
index 176e1c0daf..8bb7d0657c 100644
--- a/dot-object/index.d.ts
+++ b/dot-object/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Dot-Object v1.4.2
+// Type definitions for Dot-Object v1.5
 // Project: https://github.com/rhalff/dot-object
 // Definitions by: Niko Kovačič <https://github.com/nkovacic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -109,7 +109,7 @@ declare namespace DotObject {
          * @param {Object} obj
          * @param {Boolean} remove
          */
-        pick(path: string, obj: any, remove?: boolean): void;
+        pick(path: string, obj: any, remove?: boolean): any;
         /**
          *
          * Remove value from an object using dot notation.
diff --git a/dragster/dragster-tests.ts b/dragster/dragster-tests.ts
new file mode 100644
index 0000000000..a05d06e1dd
--- /dev/null
+++ b/dragster/dragster-tests.ts
@@ -0,0 +1,7 @@
+import Dragster = require("dragster");
+
+var dropzone = document.getElementById("my-dropzone") as HTMLElement;
+var dragster = new Dragster(dropzone);
+
+dragster.removeListeners();
+dragster.reset();
\ No newline at end of file
diff --git a/dragster/index.d.ts b/dragster/index.d.ts
new file mode 100644
index 0000000000..d60892244e
--- /dev/null
+++ b/dragster/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for dragster 0.1
+// Project: https://github.com/bensmithett/dragster
+// Definitions by: Zsolt Kovacs <https://github.com/zskovacs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Dragster {
+    constructor(elem: HTMLElement);
+    removeListeners(): void;
+    reset(): void;
+}
+
+export = Dragster;
\ No newline at end of file
diff --git a/dragster/tsconfig.json b/dragster/tsconfig.json
new file mode 100644
index 0000000000..9740d729a0
--- /dev/null
+++ b/dragster/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dragster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dragster/tslint.json b/dragster/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/dragster/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/elastic.js/elastic.js-tests.ts b/elastic.js/elastic.js-tests.ts
index e7bd65ea16..b683559490 100644
--- a/elastic.js/elastic.js-tests.ts
+++ b/elastic.js/elastic.js-tests.ts
@@ -1,6 +1,13 @@
 import * as elasticjs from 'elastic.js';
 
-let body = new elasticjs.Request({})
+new elasticjs.Request({})
   .query(new elasticjs.MatchQuery('title_field', 'testQuery'))
   .facet(new elasticjs.TermsFacet('tags').field('tags'))
   .toJSON();
+
+new elasticjs.Request({})
+  .query(new elasticjs.MatchAllQuery())
+  .filter(new elasticjs.BoolFilter().must([
+    new elasticjs.TermFilter('a', 'b'),
+    new elasticjs.TermFilter('c', 'd')]))
+  .toJSON();
diff --git a/elastic.js/index.d.ts b/elastic.js/index.d.ts
index adb0db6950..e8b57c5cb7 100644
--- a/elastic.js/index.d.ts
+++ b/elastic.js/index.d.ts
@@ -6765,7 +6765,7 @@ declare module elasticjs {
     /*
      Allows you to set a specified filter on this request object.
      */
-    filter(filter: Object): Request;
+    filter(filter: Filter): Request;
 
     /*
      A search result set could be very large (think Google). Setting the
diff --git a/express-jwt/index.d.ts b/express-jwt/index.d.ts
index e721094edc..4b6883a258 100644
--- a/express-jwt/index.d.ts
+++ b/express-jwt/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for express-jwt
 // Project: https://www.npmjs.org/package/express-jwt
-// Definitions by: Wonshik Kim <https://github.com/wokim/>
+// Definitions by: Wonshik Kim <https://github.com/wokim/>, Kacper Polak <https://github.com/kacepe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import express = require('express');
@@ -37,3 +37,10 @@ declare namespace jwt {
         unless?: typeof unless;
     }
 }
+declare global {
+    namespace Express {
+        export interface Request {
+            user?: any
+        }
+    }
+}
diff --git a/express-mysql-session/express-mysql-session-tests.ts b/express-mysql-session/express-mysql-session-tests.ts
new file mode 100644
index 0000000000..b69486dd8d
--- /dev/null
+++ b/express-mysql-session/express-mysql-session-tests.ts
@@ -0,0 +1,13 @@
+import MySQLStore = require('express-mysql-session');
+
+const options = {
+    host: 'localhost',
+    port: 3306,
+    user: 'root',
+    password: '',
+    database: 'session_test'
+};
+
+const sessionStore = new MySQLStore(options);
+
+sessionStore.close();
diff --git a/express-mysql-session/index.d.ts b/express-mysql-session/index.d.ts
new file mode 100644
index 0000000000..0e86b9b077
--- /dev/null
+++ b/express-mysql-session/index.d.ts
@@ -0,0 +1,136 @@
+// Type definitions for express-mysql-session 1.2
+// Project: https://github.com/chill117/express-mysql-session#readme
+// Definitions by: Akim95 <https://github.com/Akim95>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = MySQLStore;
+
+declare namespace MySQLStore {
+    interface Options {
+        host?: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database?: string;
+        checkExpirationInterval?: number;
+        expiration?: number;
+        createDatabaseTable?: boolean;
+        connectionLimit?: number;
+        schema?: Schema;
+    }
+    interface Schema {
+        tableName: string;
+        columnNames: ColumnNames;
+    }
+    interface ColumnNames {
+        session_id: string;
+        expires: string;
+        data: string;
+    }
+}
+
+declare class MySQLStore {
+
+    /**
+     * @param  {MySQLStore.Options} options
+     * @param  {any} connection?
+     * @param  {(error:any)=>void} callback?
+     */
+    constructor(options: MySQLStore.Options, connection?: any, callback?: (error: any) => void);
+
+    /**
+     * @returns void
+     */
+    setDefaultOptions(): void;
+
+    /**
+     * @param  {(error:any)=>void} callback?
+     * @returns void
+     */
+    createDatabaseTable(callback?: (error: any) => void): void;
+
+    /**
+     * @param  {string} sessionId
+     * @param  {(error:any,session:any)=>void} callback?
+     * @returns void
+     */
+    get(sessionId: string, callback?: (error: any, session: any) => void): void;
+
+    /**
+     * @param  {string} sessionId
+     * @param  {any} data
+     * @param  {(error:any)=>void} callback?
+     * @returns void
+     */
+    set(sessionId: string, data: any, callback?: (error: any) => void): void;
+
+    /**
+     * @param  {string} sessionId
+     * @param  {any} data
+     * @param  {(error:any)=>void} callback?
+     * @returns void
+     */
+    touch(sessionId: string, data: any, callback?: (error: any) => void): void;
+
+    /**
+     * @param  {string} sessionId
+     * @param  {(error:any)=>void} callback?
+     * @returns void
+     */
+    destroy(sessionId: string, callback?: (error: any) => void): void;
+
+    /**
+     * @param  {(error:any,count:any)=>void} callback?
+     * @returns void
+     */
+    length(callback?: (error: any, count: any) => void): void;
+
+    /**
+     * @param  {(error:any)=>void} callback?
+     * @returns void
+     */
+    clear(callback?: (error: any) => void): void;
+
+    /**
+     * @param  {(error:any)=>void} callback?
+     * @returns void
+     */
+    clearExpiredSessions(callback?: (error: any) => void): void;
+
+    /**
+     * @param  {number} interval
+     * @returns void
+     */
+    setExpirationInterval(interval: number): void;
+
+    /**
+     * @returns void
+     */
+    clearExpirationInterval(): void;
+
+    /**
+     * @param  {()=>void} callback?
+     * @returns void
+     */
+    close(callback?: () => void): void;
+
+    /**
+     * @param  {any} object
+     * @param  {any} defaultValues
+     * @param  {any} options?
+     * @returns void
+     */
+    default(object: any, defaultValues: any, options?: any): void;
+
+    /**
+     * @param  {any} object
+     * @returns void
+     */
+    clone(object: any): void;
+
+    /**
+     * @param  {any} value
+     * @returns void
+     */
+    isObject(value: any): void;
+}
diff --git a/express-mysql-session/tsconfig.json b/express-mysql-session/tsconfig.json
new file mode 100644
index 0000000000..5af8734c24
--- /dev/null
+++ b/express-mysql-session/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-mysql-session-tests.ts"
+    ]
+}
diff --git a/express-mysql-session/tslint.json b/express-mysql-session/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/express-mysql-session/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/express-rate-limit/express-rate-limit-tests.ts b/express-rate-limit/express-rate-limit-tests.ts
new file mode 100644
index 0000000000..761a6d23f8
--- /dev/null
+++ b/express-rate-limit/express-rate-limit-tests.ts
@@ -0,0 +1,25 @@
+import RateLimit = require("express-rate-limit");
+
+var apiLimiter = new RateLimit({
+  windowMs: 15 * 60 * 1000, // 15 minutes
+  max: 100,
+  delayMs: 0 // disabled
+});
+
+var createAccountLimiter = new RateLimit({
+  windowMs: 60 * 60 * 1000, // 1 hour window
+  delayAfter: 1, // begin slowing down responses after the first request
+  delayMs: 3 * 1000, // slow down subsequent responses by 3 seconds per request
+  max: 5, // start blocking after 5 requests
+  message: "Too many accounts created from this IP, please try again after an hour"
+});
+
+class SomeStore implements RateLimit.Store {
+  incr(key: string, cb: RateLimit.StoreIncrementCallback) { }
+  resetAll() { }
+  resetKey(key: string) { };
+};
+
+var limiterWithStore = new RateLimit({
+  store: new SomeStore()
+});
diff --git a/express-rate-limit/index.d.ts b/express-rate-limit/index.d.ts
new file mode 100644
index 0000000000..38ef8f8b29
--- /dev/null
+++ b/express-rate-limit/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for express-rate-limit 2.6
+// Project: https://github.com/nfriedly/express-rate-limit
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import express = require("express");
+
+declare namespace RateLimit {
+    type StoreIncrementCallback = (err?: {}, hits?: number) => void;
+
+    export interface Store {
+        incr: (key: string, cb: StoreIncrementCallback) => void;
+        resetAll: () => void;
+        resetKey: (key: string) => void;
+    }
+
+    export interface Options {
+        delayAfter?: number;
+        delayMs?: number;
+        handlers?: () => any;
+        headers?: boolean;
+        keyGenerator?: () => string;
+        max?: number;
+        message?: string;
+        skip?: () => boolean;
+        statusCode?: number;
+        store?: Store;
+        windowMs?: number;
+    }
+}
+
+interface RateLimitStatic {
+    new(options: RateLimit.Options): express.RequestHandler;
+}
+
+declare var RateLimit: RateLimitStatic;
+export = RateLimit;
diff --git a/express-rate-limit/tsconfig.json b/express-rate-limit/tsconfig.json
new file mode 100644
index 0000000000..ca3c32c3bb
--- /dev/null
+++ b/express-rate-limit/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "express-rate-limit-tests.ts"
+  ]
+}
diff --git a/express-rate-limit/tslint.json b/express-rate-limit/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/express-rate-limit/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/history/v2/history-tests.ts b/history/v2/history-tests.ts
index 454b223e09..598d934e8d 100644
--- a/history/v2/history-tests.ts
+++ b/history/v2/history-tests.ts
@@ -1,4 +1,4 @@
-import { createBrowserHistory, createLocation, useBasename, useBeforeUnload, useQueries } from 'history'
+import { createHistory, createLocation, useBasename, useBeforeUnload, useQueries } from 'history'
 
 import { getUserConfirmation } from 'history/lib/DOMUtils'
 
@@ -10,7 +10,7 @@ let doSomethingAsync: () => Promise<Function>;
 let input = { value: "" };
 
 {
-    let history = createBrowserHistory()
+    let history = createHistory()
 
     // Listen for changes to the current location. The
     // listener is called once immediately.
@@ -46,7 +46,7 @@ let input = { value: "" };
 }
 
 {
-    let history = createBrowserHistory()
+    let history = createHistory()
 
     // Pushing a path string.
     history.push('/the/path')
@@ -63,7 +63,7 @@ let input = { value: "" };
 }
 
 {
-    let history = createBrowserHistory()
+    let history = createHistory()
     history.listenBefore(function(location) {
         if (input.value !== '')
             return 'Are you sure you want to leave this page?'
@@ -75,7 +75,7 @@ let input = { value: "" };
 }
 
 {
-    let history = createBrowserHistory({
+    let history = createHistory({
         getUserConfirmation(message, callback) {
             callback(window.confirm(message)) // The default behavior
         }
@@ -83,7 +83,7 @@ let input = { value: "" };
 }
 
 {
-    let history = useBeforeUnload(createBrowserHistory)()
+    let history = useBeforeUnload(createHistory)()
 
     history.listenBeforeUnload(function() {
         return 'Are you sure you want to leave this page?'
@@ -91,7 +91,7 @@ let input = { value: "" };
 }
 
 {
-    let history = useQueries(createBrowserHistory)()
+    let history = useQueries(createHistory)()
 
     history.listen(function(location) {
         console.log(location.query)
@@ -99,7 +99,7 @@ let input = { value: "" };
 }
 
 {
-    let history = useQueries(createBrowserHistory)({
+    let history = useQueries(createHistory)({
         parseQueryString: function(queryString) {
             // TODO: return a parsed version of queryString
             return {};
@@ -116,7 +116,7 @@ let input = { value: "" };
 
 {
     // Run our app under the /base URL.
-    let history = useBasename(createBrowserHistory)({
+    let history = useBasename(createHistory)({
         basename: '/base'
     })
 
@@ -128,4 +128,4 @@ let input = { value: "" };
 
     history.createPath('/the/path') // /base/the/path
     history.push('/the/path') // push /base/the/path
-}
\ No newline at end of file
+}
diff --git a/history/v2/index.d.ts b/history/v2/index.d.ts
index 5f719c2f0b..6b61fa1b77 100644
--- a/history/v2/index.d.ts
+++ b/history/v2/index.d.ts
@@ -127,7 +127,7 @@ export interface Module {
     };
 }
 
-export { default as createBrowserHistory } from "./lib/createBrowserHistory";
+export { default as createHistory } from "./lib/createBrowserHistory";
 export { default as createHashHistory } from "./lib/createHashHistory";
 export { default as createMemoryHistory } from "./lib/createMemoryHistory";
 export { default as createLocation } from "./lib/createLocation";
diff --git a/howler/index.d.ts b/howler/index.d.ts
index 1b6604b1aa..df3f6a363b 100644
--- a/howler/index.d.ts
+++ b/howler/index.d.ts
@@ -66,7 +66,7 @@ interface Howl {
     rate(idOrSetRate: number): this | number;
     rate(rate: number, id: number): this;
 
-    seek(seek?: number, id?: number): this;
+    seek(seek?: number, id?: number): this | number;
     loop(loop?: boolean, id?: number): this;
     playing(id?: number): boolean;
     duration(id?: number): number;
diff --git a/jest/index.d.ts b/jest/index.d.ts
index f376ea5bcc..9f945ba426 100644
--- a/jest/index.d.ts
+++ b/jest/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Jest 16.0.0
+// Type definitions for Jest 18.1.0
 // Project: http://facebook.github.io/jest/
-// Definitions by: Asana <https://asana.com>, Ivo Stratev <https://github.com/NoHomey>, jwbay <https://github.com/jwbay>
+// Definitions by: Asana <https://asana.com>, Ivo Stratev <https://github.com/NoHomey>, jwbay <https://github.com/jwbay>, Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 declare var beforeAll: jest.Lifecycle;
 declare var beforeEach: jest.Lifecycle;
@@ -16,7 +17,7 @@ declare var xit: jest.It;
 declare var test: jest.It;
 declare var xtest: jest.It;
 
-declare function expect(actual: any): jest.Matchers;
+declare const expect: jest.Expect;
 
 interface NodeRequire {
     /** Returns the actual module instead of a mock, bypassing all checks on whether the module should receive a mock implementation or not. */
@@ -26,13 +27,18 @@ interface NodeRequire {
 }
 
 declare namespace jest {
+    /** Provides a way to add Jasmine-compatible matchers into your Jest context. */
     function addMatchers(matchers: jasmine.CustomMatcherFactories): typeof jest;
     /** Disables automatic mocking in the module loader. */
     function autoMockOff(): typeof jest;
     /** Enables automatic mocking in the module loader. */
     function autoMockOn(): typeof jest;
-    /** Clears the mock.calls and mock.instances properties of all mocks. Equivalent to calling .mockClear() on every mocked function. */
+    /**
+     * @deprecated use resetAllMocks instead
+     */
     function clearAllMocks(): typeof jest;
+    /** Clears the mock.calls and mock.instances properties of all mocks. Equivalent to calling .mockClear() on every mocked function. */
+    function resetAllMocks(): typeof jest;
     /** Removes any pending timers from the timer system. If any timers have been scheduled, they will be cleared and will never have the opportunity to execute in the future. */
     function clearAllTimers(): typeof jest;
     /** Indicates that the module system should never return a mocked version of the specified module, including all of the specificied module's dependencies. */
@@ -46,6 +52,7 @@ declare namespace jest {
     /** Enables automatic mocking in the module loader. */
     function enableAutomock(): typeof jest;
     /** Creates a mock function. Optionally takes a mock implementation. */
+    function fn<T extends {}>(implementation: (...args: any[]) => T): Mock<T>;
     function fn<T>(implementation?: Function): Mock<T>;
     /** Use the automatic mocking system to generate a mocked version of the given module. */
     function genMockFromModule<T>(moduleName: string): T;
@@ -98,8 +105,16 @@ declare namespace jest {
         (fn: ProvidesCallback): any;
     }
 
+    /** Creates a test closure */
     interface It {
+        /**
+         * Creates a test closure.
+         *
+         * @param {string} name The name of your test
+         * @param {fn?} ProvidesCallback The function for your test
+         */
         (name: string, fn?: ProvidesCallback): void;
+        /** Only runs this test in the current file. */
         only: It;
         skip: It;
         concurrent: It;
@@ -111,35 +126,113 @@ declare namespace jest {
         skip: Describe;
     }
 
+    interface MatcherUtils {
+        readonly isNot: boolean;
+        utils: {
+            readonly EXPECTED_COLOR: string;
+            readonly RECEIVED_COLOR: string;
+            ensureActualIsNumber(actual: any, matcherName?: string): void;
+            ensureExpectedIsNumber(actual: any, matcherName?: string): void;
+            ensureNoExpected(actual: any, matcherName?: string): void;
+            ensureNumbers(actual: any, expected: any, matcherName?: string): void;
+            /** get the type of a value with handling of edge cases like `typeof []` and `typeof null` */
+            getType(value: any): string;
+            matcherHint(matcherName: string, received?: string, expected?: string, options?: { secondArgument?: string, isDirectExpectCall?: boolean }): string;
+            pluralize(word: string, count: number): string;
+            printExpected(value: any): string;
+            printReceived(value: any): string;
+            printWithType(name: string, received: any, print: (value: any) => string): string;
+            stringify(object: {}, maxDepth?: number): string;
+        }
+    }
+
+    interface ExpectExtendMap {
+        [key: string]: (this: MatcherUtils, received: any, actual: any) => { message: () => string, pass: boolean };
+    }
+
+    /** The `expect` function is used every time you want to test a value. You will rarely call `expect` by itself. */
+    interface Expect {
+        /**
+         * The `expect` function is used every time you want to test a value. You will rarely call `expect` by itself.
+         *
+         * @param {any} actual The value to apply matchers against.
+        */
+        (actual: any): Matchers;
+        anything(): void;
+        /** Matches anything that was created with the given constructor. You can use it inside `toEqual` or `toBeCalledWith` instead of a literal value. */
+        any(classType: any): void;
+        /** Matches any array made up entirely of elements in the provided array. You can use it inside `toEqual` or `toBeCalledWith` instead of a literal value.  */
+        arrayContaining(arr: any[]): void;
+        /** Verifies that a certain number of assertions are called during a test. This is often useful when testing asynchronous code, in order to make sure that assertions in a callback actually got called. */
+        assertions(num: number): void;
+        /** You can use `expect.extend` to add your own matchers to Jest. */
+        extend(obj: ExpectExtendMap): void;
+        /** Matches any object that recursively matches the provided keys. This is often handy in conjunction with other asymmetric matchers. */
+        objectContaining(obj: {}): void;
+        /** Matches any string that contains the exact provided string */
+        stringMatching(str: string | RegExp): void;
+    }
+
     interface Matchers {
+        /** If you know how to test something, `.not` lets you test its opposite. */
         not: Matchers;
         lastCalledWith(...args: any[]): void;
+        /** Checks that a value is what you expect. It uses `===` to check strict equality. Don't use `toBe` with floating-point numbers. */
         toBe(expected: any): void;
+        /** Ensures that a mock function is called. */
         toBeCalled(): void;
+        /** Ensure that a mock function is called with specific arguments. */
         toBeCalledWith(...args: any[]): void;
-        toBeCloseTo(expected: number, delta: number): void;
+        /** Using exact equality with floating point numbers is a bad idea. Rounding means that intuitive things fail. */
+        toBeCloseTo(expected: number, delta?: number): void;
+        /** Ensure that a variable is not undefined. */
         toBeDefined(): void;
+        /** When you don't care what a value is, you just want to ensure a value is false in a boolean context. */
         toBeFalsy(): void;
+        /** For comparing floating point numbers. */
         toBeGreaterThan(expected: number): void;
+        /** For comparing floating point numbers. */
         toBeGreaterThanOrEqual(expected: number): void;
+        /** Ensure that an object is an instance of a class. This matcher uses `instanceof` underneath. */
         toBeInstanceOf(expected: any): void
+        /** For comparing floating point numbers. */
         toBeLessThan(expected: number): void;
+        /** For comparing floating point numbers. */
         toBeLessThanOrEqual(expected: number): void;
+        /** This is the same as `.toBe(null)` but the error messages are a bit nicer. So use `.toBeNull()` when you want to check that something is null. */
         toBeNull(): void;
+        /** Use when you don't care what a value is, you just want to ensure a value is true in a boolean context. In JavaScript, there are six falsy values: `false`, `0`, `''`, `null`, `undefined`, and `NaN`. Everything else is truthy. */
         toBeTruthy(): void;
+        /** Used to check that a variable is undefined. */
         toBeUndefined(): void;
+        /** Used when you want to check that an item is in a list. For testing the items in the list, this uses `===`, a strict equality check. */
         toContain(expected: any): void;
+        /** Used when you want to check that an item is in a list. For testing the items in the list, this  matcher recursively checks the equality of all fields, rather than checking for object identity. */
         toContainEqual(expected: any): void;
+        /** Used when you want to check that two objects have the same value. This matcher recursively checks the equality of all fields, rather than checking for object identity. */
         toEqual(expected: any): void;
+        /** Ensures that a mock function is called. */
         toHaveBeenCalled(): boolean;
+        /** Ensures that a mock function is called an exact number of times. */
         toHaveBeenCalledTimes(expected: number): boolean;
+        /** Ensure that a mock function is called with specific arguments. */
         toHaveBeenCalledWith(...params: any[]): boolean;
+        /** If you have a mock function, you can use `.toHaveBeenLastCalledWith` to test what arguments it was last called with. */
         toHaveBeenLastCalledWith(...params: any[]): boolean;
+        /** Used to check that an object has a `.length` property and it is set to a certain numeric value. */
+        toHaveLength(expected: number): void;
+        toHaveProperty(propertyPath: string, value?: any): void;
+        /** Check that a string matches a regular expression. */
         toMatch(expected: string | RegExp): void;
+        /** Used to check that a JavaScript object matches a subset of the properties of an objec */
         toMatchObject(expected: {}): void;
-        toMatchSnapshot(): void;
+        /** This ensures that a value matches the most recent snapshot. Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information. */
+        toMatchSnapshot(snapshotName?: string): void;
+        /** Used to test that a function throws when it is called. */
         toThrow(): void;
+        /** If you want to test that a specific error is thrown inside a function. */
         toThrowError(error?: string | Constructable | RegExp): void;
+        /** Used to test that a function throws a error matching the most recent snapshot when it is called. */
         toThrowErrorMatchingSnapshot(): void;
     }
 
@@ -147,9 +240,25 @@ declare namespace jest {
         new (...args: any[]): any
     }
 
-    interface Mock<T> extends Function {
+    interface Mock<T> extends Function, MockInstance<T> {
         new (): T;
         (...args: any[]): any;
+    }
+
+    /**
+     * Wrap module with mock definitions
+     * @example
+     *  jest.mock("../api");
+     *  import { Api } from "../api";
+     *
+     *  const myApi: jest.Mocked<Api> = new Api() as any;
+     *  myApi.myApiMethod.mockImplementation(() => "test");
+     */
+    type Mocked<T> = {
+        [P in keyof T]: T[P] & MockInstance<T[P]>;
+    } & T;
+
+    interface MockInstance<T> {
         mock: MockContext<T>;
         mockClear(): void;
         mockReset(): void;
diff --git a/jest/jest-tests.ts b/jest/jest-tests.ts
index 913a671fa1..a3d84a09e3 100644
--- a/jest/jest-tests.ts
+++ b/jest/jest-tests.ts
@@ -147,6 +147,10 @@ describe('compartion', function () {
     it('works sanely with simple decimals', function () {
         expect(0.2 + 0.1).toBeCloseTo(0.3, 5);
     });
+
+    it('works sanely with simple decimals and the default delta', function () {
+        expect(0.2 + 0.1).toBeCloseTo(0.3);
+    });
 });
 
 describe('toThrow API', function () {
@@ -171,6 +175,60 @@ describe('toThrow API', function () {
    });
 });
 
+describe('Assymetric matchers', function () {
+    it('works', function () {
+        expect({
+            timestamp: 1480807810388,
+            text: 'Some text content, but we care only about *this part*'
+        }).toEqual({
+            timestamp: expect.any(Number),
+            text: expect.stringMatching('*this part*')
+        });
+
+        const callback = jest.fn();
+        expect(callback).toEqual(expect.any(Function));
+        callback(5, "test");
+        expect(callback).toBeCalledWith(expect.any(Number), expect.any(String))
+        const obj = {
+            items: [1]
+        };
+        expect(obj).toEqual(expect.objectContaining({
+            items: expect.arrayContaining([
+                expect.any(Number)
+            ])
+        }));
+
+        expect.assertions(4);
+    });
+});
+
+describe('Extending extend', function () {
+    it('works', function () {
+        expect.extend({
+            toBeNumber(received: any, actual: any) {
+                const pass = received === actual;
+                const message =
+                    () => `expected ${received} ${pass ? 'not ' : ''} to be ${actual}`;
+                return { message, pass };
+            },
+            toBeTest(received: any, actual: any) {
+                this.utils.ensureNoExpected(received);
+                this.utils.ensureActualIsNumber(received);
+                this.utils.ensureExpectedIsNumber(actual);
+                this.utils.ensureNumbers(received, actual);
+
+                return {
+                    message: () => `
+                    ${this.utils.getType(received).toLowerCase()} \n\n
+                    ${this.utils.matcherHint(".not.toBe")} ${this.utils.printExpected(actual)} ${this.utils.printReceived(received)}\n\n
+                    `,
+                    pass: true
+                };
+            }
+        });
+    });
+});
+
 describe('missing tests', function () {
     it('creates closures', function () {
        class Closure<T> {
@@ -208,7 +266,7 @@ describe('missing tests', function () {
        expect(getFruits()).toContain('Orange');
        mock.mockReturnValueOnce(['Apple', 'Plum']);
        expect(mock()).not.toContain('Orange');
-       const myBeverage: any = {delicious: true, sour: false}; 
+       const myBeverage: any = {delicious: true, sour: false};
        expect(myBeverage).toContainEqual({delicious: true, sour: false});
        mock.mockReturnValue([]); //Deprecated: Use jest.fn(() => value) instead.
        mock.mockClear();
@@ -248,6 +306,10 @@ describe('toMatchSnapshot', function () {
    it('compares snapshots', function () {
         expect({ type: 'a', props: { href: 'https://www.facebook.com/' }, children: [ 'Facebook' ] }).toMatchSnapshot();
     });
+
+   it('can give name to snapshot', function () {
+        expect({ type: 'a', props: { href: 'https://www.facebook.com/' }, children: [ 'Facebook' ] }).toMatchSnapshot('given name');
+   });
 });
 
 describe('toThrowErrorMatchingSnapshot', function () {
@@ -367,3 +429,58 @@ describe('strictNullChecks', function () {
         done();
     })
 });
+
+class TestApi {
+    constructor() { };
+    testProp: boolean;
+    private anotherProp: string;
+    testMethod(a: number): string { return ""; }
+}
+
+declare function mockedFunc(a: number): string;
+
+declare function mockedFuncWithApi(api: TestApi): void;
+
+describe('Mocked type', function () {
+    it('Works', function () {
+        const mock: jest.Mocked<TestApi> = new TestApi() as any;
+        mock.testProp;
+        mock.testMethod.mockImplementation(() => 'test');
+        mock.testMethod(5).toUpperCase();
+
+        mockedFuncWithApi(mock);
+    });
+});
+
+describe('Mocks', function () {
+    it('jest.fn() without args is a function type', function () {
+        const test = jest.fn();
+        test();
+        new test();
+        test.mock.instances[0];
+        test.mockImplementation(() => { });
+    });
+
+    it('jest.fn() with returned object infers type', function () {
+        const testMock = jest.fn(() => ({ a: 5, test: jest.fn() }));
+
+        testMock(5, 5, 'a');
+        testMock.mockImplementation(() => { });
+        testMock.caller;
+
+        const ins = new testMock();
+        ins.a;
+        ins.test();
+        ins.test.mockImplementation(() => 5);
+        ins.test.mock.calls;
+
+        const anotherMock = jest.fn(() => {
+            const api: Partial<TestApi> = {
+                testMethod: jest.fn()
+            };
+            return api;
+        });
+        const anotherIns: jest.Mocked<TestApi> = new anotherMock() as any;
+        anotherIns.testMethod.mockImplementation(() => 1);
+    });
+});
diff --git a/jest/v16/index.d.ts b/jest/v16/index.d.ts
new file mode 100644
index 0000000000..f376ea5bcc
--- /dev/null
+++ b/jest/v16/index.d.ts
@@ -0,0 +1,303 @@
+// Type definitions for Jest 16.0.0
+// Project: http://facebook.github.io/jest/
+// Definitions by: Asana <https://asana.com>, Ivo Stratev <https://github.com/NoHomey>, jwbay <https://github.com/jwbay>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var beforeAll: jest.Lifecycle;
+declare var beforeEach: jest.Lifecycle;
+declare var afterAll: jest.Lifecycle;
+declare var afterEach: jest.Lifecycle;
+declare var describe: jest.Describe;
+declare var fdescribe: jest.Describe;
+declare var xdescribe: jest.Describe;
+declare var it: jest.It;
+declare var fit: jest.It;
+declare var xit: jest.It;
+declare var test: jest.It;
+declare var xtest: jest.It;
+
+declare function expect(actual: any): jest.Matchers;
+
+interface NodeRequire {
+    /** Returns the actual module instead of a mock, bypassing all checks on whether the module should receive a mock implementation or not. */
+    requireActual(moduleName: string): any;
+    /** Returns a mock module instead of the actual module, bypassing all checks on whether the module should be required normally or not. */
+    requireMock(moduleName: string): any;
+}
+
+declare namespace jest {
+    function addMatchers(matchers: jasmine.CustomMatcherFactories): typeof jest;
+    /** Disables automatic mocking in the module loader. */
+    function autoMockOff(): typeof jest;
+    /** Enables automatic mocking in the module loader. */
+    function autoMockOn(): typeof jest;
+    /** Clears the mock.calls and mock.instances properties of all mocks. Equivalent to calling .mockClear() on every mocked function. */
+    function clearAllMocks(): typeof jest;
+    /** Removes any pending timers from the timer system. If any timers have been scheduled, they will be cleared and will never have the opportunity to execute in the future. */
+    function clearAllTimers(): typeof jest;
+    /** Indicates that the module system should never return a mocked version of the specified module, including all of the specificied module's dependencies. */
+    function deepUnmock(moduleName: string): typeof jest;
+    /** Disables automatic mocking in the module loader. */
+    function disableAutomock(): typeof jest;
+    /** Mocks a module with an auto-mocked version when it is being required. */
+    function doMock(moduleName: string): typeof jest;
+    /** Indicates that the module system should never return a mocked version of the specified module from require() (e.g. that it should always return the real module). */
+    function dontMock(moduleName: string): typeof jest;
+    /** Enables automatic mocking in the module loader. */
+    function enableAutomock(): typeof jest;
+    /** Creates a mock function. Optionally takes a mock implementation. */
+    function fn<T>(implementation?: Function): Mock<T>;
+    /** Use the automatic mocking system to generate a mocked version of the given module. */
+    function genMockFromModule<T>(moduleName: string): T;
+    /** Returns whether the given function is a mock function. */
+    function isMockFunction(fn: any): fn is Mock<any>;
+    /** Mocks a module with an auto-mocked version when it is being required. */
+    function mock(moduleName: string, factory?: any, options?: MockOptions): typeof jest;
+    /** Resets the module registry - the cache of all required modules. This is useful to isolate modules where local state might conflict between tests. */
+    function resetModuleRegistry(): typeof jest;
+    /** Resets the module registry - the cache of all required modules. This is useful to isolate modules where local state might conflict between tests. */
+    function resetModules(): typeof jest;
+    /** Exhausts tasks queued by setImmediate(). */
+    function runAllImmediates(): typeof jest;
+    /** Exhausts the micro-task queue (usually interfaced in node via process.nextTick). */
+    function runAllTicks(): typeof jest;
+    /** Exhausts the macro-task queue (i.e., all tasks queued by setTimeout() and setInterval()). */
+    function runAllTimers(): typeof jest;
+    /** Executes only the macro-tasks that are currently pending (i.e., only the tasks that have been queued by setTimeout() or setInterval() up to this point).
+     * If any of the currently pending macro-tasks schedule new macro-tasks, those new tasks will not be executed by this call. */
+    function runOnlyPendingTimers(): typeof jest;
+    /** Executes only the macro task queue (i.e. all tasks queued by setTimeout() or setInterval() and setImmediate()). */
+    function runTimersToTime(msToRun: number): typeof jest;
+    /** Explicitly supplies the mock object that the module system should return for the specified module. */
+    function setMock<T>(moduleName: string, moduleExports: T): typeof jest;
+    /** Indicates that the module system should never return a mocked version of the specified module from require() (e.g. that it should always return the real module). */
+    function unmock(moduleName: string): typeof jest;
+    /** Instructs Jest to use fake versions of the standard timer functions. */
+    function useFakeTimers(): typeof jest;
+    /** Instructs Jest to use the real versions of the standard timer functions. */
+    function useRealTimers(): typeof jest;
+
+    interface MockOptions {
+        virtual?: boolean;
+    }
+
+    interface EmptyFunction {
+        (): void;
+    }
+
+    interface DoneCallback {
+        (...args: any[]): any
+        fail(error?: string | { message: string }): any;
+    }
+
+    interface ProvidesCallback {
+        (cb: DoneCallback): any;
+    }
+
+    interface Lifecycle {
+        (fn: ProvidesCallback): any;
+    }
+
+    interface It {
+        (name: string, fn?: ProvidesCallback): void;
+        only: It;
+        skip: It;
+        concurrent: It;
+    }
+
+    interface Describe {
+        (name: string, fn: EmptyFunction): void
+        only: Describe;
+        skip: Describe;
+    }
+
+    interface Matchers {
+        not: Matchers;
+        lastCalledWith(...args: any[]): void;
+        toBe(expected: any): void;
+        toBeCalled(): void;
+        toBeCalledWith(...args: any[]): void;
+        toBeCloseTo(expected: number, delta: number): void;
+        toBeDefined(): void;
+        toBeFalsy(): void;
+        toBeGreaterThan(expected: number): void;
+        toBeGreaterThanOrEqual(expected: number): void;
+        toBeInstanceOf(expected: any): void
+        toBeLessThan(expected: number): void;
+        toBeLessThanOrEqual(expected: number): void;
+        toBeNull(): void;
+        toBeTruthy(): void;
+        toBeUndefined(): void;
+        toContain(expected: any): void;
+        toContainEqual(expected: any): void;
+        toEqual(expected: any): void;
+        toHaveBeenCalled(): boolean;
+        toHaveBeenCalledTimes(expected: number): boolean;
+        toHaveBeenCalledWith(...params: any[]): boolean;
+        toHaveBeenLastCalledWith(...params: any[]): boolean;
+        toMatch(expected: string | RegExp): void;
+        toMatchObject(expected: {}): void;
+        toMatchSnapshot(): void;
+        toThrow(): void;
+        toThrowError(error?: string | Constructable | RegExp): void;
+        toThrowErrorMatchingSnapshot(): void;
+    }
+
+    interface Constructable {
+        new (...args: any[]): any
+    }
+
+    interface Mock<T> extends Function {
+        new (): T;
+        (...args: any[]): any;
+        mock: MockContext<T>;
+        mockClear(): void;
+        mockReset(): void;
+        mockImplementation(fn: Function): Mock<T>;
+        mockImplementationOnce(fn: Function): Mock<T>;
+        mockReturnThis(): Mock<T>;
+        mockReturnValue(value: any): Mock<T>;
+        mockReturnValueOnce(value: any): Mock<T>;
+    }
+
+    interface MockContext<T> {
+        calls: any[][];
+        instances: T[];
+    }
+}
+
+//Jest ships with a copy of Jasmine. They monkey-patch its APIs and divergence/deprecation are expected.
+//Relevant parts of Jasmine's API are below so they can be changed and removed over time.
+//This file can't reference jasmine.d.ts since the globals aren't compatible.
+
+declare function spyOn(object: any, method: string): jasmine.Spy;
+/** If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending. */
+declare function pending(reason?: string): void;
+/** Fails a test when called within one. */
+declare function fail(error?: any): void;
+declare namespace jasmine {
+    var clock: () => Clock;
+    function any(aclass: any): Any;
+    function anything(): Any;
+    function arrayContaining(sample: any[]): ArrayContaining;
+    function objectContaining(sample: any): ObjectContaining;
+    function createSpy(name: string, originalFn?: Function): Spy;
+    function createSpyObj(baseName: string, methodNames: any[]): any;
+    function createSpyObj<T>(baseName: string, methodNames: any[]): T;
+    function pp(value: any): string;
+    function addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
+    function addMatchers(matchers: CustomMatcherFactories): void;
+    function stringMatching(value: string | RegExp): Any;
+
+    interface Clock {
+        install(): void;
+        uninstall(): void;
+        /** Calls to any registered callback are triggered when the clock is ticked forward via the jasmine.clock().tick function, which takes a number of milliseconds. */
+        tick(ms: number): void;
+        mockDate(date?: Date): void;
+    }
+
+    interface Any {
+        new (expectedClass: any): any;
+        jasmineMatches(other: any): boolean;
+        jasmineToString(): string;
+    }
+
+    interface ArrayContaining {
+        new (sample: any[]): any;
+        asymmetricMatch(other: any): boolean;
+        jasmineToString(): string;
+    }
+
+    interface ObjectContaining {
+        new (sample: any): any;
+        jasmineMatches(other: any, mismatchKeys: any[], mismatchValues: any[]): boolean;
+        jasmineToString(): string;
+    }
+
+    interface Spy {
+        (...params: any[]): any;
+        identity: string;
+        and: SpyAnd;
+        calls: Calls;
+        mostRecentCall: { args: any[]; };
+        argsForCall: any[];
+        wasCalled: boolean;
+    }
+
+    interface SpyAnd {
+        /** By chaining the spy with and.callThrough, the spy will still track all calls to it but in addition it will delegate to the actual implementation. */
+        callThrough(): Spy;
+        /** By chaining the spy with and.returnValue, all calls to the function will return a specific value. */
+        returnValue(val: any): Spy;
+        /** By chaining the spy with and.returnValues, all calls to the function will return specific values in order until it reaches the end of the return values list. */
+        returnValues(...values: any[]): Spy;
+        /** By chaining the spy with and.callFake, all calls to the spy will delegate to the supplied function. */
+        callFake(fn: Function): Spy;
+        /** By chaining the spy with and.throwError, all calls to the spy will throw the specified value. */
+        throwError(msg: string): Spy;
+        /** When a calling strategy is used for a spy, the original stubbing behavior can be returned at any time with and.stub. */
+        stub(): Spy;
+    }
+
+    interface Calls {
+        /** By chaining the spy with calls.any(), will return false if the spy has not been called at all, and then true once at least one call happens. */
+        any(): boolean;
+        /** By chaining the spy with calls.count(), will return the number of times the spy was called */
+        count(): number;
+        /** By chaining the spy with calls.argsFor(), will return the arguments passed to call number index */
+        argsFor(index: number): any[];
+        /** By chaining the spy with calls.allArgs(), will return the arguments to all calls */
+        allArgs(): any[];
+        /** By chaining the spy with calls.all(), will return the context (the this) and arguments passed all calls */
+        all(): CallInfo[];
+        /** By chaining the spy with calls.mostRecent(), will return the context (the this) and arguments for the most recent call */
+        mostRecent(): CallInfo;
+        /** By chaining the spy with calls.first(), will return the context (the this) and arguments for the first call */
+        first(): CallInfo;
+        /** By chaining the spy with calls.reset(), will clears all tracking for a spy */
+        reset(): void;
+    }
+
+    interface CallInfo {
+        /** The context (the this) for the call */
+        object: any;
+        /** All arguments passed to the call */
+        args: any[];
+        /** The return value of the call */
+        returnValue: any;
+    }
+
+    interface CustomMatcherFactories {
+        [index: string]: CustomMatcherFactory;
+    }
+
+    interface CustomMatcherFactory {
+        (util: MatchersUtil, customEqualityTesters: Array<CustomEqualityTester>): CustomMatcher;
+    }
+
+    interface MatchersUtil {
+        equals(a: any, b: any, customTesters?: Array<CustomEqualityTester>): boolean;
+        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: Array<CustomEqualityTester>): boolean;
+        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: Array<any>): string;
+    }
+
+    interface CustomEqualityTester {
+        (first: any, second: any): boolean;
+    }
+
+    interface CustomMatcher {
+        compare<T>(actual: T, expected: T): CustomMatcherResult;
+        compare(actual: any, expected: any): CustomMatcherResult;
+    }
+
+    interface CustomMatcherResult {
+        pass: boolean;
+        message: string | (() => string);
+    }
+
+    interface ArrayLike<T> {
+        length: number;
+        [n: number]: T;
+    }
+}
diff --git a/jest/v16/jest-tests.ts b/jest/v16/jest-tests.ts
new file mode 100644
index 0000000000..c69eae61a2
--- /dev/null
+++ b/jest/v16/jest-tests.ts
@@ -0,0 +1,369 @@
+/// <reference types="node" />
+
+// Tests based on the Jest website
+jest.unmock('../sum');
+
+describe('sum', function() {
+    it('adds 1 + 2 to equal 3', function() {
+        var sum: (a: number, b: number) => number = require('../sum');
+        expect(sum(1, 2)).toBe(3);
+    });
+});
+
+describe('fetchCurrentUser', function() {
+    it('calls the callback when $.ajax requests are finished', function() {
+        var $ = require('jquery');
+        var fetchCurrentUser = require('../fetchCurrentUser');
+
+        // Create a mock function for our callback
+        var callback = jest.fn();
+        fetchCurrentUser(callback);
+
+        // Now we emulate the process by which `$.ajax` would execute its own
+        // callback
+        $.ajax.mock.calls[0 /*first call*/][0 /*first argument*/].success({
+            firstName: 'Bobby',
+            lastName: '");DROP TABLE Users;--'
+        });
+
+        // And finally we assert that this emulated call by `$.ajax` incurred a
+        // call back into the mock function we provided as a callback
+        expect(callback.mock.calls[0/*first call*/][0/*first arg*/]).toEqual({
+            loggedIn: true,
+            fullName: 'Bobby ");DROP TABLE Users;--'
+        });
+    });
+});
+
+// unmock is the recommended approach for unmocking...
+jest.unmock('../displayUser.js')
+
+describe('displayUser', function() {
+    it('displays a user after a click', function() {
+        // Set up our document body
+        document.body.innerHTML =
+            '<div>' +
+            '  <span id="username" />' +
+            '  <button id="button" />' +
+            '</div>';
+
+        var displayUser = require.requireActual('../displayUser');
+        var $ = require('jquery');
+        var fetchCurrentUser = require('../fetchCurrentUser');
+
+        // Tell the fetchCurrentUser mock function to automatically invoke
+        // its callback with some data
+        fetchCurrentUser.mockImplementation(function(cb: Function) {
+            cb({
+                loggedIn: true,
+                fullName: 'Johnny Cash'
+            });
+        });
+
+        // Use jquery to emulate a click on our button
+        $('#button').click();
+
+        // Assert that the fetchCurrentUser function was called, and that the
+        // #username span's innter text was updated as we'd it expect.
+        expect(fetchCurrentUser).toBeCalled();
+        expect($('#username').text()).toEqual('Johnny Cash - Logged In');
+    });
+});
+
+jest.unmock('../CheckboxWithLabel.js');
+describe('CheckboxWithLabel', function() {
+    it('changes the text after click', function() {
+        var React = require('react/addons');
+        var CheckboxWithLabel = require('../CheckboxWithLabel.js');
+        var TestUtils = React.addons.TestUtils;
+
+        // Render a checkbox with label in the document
+        var checkbox = TestUtils.renderIntoDocument(
+            CheckboxWithLabel({
+                    labelOn: "On",
+                    labelOff: "Off"
+                })
+        );
+
+        // Verify that it's Off by default
+        var label = TestUtils.findRenderedDOMComponentWithTag(
+            checkbox, 'label');
+        expect(label.getDOMNode().textContent).toEqual('Off');
+
+        // Simulate a click and verify that it is now On
+        var input = TestUtils.findRenderedDOMComponentWithTag(
+            checkbox, 'input');
+        TestUtils.Simulate.change(input);
+        expect(label.getDOMNode().textContent).toEqual('On');
+    });
+});
+
+jest.runAllTicks();
+xdescribe('Hooks and Suits', function () {
+    let tested: boolean;
+
+    beforeEach(function () {
+        tested = false;
+    });
+
+    afterEach(function () {
+       tested = true;
+    });
+
+    test('tested', function () {
+       expect(tested).toBeTruthy();
+       expect(tested).not.toBeFalsy();
+    });
+
+    fit('tested', function () {
+       expect(tested).toBeDefined();
+       expect(tested).not.toBeUndefined();
+    });
+
+    xit('expect null to be null', function () {
+       expect(null).toBeNull();
+    });
+});
+
+describe('compartion', function () {
+    var sum: (a: number, b: number) => number = require.requireMock('../sum');
+
+    it('compares is 7 + 2 greater than 3', function () {
+       expect(sum(7, 2)).toBeGreaterThan(3);
+    });
+
+    it('compares is 2 + 7 greater than or equal to 3', function () {
+       expect(sum(2, 7)).toBeGreaterThanOrEqual(3);
+    });
+
+    it('compares is 3 less than 3 + 4', function () {
+       expect(3).toBeLessThan(sum(3, 4));
+    });
+
+    it('compares is 3 less than or equal to 4 + 3', function () {
+       expect(3).toBeLessThanOrEqual(sum(4, 3));
+    });
+
+    it('works sanely with simple decimals', function () {
+        expect(0.2 + 0.1).toBeCloseTo(0.3, 5);
+    });
+});
+
+describe('toThrow API', function () {
+   function throwTypeError(): void {
+       throw new TypeError('toThrow Definition was out of date');
+   }
+
+   it('throws', function () {
+      expect(throwTypeError()).toThrow();
+   });
+
+   it('throws TypeError', function () {
+       expect(throwTypeError()).toThrowError(TypeError);
+   });
+
+   it('throws \'Definition was out of date\'', function () {
+      expect(throwTypeError()).toThrowError(/Definition was out of date/);
+   });
+
+   it('throws \'toThorow Definition was out of date\'', function () {
+      expect(throwTypeError()).toThrowError('toThrow Definition was out of date');
+   });
+});
+
+describe('missing tests', function () {
+    it('creates closures', function () {
+       class Closure<T> {
+           private arg: T;
+
+           public constructor(private fn: (arg: T) => void) {
+               this.fn = fn;
+           }
+
+           public bind(arg: T): void {
+               this.arg = arg;
+           }
+
+           public call(): void {
+               this.fn(this.arg);
+           }
+       }
+
+       type StringClosure = (arg: string) => void;
+       let spy: jest.Mock<StringClosure> = jest.fn<StringClosure>();
+       let closure: Closure<string> = new Closure<string>(spy);
+       closure.bind('jest');
+       closure.call();
+       expect(spy).lastCalledWith('jest');
+       expect(spy).toBeCalledWith('jest');
+       expect(jest.isMockFunction(spy)).toBeTruthy();
+   });
+
+   it('tests all mising Mocks functionality', function () {
+       type FruitsGetter = () => Array<string>;
+       let mock: jest.Mock<FruitsGetter> = jest.fn<FruitsGetter>();
+       mock.mockImplementationOnce(() => ['Orange', 'Apple', 'Plum'])
+       jest.setMock('./../tesks/getFruits', mock);
+       const getFruits: FruitsGetter = require('./../tesks/getFruits');
+       expect(getFruits()).toContain('Orange');
+       mock.mockReturnValueOnce(['Apple', 'Plum']);
+       expect(mock()).not.toContain('Orange');
+       const myBeverage: any = {delicious: true, sour: false};
+       expect(myBeverage).toContainEqual({delicious: true, sour: false});
+       mock.mockReturnValue([]); //Deprecated: Use jest.fn(() => value) instead.
+       mock.mockClear();
+       let thisMock: jest.Mock<any> = jest.fn<any>().mockReturnThis();
+       expect(thisMock()).toBe(this);
+   });
+
+   it('creates snapshoter', function () {
+       jest.disableAutomock().mock('./render', () => jest.fn((): string => "{Link to: \"facebook\"}"), { virtual: true });
+       const render: () => string = require('./render');
+       expect(render()).toMatch(/Link/);
+       jest.enableAutomock();
+   });
+
+   it('runs only pending timers', function () {
+        jest.useRealTimers();
+        setTimeout(() => expect(1).not.toEqual(0), 3000);
+        jest.runOnlyPendingTimers().runTimersToTime(300);
+   });
+
+   it('runs all timers', function () {
+        jest.clearAllTimers();
+        jest.useFakeTimers();
+        setTimeout(() => expect(0).not.toEqual(1), 3000);
+        jest.runAllTimers();
+   });
+
+   it('cleares cache', function () {
+       const sum1 = require('../sum');
+       jest.resetModules();
+       const sum2 = require('../sum');
+       expect(sum1).not.toBe(sum2);
+   })
+});
+
+describe('toMatchSnapshot', function () {
+   it('compares snapshots', function () {
+        expect({ type: 'a', props: { href: 'https://www.facebook.com/' }, children: [ 'Facebook' ] }).toMatchSnapshot();
+    });
+});
+
+describe('toThrowErrorMatchingSnapshot', function () {
+   it('compares snapshots', function () {
+        expect(() => { throw new Error('descriptiton') }).toThrowErrorMatchingSnapshot();
+    });
+});
+
+function testInstances() {
+    var mockFn = jest.fn<Function>();
+    var a = new mockFn();
+    var b = new mockFn();
+
+    mockFn.mock.instances[0] === a; // true
+    mockFn.mock.instances[1] === b; // true
+}
+
+function testMockImplementation() {
+    var mockFn = jest.fn<Function>().mockImplementation(function (scalar:number):number {
+        return 42 + scalar;
+    });
+
+    var a = mockFn(0);
+    var b = mockFn(1);
+
+    a === 42; // true
+    b === 43; // true
+
+    mockFn.mock.calls[0][0] === 0; // true
+    mockFn.mock.calls[1][0] === 1; // true
+}
+
+// Test from jest Docs: <http://facebook.github.io/jest/docs/manual-mocks.html#content>
+describe('genMockFromModule', function () {
+   // Interfaces:
+    interface MockFiles {
+        [index: string]: string;
+    }
+
+    interface MockedFS {
+        readdirSync: (dir: string) => string[];
+        __setMockFiles: (newMockFiles: MockFiles) => void ;
+    }
+
+    // ------------------------------------------------------------------------------------
+    // FileSummarizer.ts
+
+    const fs = require('fs');
+
+    function summarizeFilesInDirectorySync(directory: string): string[] {
+      return fs.readdirSync(directory).map((fileName: string) => ({
+        fileName,
+        directory,
+      }));
+    }
+
+    //export default summarizeFilesInDirectorySync; // For sake of compilation
+
+    // ------------------------------------------------------------------------------------
+    // __mocks__/fs.js
+
+    const path = require('path');
+
+    const mockedFS: MockedFS = jest.genMockFromModule<MockedFS>('fs');
+
+    let mockFiles: any = Object.create(null);
+    function __setMockFiles(newMockFiles: MockFiles): void {
+      mockFiles = Object.create(null);
+      for(const file in newMockFiles) {
+        const dir: string = path.dirname(file);
+
+        if (!mockFiles[dir]) {
+          mockFiles[dir] = [];
+        }
+        mockFiles[dir].push(path.basename(file));
+      }
+    }
+
+    function readdirSync(directoryPath: string): string[] {
+      return mockFiles[directoryPath] || [];
+    }
+
+    mockedFS.readdirSync = readdirSync;
+    mockedFS.__setMockFiles = __setMockFiles;
+
+    //export = mockedFS; // For sake of compilation
+    // ------------------------------------------------------------------------------------
+    // __tests__/FileSummarizer-test.js
+
+    jest.mock('fs');
+
+    describe('listFilesInDirectorySync', () => {
+      const MOCK_FILE_INFO: MockFiles = {
+        '/path/to/file1.js': 'console.log("file1 contents");',
+        '/path/to/file2.txt': 'file2 contents',
+      };
+
+      beforeEach(() => {
+        // Set up some mocked out file info before each test
+        (require('fs') as MockedFS).__setMockFiles(MOCK_FILE_INFO);
+      });
+
+      it('includes all files in the directory in the summary', () => {
+        const FileSummarizer: (dir: string) => string[] = require('../FileSummarizer');
+        const fileSummary = FileSummarizer('/path/to');
+
+        expect(fileSummary.length).toBe(2);
+      });
+    });
+});
+
+/**
+ * Pass strictNullChecks
+ */
+describe('strictNullChecks', function () {
+    it('does not complain when using done callback', (done) => {
+        done();
+    })
+});
diff --git a/jest/v16/tsconfig.json b/jest/v16/tsconfig.json
new file mode 100644
index 0000000000..2e023e1205
--- /dev/null
+++ b/jest/v16/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+          "jest": ["jest/v16"],
+          "jest/*": ["jest/v16/*"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-tests.ts"
+    ]
+}
diff --git a/jquery.datatables/index.d.ts b/jquery.datatables/index.d.ts
index c7c4bd8682..5d1bbd50c9 100644
--- a/jquery.datatables/index.d.ts
+++ b/jquery.datatables/index.d.ts
@@ -908,7 +908,7 @@ declare namespace DataTables {
         * @param d Data to use for the row.
         */
         data(d: any[] | Object): DataTable;
-        
+
         /**
 
         * Get the id of the selected row. Since: 1.10.8
@@ -1456,9 +1456,9 @@ declare namespace DataTables {
     }
 
     export interface AjaxData {
-        draw: number;
-        recordsTotal: number;
-        recordsFiltered: number;
+        draw?: number;
+        recordsTotal?: number;
+        recordsFiltered?: number;
         data: any;
         error?: string;
     }
diff --git a/jquery.fileupload/index.d.ts b/jquery.fileupload/index.d.ts
index 54ebb89c5c..e113d2733c 100644
--- a/jquery.fileupload/index.d.ts
+++ b/jquery.fileupload/index.d.ts
@@ -198,7 +198,7 @@ interface JQueryFileInputOptions {
      * handlers using jQuery's Deferred callbacks:
      * data.submit().done(func).fail(func).always(func);
      */
-    add?: any;
+    add?:  (e: JQueryEventObject, data: JQueryFileInputOptions) => void;
 
     // The plugin options are used as settings object for the ajax calls.
     // The following are jQuery ajax settings required for the file uploads:
@@ -228,7 +228,7 @@ interface JQueryFileInputOptions {
     // Other callbacks:
     submit?: Function;
     done?: (e: JQueryEventObject, data: JQueryFileUploadDone) => void;
-    fail?: (e: JQueryEventObject, data: JQueryFileInputOptions) => void;
+    fail?: (e: JQueryEventObject, data: JQueryFileUploadDone) => void;
     always?: (e: JQueryEventObject, data: JQueryFileInputOptions) => void;
     progressall?: (e: JQueryEventObject, data: JQueryFileUploadProgressAllObject) => void;
     start?: (e: JQueryEventObject) => void;
@@ -284,6 +284,7 @@ interface JQueryFileUploadXhr {
     jqXHR: JQueryXHR;
     result: any;
     textStatus: string;
+    errorThrown: any;
     headers: {[key: string]: any};
 }
 
diff --git a/jquery.validation/index.d.ts b/jquery.validation/index.d.ts
index 953755a065..2bb690c07e 100644
--- a/jquery.validation/index.d.ts
+++ b/jquery.validation/index.d.ts
@@ -217,6 +217,7 @@ declare namespace JQueryValidation
     interface Validator
     {
         element(element: string|JQuery): boolean;
+        checkForm(): boolean;
         /**
          * Validates the form, returns true if it is valid, false otherwise.
          */
diff --git a/jquery.validation/jquery.validation-tests.ts b/jquery.validation/jquery.validation-tests.ts
index 15bb9f790c..0b2de520f2 100644
--- a/jquery.validation/jquery.validation-tests.ts
+++ b/jquery.validation/jquery.validation-tests.ts
@@ -208,6 +208,7 @@ function test_methods() {
         $("#myform").submit();
         $("#myinput").attr(rules);
     });
+    $("#myform").validate().checkForm();
     $("#myform").validate().form();
     $("#myform").validate().element("#myselect");
     $("#myform").validate().element($("#myselect"));
diff --git a/jquery/index.d.ts b/jquery/index.d.ts
index e0bf072983..3a785530aa 100644
--- a/jquery/index.d.ts
+++ b/jquery/index.d.ts
@@ -786,6 +786,15 @@ interface JQueryStatic {
      */
     ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
 
+     /**
+     * Creates an object that handles the actual transmission of Ajax data.
+     *
+     * @param dataType A string identifying the data type to use.
+     * @param handler A handler to return the new transport object to use with the data type provided in the first argument.
+     * @see {@link https://api.jquery.com/jQuery.ajaxTransport/}
+     */
+    ajaxTransport(dataType: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+    
     ajaxSettings: JQueryAjaxSettings;
 
      /**
diff --git a/js-md5/index.d.ts b/js-md5/index.d.ts
index 32ef8b30ff..690279bbe4 100644
--- a/js-md5/index.d.ts
+++ b/js-md5/index.d.ts
@@ -1,36 +1,32 @@
-// Type definitions for js-md5 v0.3.0
+// Type definitions for js-md5 0.4
 // Project: https://github.com/emn178/js-md5
-// Definitions by: Roland Greim <https://github.com/tigerxy>
+// Definitions by: Michael McCarthy <https://github.com/mwmccarthy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
 
-/// <reference types="jquery"/>
+declare namespace md5 {
+    type message = string | any[] | Uint8Array | ArrayBuffer;
 
-interface JQuery {
-    md5(value: string): string;
-    md5(value: Array<any>): string;
-    md5(value: Uint8Array): string;
+    interface Md5 {
+        array: () => number[];
+        arrayBuffer: () => ArrayBuffer;
+        buffer: () => ArrayBuffer;
+        digest: () => number[];
+        hex: () => string;
+        toString: () => string;
+        update: (message: message) => Md5;
+    }
+
+    interface md5 {
+        (message: message): string;
+        hex: (message: message) => string;
+        array: (message: message) => number[];
+        digest: (message: message) => number[];
+        arrayBuffer: (message: message) => ArrayBuffer;
+        buffer: (message: message) => ArrayBuffer;
+        create: () => Md5;
+        update: (message: message) => Md5;
+    }
 }
 
-interface JQueryStatic {
-    md5(value: string): string;
-    md5(value: Array<any>): string;
-    md5(value: Uint8Array): string;
-}
-
-interface md5 {
-    (value: string): string;
-    (value: Array<any>): string;
-    (value: Uint8Array): string;
-}
-
-interface String {
-    md5(value: string): string;
-    md5(value: Array<any>): string;
-    md5(value: Uint8Array): string;
-}
-
-declare module "js-md5" {
-    export = md5;
-}
-
-declare var md5: md5;
+declare const md5: md5.md5;
+export = md5;
diff --git a/js-md5/js-md5-tests.ts b/js-md5/js-md5-tests.ts
index 984a919ec3..231b12ebf2 100644
--- a/js-md5/js-md5-tests.ts
+++ b/js-md5/js-md5-tests.ts
@@ -1,20 +1,29 @@
+import md5 = require("js-md5");
 
+let str: string = md5.hex('The quick brown fox jumps over the lazy dog');
+str = md5('The quick brown fox jumps over the lazy dog');
+let arr: number[] = md5.digest('The quick brown fox jumps over the lazy dog');
+arr = md5.array('The quick brown fox jumps over the lazy dog');
+let buf: ArrayBuffer = md5.arrayBuffer('The quick brown fox jumps over the lazy dog');
+buf = md5.buffer('The quick brown fox jumps over the lazy dog');
 
-md5('Message to hash');
-md5('');
-md5('中文');
-md5([]);
-md5(new Uint8Array([]));
+const hash1 = md5.create();
+hash1.update('The quick brown fox jumps over the lazy dog');
+str = hash1.hex();
+str = hash1.toString();
+arr = hash1.digest();
+arr = hash1.array();
+buf = hash1.arrayBuffer();
+buf = hash1.buffer();
 
-$.md5('message');
-$.md5('Message to hash');
-$.md5('');
-$.md5('中文');
-$.md5([]);
-$.md5(new Uint8Array([]));
+const hash2 = md5.update('The quick brown fox jumps over the lazy dog');
+str = hash2.hex();
+str = hash2.toString();
+arr = hash2.digest();
+arr = hash2.array();
+buf = hash2.arrayBuffer();
+buf = hash2.buffer();
 
-'message'.md5('Message to hash');
-'message'.md5('');
-'message'.md5('中文');
-'message'.md5([]);
-'message'.md5(new Uint8Array([]));
\ No newline at end of file
+str = md5([]);
+str = md5(new Uint8Array([]));
+str = md5(new ArrayBuffer(0));
diff --git a/js-md5/tsconfig.json b/js-md5/tsconfig.json
index eceeb1fb3d..f0ae291e30 100644
--- a/js-md5/tsconfig.json
+++ b/js-md5/tsconfig.json
@@ -2,12 +2,11 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +19,4 @@
         "index.d.ts",
         "js-md5-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/js-md5/tslint.json b/js-md5/tslint.json
new file mode 100644
index 0000000000..f9e30021f4
--- /dev/null
+++ b/js-md5/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "../tslint.json"
+}
diff --git a/lodash-webpack-plugin/index.d.ts b/lodash-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..26d633e79f
--- /dev/null
+++ b/lodash-webpack-plugin/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for lodash-webpack-plugin 0.11
+// Project: https://github.com/lodash/lodash-webpack-plugin#readme
+// Definitions by: Benjamin Lim <https://github.com/bumbleblym>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin, Webpack } from 'webpack';
+
+export = LodashModuleReplacementPlugin;
+
+declare class LodashModuleReplacementPlugin implements Plugin {
+	constructor(options?: LodashModuleReplacementPlugin.Options);
+	apply(thisArg: Webpack, ...args: any[]): void;
+}
+
+declare namespace LodashModuleReplacementPlugin {
+	export interface Options {
+		caching?: boolean;
+		chaining?: boolean;
+		cloning?: boolean;
+		coercions?: boolean;
+		collections?: boolean;
+		currying?: boolean;
+		deburring?: boolean;
+		exotics?: boolean;
+		flattening?: boolean;
+		guards?: boolean;
+		memoizing?: boolean;
+		metadata?: boolean;
+		paths?: boolean;
+		placeholders?: boolean;
+		shorthands?: boolean;
+		unicode?: boolean;
+	}
+}
diff --git a/lodash-webpack-plugin/lodash-webpack-plugin-tests.ts b/lodash-webpack-plugin/lodash-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..cd893f09f0
--- /dev/null
+++ b/lodash-webpack-plugin/lodash-webpack-plugin-tests.ts
@@ -0,0 +1,27 @@
+import * as LodashModuleReplacementPlugin from 'lodash-webpack-plugin'
+
+new LodashModuleReplacementPlugin()
+
+new LodashModuleReplacementPlugin({
+	collections: true,
+	paths: true,
+})
+
+new LodashModuleReplacementPlugin({
+	caching: true,
+	chaining: true,
+	cloning: true,
+	coercions: true,
+	collections: true,
+	currying: true,
+	deburring: true,
+	exotics: true,
+	flattening: true,
+	guards: true,
+	memoizing: true,
+	metadata: true,
+	paths: true,
+	placeholders: true,
+	shorthands: true,
+	unicode: true,
+})
diff --git a/lodash-webpack-plugin/tsconfig.json b/lodash-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..03e491ef78
--- /dev/null
+++ b/lodash-webpack-plugin/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "lodash-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/lodash-webpack-plugin/tslint.json b/lodash-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/lodash-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/lodash/index.d.ts b/lodash/index.d.ts
index 0cda5ae3d5..00de563bbb 100644
--- a/lodash/index.d.ts
+++ b/lodash/index.d.ts
@@ -69,7 +69,7 @@ added 23 array methods:
 - [x] _.xorBy
 - [x] _.xorWith
 
-added 18 lang methods:
+added 20 lang methods:
 - [x] _.cloneDeepWith
 - [x] _.cloneWith
 - [x] _.eq
@@ -88,6 +88,8 @@ added 18 lang methods:
 - [x] _.toNumber
 - [x] _.toSafeInteger
 - [x] _.toString
+- [X] _.conforms
+- [X] _.conformsTo
 
 added 13 object methods:
 - [x] _.assignIn
@@ -226,7 +228,6 @@ Methods:
 - [ ] _.split
 
 - [ ] _.cond
-- [ ] _.conforms
 - [ ] _.nthArg
 - [ ] _.over
 - [ ] _.overEvery
@@ -11436,6 +11437,33 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<TResult>;
     }
 
+    /**
+     * An object containing predicate functions for each property of T
+     */
+    type ConformsPredicateObject<T> = {
+        [P in keyof T]: (val: T[P]) => boolean;
+    };
+
+    //_.conforms
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes the predicate properties of `source` with the corresponding
+         * property values of a given object, returning true if all predicates return truthy, else false.
+         */
+        conforms<T>(source: ConformsPredicateObject<T>): (Target: T) => boolean;
+    }
+
+    //_.conformsTo
+    interface LoDashStatic {
+        /**
+         * Checks if object conforms to source by invoking the predicate properties of source with the
+         * corresponding property values of object.
+         *
+         * Note: This method is equivalent to _.conforms when source is partially applied.
+         */
+        conformsTo<T>(object: T, source: ConformsPredicateObject<T>): boolean;
+    }
+
     //_.eq
     interface LoDashStatic {
         /**
diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 7268f1a8c2..7d4105df70 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -6488,6 +6488,18 @@ namespace TestCloneWith {
     }
 }
 
+// _.conforms
+namespace TestConforms {
+    let result: boolean = _.conforms({foo: (v: string) => false})({foo: "foo"});
+    let result2: boolean = _.conforms({})({foo: "foo"});
+}
+
+// _.conformsTo
+namespace TestConformsTo {
+    let result: boolean = _.conformsTo({foo: "foo"}, {foo: (v: string) => false});
+    let result2: boolean = _.conformsTo({}, {foo: (v: string) => false});
+}
+
 // _.eq
 namespace TestEq {
     let customizer: (value: any, other: any, indexOrKey?: number|string) => boolean;
diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
index 665cdc6a24..a8504aee65 100644
--- a/material-ui/index.d.ts
+++ b/material-ui/index.d.ts
@@ -453,7 +453,10 @@ declare namespace __MaterialUI {
         var lightBaseTheme: RawTheme;
         var darkBaseTheme: RawTheme;
 
-        export function muiThemeable<TComponent extends React.Component<P, S>, P, S>(): (component: TComponent) => TComponent;
+        export function muiThemeable(): <
+            TComponent extends React.ComponentClass<P> | React.StatelessComponent<P>,
+            P extends {muiTheme?: MuiTheme}
+        >(component: TComponent) => TComponent;
 
         interface MuiThemeProviderProps {
             muiTheme?: Styles.MuiTheme;
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index 04b8f0ec32..8dcc0fe07e 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -7,6 +7,7 @@ import * as React from 'react';
 import {Component, PropTypes} from 'react';
 import * as ReactDOM from 'react-dom';
 import getMuiTheme from 'material-ui/styles/getMuiTheme';
+import {muiThemeable} from 'material-ui/styles/muiThemeable';
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 import darkBaseTheme from 'material-ui/styles/baseThemes/darkBaseTheme';
 import {MuiTheme} from 'material-ui/styles';
@@ -321,6 +322,35 @@ class DeepDownTheTree extends React.Component<{} & {muiTheme: MuiTheme}, {}> {
 }
 
 
+const MuiThemeableFunction = muiThemeable()((props: {label: string, muiTheme?: MuiTheme}) => {
+  return (
+      <span style={{color: props.muiTheme.palette.textColor}}>
+        Applied the Theme to functional component: {props.label}.
+      </span>
+  );
+});
+
+@muiThemeable()
+class MuiThemeableClass extends React.Component<{label: string} & {muiTheme?: MuiTheme}, {}> {
+  render() {
+    return (
+      <span style={{color: this.props.muiTheme.palette.textColor}}>
+        Applied the Theme to class component decorated: {this.props.label}.
+      </span>
+    );
+  }
+}
+
+const MuiThemeableContainer = (props: {}) => (
+  <MuiThemeProvider muiTheme={getMuiTheme()}>
+    <div>
+      <MuiThemeableFunction label='Hello'/>
+      <MuiThemeableClass label='Hello'/>
+    </div>
+  </MuiThemeProvider>
+);
+
+
 // "http://www.material-ui.com/#/customization/inline-styles"
 const InlineStylesCheckbox = () => (
   <Checkbox
diff --git a/metismenu/index.d.ts b/metismenu/index.d.ts
index 43faa279c7..8117328bf8 100644
--- a/metismenu/index.d.ts
+++ b/metismenu/index.d.ts
@@ -1,19 +1,22 @@
-// Type definitions for metisMenu 2.0.3
+// Type definitions for metisMenu 2.6
 // Project: http://github.com/onokumus/metisMenu
-// Definitions by: onokums <https://github.com/onokumus/>
+// Definitions by: onokums <https://github.com/onokumus/>, denis <https://github.com/denisname/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="jquery"/>
 
 interface MetisMenuOptions {
     toggle?: boolean;
-    doubleTapToGo?: boolean;
     activeClass?: string;
     collapseClass?: string;
     collapseInClass?: string;
     collapsingClass?: string;
+    preventDefault?: boolean;
 }
 
+type MetisMenuEvents = "show.metisMenu" | "shown.metisMenu" | "hide.metisMenu" | "hidden.metisMenu";
+
 interface JQuery {
-    metisMenu(options?: MetisMenuOptions): JQuery;
+    metisMenu(options?: MetisMenuOptions | "dispose"): JQuery;
+    on(events: MetisMenuEvents, handler: (eventObject: JQueryEventObject) => any): JQuery;
 }
diff --git a/metismenu/metismenu-tests.ts b/metismenu/metismenu-tests.ts
index b2e36f1d53..eb17270021 100644
--- a/metismenu/metismenu-tests.ts
+++ b/metismenu/metismenu-tests.ts
@@ -1,12 +1,28 @@
 /// <reference types="jquery"/>
 
 $('#menu').metisMenu();
+
 $('.metismenu').metisMenu({toggle: false});
+
 $('.test').metisMenu({
     toggle: false,
-    doubleTapToGo: true,
     activeClass: 'active',
     collapseClass: 'collapse',
     collapseInClass: 'in',
-    collapsingClass: 'collapsing'
+    collapsingClass: 'collapsing',
+    preventDefault: true
 });
+
+$('.metismenu').metisMenu('dispose');
+
+$('.metismenu')
+    .metisMenu()
+    .on('show.metisMenu', function(e) {
+        // empty logic
+    }).on('shown.metisMenu', function(e) {
+        // empty logic
+    }).on('hide.metisMenu', function(e) {
+        // empty logic
+    }).on('hidden.metisMenu', function(e) {
+        // empty logic
+    });
diff --git a/mocha/index.d.ts b/mocha/index.d.ts
index 41d08c685d..40210dc69d 100644
--- a/mocha/index.d.ts
+++ b/mocha/index.d.ts
@@ -120,6 +120,7 @@ declare namespace Mocha {
     interface IHookCallbackContext {
         skip(): void;
         timeout(ms: number): void;
+        [index: string]: any;
     }
 
 
@@ -128,6 +129,7 @@ declare namespace Mocha {
         timeout(ms: number): void;
         retries(n: number): void;
         slow(ms: number): void;
+        [index: string]: any;
     }
 
     /** Partial interface for Mocha's `Runnable` class. */
diff --git a/mocha/mocha-tests.ts b/mocha/mocha-tests.ts
index fc17a18221..8e8dc0d938 100644
--- a/mocha/mocha-tests.ts
+++ b/mocha/mocha-tests.ts
@@ -47,6 +47,8 @@ function test_it() {
 
     it('does something', () => { });
 
+    it('does something', function () { this['sharedState'] = true; });
+
     it('does something', (done) => { done(); });
 
     it.only('does something', () => { });
@@ -64,6 +66,8 @@ function test_test() {
 
     test('does something', () => { });
 
+    test('does something', function () { this['sharedState'] = true; });
+
     test('does something', (done) => { done(); });
 
     test.only('does something', () => { });
@@ -81,6 +85,8 @@ function test_specify() {
 
     specify('does something', () => { });
 
+    specify('does something', function () { this['sharedState'] = true; });
+
     specify('does something', (done) => { done(); });
 
     specify.only('does something', () => { });
@@ -97,6 +103,8 @@ function test_specify() {
 function test_before() {
     before(() => { });
 
+    before(function () { this['sharedState'] = true; });
+
     before((done) => { done(); });
 
     before("my description", () => { });
@@ -120,6 +128,17 @@ function test_setup() {
         string = this.currentTest.state;
      });
 
+    setup(function() {
+        this['sharedState'] = true;
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        string = this.currentTest.state;
+     });
+
     setup(function (done) {
         done();
         boolean = this.currentTest.async;
@@ -135,6 +154,8 @@ function test_setup() {
 function test_after() {
     after(() => { });
 
+    after(function () { this['sharedState'] = true; });
+
     after((done) => { done(); });
 
     after("my description", () => { });
@@ -153,6 +174,17 @@ function test_teardown() {
         string = this.currentTest.state;
     });
 
+    teardown(function() {
+        this['sharedState'] = true;
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        string = this.currentTest.state;
+    });
+
     teardown(function(done) {
         done();
         boolean = this.currentTest.async;
@@ -176,6 +208,17 @@ function test_beforeEach() {
         string = this.currentTest.state;
     });
 
+    beforeEach(function () {
+        this['sharedState'] = true;
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        string = this.currentTest.state;
+    });
+
     beforeEach(function (done) {
         done();
         boolean = this.currentTest.async;
@@ -212,6 +255,8 @@ function test_beforeEach() {
 function test_suiteSetup() {
     suiteSetup(() => { });
 
+    suiteSetup(function () { this['sharedState'] = true; });
+
     suiteSetup((done) => { done(); });
 }
 
@@ -226,6 +271,17 @@ function test_afterEach() {
         string = this.currentTest.state;
     });
 
+    afterEach(function () {
+        this['sharedState'] = true;
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        string = this.currentTest.state;
+    });
+
     afterEach(function (done) {
         done();
         boolean = this.currentTest.async;
@@ -263,6 +319,8 @@ function test_afterEach() {
 function test_suiteTeardown() {
     suiteTeardown(() => { });
 
+    suiteTeardown(function () { this['sharedState'] = true; });
+
     suiteTeardown((done) => { done(); });
 }
 
diff --git a/mongodb/index.d.ts b/mongodb/index.d.ts
index bdf89c32f6..bab845a01d 100644
--- a/mongodb/index.d.ts
+++ b/mongodb/index.d.ts
@@ -1172,8 +1172,6 @@ export interface Cursor extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
     next(): Promise<CursorResult>;
     next(callback: MongoCallback<CursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#pipe
-    pipe(destination: Writable, options?: Object): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#project
     project(value: Object): Cursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#read
@@ -1184,8 +1182,6 @@ export interface Cursor extends Readable {
     rewind(): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setCursorOption
     setCursorOption(field: string, value: Object): Cursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setEncoding
-    setEncoding(encoding: string): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setReadPreference
     setReadPreference(readPreference: string | ReadPreference): Cursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#showRecordId
@@ -1201,8 +1197,6 @@ export interface Cursor extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#toArray
     toArray(): Promise<any[]>;
     toArray(callback: MongoCallback<any[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unpipe
-    unpipe(destination?: Writable): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unshift
     unshift(stream: Buffer | string): void;
 }
@@ -1260,8 +1254,6 @@ export interface AggregationCursor extends Readable {
     next(callback: MongoCallback<AggregationCursorResult>): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#out
     out(destination: string): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#pipe
-    pipe(destination: Writable, options?: Object): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#project
     project(document: Object): AggregationCursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#read
@@ -1271,16 +1263,12 @@ export interface AggregationCursor extends Readable {
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#rewind
     rewind(): AggregationCursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#setEncoding
-    setEncoding(encoding: string): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#skip
     skip(value: number): AggregationCursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#sort
     sort(document: Object): AggregationCursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#toArray
     toArray(): Promise<any[]>;
     toArray(callback: MongoCallback<any[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unpipe
-    unpipe(destination?: Writable): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unshift
     unshift(stream: Buffer | string): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unwind
@@ -1305,21 +1293,15 @@ export interface CommandCursor extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#next
     next(): Promise<AggregationCursorResult>;
     next(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#pipe
-    pipe(destination: Writable, options?: Object): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#read
     read(size: number): string | Buffer | void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#rewind
     rewind(): CommandCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setEncoding
-    setEncoding(encoding: string): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setReadPreference
     setReadPreference(readPreference: string | ReadPreference): CommandCursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#toArray
     toArray(): Promise<any[]>;
     toArray(callback: MongoCallback<any[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unpipe
-    unpipe(destination?: Writable): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unshift
     unshift(stream: Buffer | string): void;
 }
diff --git a/multer/index.d.ts b/multer/index.d.ts
index 2437f498db..53fdcd7add 100644
--- a/multer/index.d.ts
+++ b/multer/index.d.ts
@@ -48,22 +48,22 @@ declare namespace multer {
         /** A function used to determine within which folder the uploaded files should be stored. Defaults to the system's default temporary directory. */
         destination?: string | ((req: Express.Request, file: Express.Multer.File, callback: (error: Error, destination: string) => void) => void);
         /** A function used to determine what the file should be named inside the folder. Defaults to a random name with no file extension. */
-        filename?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, filename: string) => void) => void;
+        filename?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error | null, filename: string) => void) => void;
     }
 
     interface Instance {
-            /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
-            single(): express.RequestHandler;
-            /** Accept a single file with the name fieldname. The single file will be stored in req.file. */
-            single(fieldame: string): express.RequestHandler;
-            /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
-            array(): express.RequestHandler;
-            /** Accept an array of files, all with the name fieldname. Optionally error out if more than maxCount files are uploaded. The array of files will be stored in req.files. */
-            array(fieldame: string, maxCount?: number): express.RequestHandler;
-            /** Accept a mix of files, specified by fields. An object with arrays of files will be stored in req.files. */
-            fields(fields: Field[]): express.RequestHandler;
-            /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
-            any(): express.RequestHandler;
+        /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
+        single(): express.RequestHandler;
+        /** Accept a single file with the name fieldname. The single file will be stored in req.file. */
+        single(fieldame: string): express.RequestHandler;
+        /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
+        array(): express.RequestHandler;
+        /** Accept an array of files, all with the name fieldname. Optionally error out if more than maxCount files are uploaded. The array of files will be stored in req.files. */
+        array(fieldame: string, maxCount?: number): express.RequestHandler;
+        /** Accept a mix of files, specified by fields. An object with arrays of files will be stored in req.files. */
+        fields(fields: Field[]): express.RequestHandler;
+        /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
+        any(): express.RequestHandler;
     }
 }
 
diff --git a/needle/index.d.ts b/needle/index.d.ts
index 7607fdfc78..8cc61f2a2f 100644
--- a/needle/index.d.ts
+++ b/needle/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for needle 0.7.8
+// Type definitions for needle 1.4
 // Project: https://github.com/tomas/needle
-// Definitions by: San Chen <https://github.com/bigsan>
+// Definitions by: San Chen <https://github.com/bigsan>, Niklas Mollenhauer <https://github.com/nikeee>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -8,85 +8,111 @@
 declare module "needle" {
     import * as http from 'http';
     import * as Buffer from 'buffer';
-    module Needle {        
+    import * as https from 'https';
+    namespace Needle {
         interface NeedleResponse extends http.IncomingMessage {
             body: any;
             raw: Buffer;
             bytes: number;
         }
 
-        interface ReadableStream extends NodeJS.ReadableStream {
+        type ReadableStream = NodeJS.ReadableStream;
+
+        type NeedleCallback = (error: Error, response: NeedleResponse, body: any) => void;
+
+        interface Cookies {
+            [name: string]: any;
         }
 
-        interface Callback {
-                (error: Error, response: NeedleResponse, body: any): void;
-        }
+        type NeedleOptions = RequestOptions & ResponseOptions & RedirectOptions & https.RequestOptions;
 
         interface RequestOptions {
+            open_timeout?: number;
+            read_timeout?: number;
+            /**
+             * Alias for open_timeout
+             */
             timeout?: number;
-            follow?: number;
+
             follow_max?: number;
+            /**
+             * Alias for follow_max
+             */
+            follow?: number;
+
             multipart?: boolean;
+            agent?: http.Agent | boolean;
             proxy?: string;
-            agent?: string;
-                headers?: Object;
-            auth?: string; // auto | digest | basic (default)
+            headers?: {};
+            auth?: "auto" | "digest" | "basic";
             json?: boolean;
 
             // These properties are overwritten by those in the 'headers' field
+            cookies?: Cookies;
             compressed?: boolean;
-            cookies?: { [name: string]: any; };
             // Overwritten if present in the URI
             username?: string;
             password?: string;
+            accept?: string;
+            connection?: string;
+            user_agent?: string;
         }
 
         interface ResponseOptions {
+            decode_response?: boolean;
+            /**
+             * Alias for decode_response
+             */
             decode?: boolean;
+            parse_response?: boolean;
+            /**
+             * Alias for parse_response
+             */
             parse?: boolean;
-            output?: any;
+
+            parse_cookies?: boolean;
+            output?: string;
         }
 
-        interface TLSOptions {
-            pfx?: any;
-            key?: any;
-            passphrase?: string;
-            cert?: any;
-            ca?: any;
-            ciphers?: any;
-            rejectUnauthorized?: boolean;
-            secureProtocol?: any;
+        interface RedirectOptions {
+            follow_set_cookie?: boolean;
+            follow_set_referer?: boolean;
+            follow_keep_method?: boolean;
+            follow_if_same_host?: boolean;
+            follow_if_same_protocol?: boolean;
         }
 
+        interface KeyValue {
+            [key: string]: any;
+        }
+
+        type BodyData = Buffer | KeyValue | NodeJS.ReadableStream | string | null;
+
         interface NeedleStatic {
-            defaults(options?: any): void;
+            defaults(options: NeedleOptions): void;
 
-            head(url: string): ReadableStream;
-            head(url: string, callback?: Callback): ReadableStream;
-            head(url: string, options?: RequestOptions, callback?: Callback): ReadableStream;
+            head(url: string, callback?: NeedleCallback): ReadableStream;
+            head(url: string, options?: NeedleOptions, callback?: NeedleCallback): ReadableStream;
 
-            get(url: string): ReadableStream;
-            get(url: string, callback?: Callback): ReadableStream;
-            get(url: string, options?: RequestOptions, callback?: Callback): ReadableStream;
+            get(url: string, callback?: NeedleCallback): ReadableStream;
+            get(url: string, options?: NeedleOptions, callback?: NeedleCallback): ReadableStream;
 
-            post(url: string, data: any): ReadableStream;
-            post(url: string, data: any, callback?: Callback): ReadableStream;
-            post(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+            post(url: string, data: BodyData, callback?: NeedleCallback): ReadableStream;
+            post(url: string, data: BodyData, options?: NeedleOptions, callback?: NeedleCallback): ReadableStream;
 
-            put(url: string, data: any): ReadableStream;
-            put(url: string, data: any, callback?: Callback): ReadableStream;
-            put(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+            put(url: string, data: BodyData, callback?: NeedleCallback): ReadableStream;
+            put(url: string, data: BodyData, options?: NeedleOptions, callback?: NeedleCallback): ReadableStream;
 
-            delete(url: string, data: any): ReadableStream;
-            delete(url: string, data: any, callback?: Callback): ReadableStream;
-            delete(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+            patch(url: string, data: BodyData, callback?: NeedleCallback): ReadableStream;
+            patch(url: string, data: BodyData, options?: NeedleOptions, callback?: NeedleCallback): ReadableStream;
 
-            request(method: string, url: string, data: any): ReadableStream;
-            request(method: string, url: string, data: any, callback?: Callback): ReadableStream;
-            request(method: string, url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+            delete(url: string, data: BodyData, callback?: NeedleCallback): ReadableStream;
+            delete(url: string, data: BodyData, options?: NeedleOptions, callback ?: NeedleCallback): ReadableStream;
+
+            request(method: string, url: string, data: BodyData, callback?: NeedleCallback): ReadableStream;
+            request(method: string, url: string, data: BodyData, options?: NeedleOptions, callback?: NeedleCallback): ReadableStream;
         }
     }
-
-    var needle: Needle.NeedleStatic;
+    const needle: Needle.NeedleStatic;
     export = needle;
-}
\ No newline at end of file
+}
diff --git a/needle/needle-tests.ts b/needle/needle-tests.ts
index 3df14952c3..1c5090027a 100644
--- a/needle/needle-tests.ts
+++ b/needle/needle-tests.ts
@@ -1,4 +1,5 @@
-import needle = require("needle");
+import * as needle from "needle";
+import * as fs from "fs";
 
 function Usage() {
     // using callback
@@ -14,7 +15,7 @@ function Usage() {
 
 function ResponsePipeline() {
     needle.get('http://stackoverflow.com/feeds', { compressed: true }, function (err, resp) {
-        console.log(resp.body); // this little guy won't be a Gzipped binary blob 
+        console.log(resp.body); // this little guy won't be a Gzipped binary blob
         // but a nice object containing all the latest entries
     });
 
@@ -24,21 +25,26 @@ function ResponsePipeline() {
         rejectUnauthorized: true
     };
 
-    // in this case, we'll ask Needle to follow redirects (disabled by default), 
+    // in this case, we'll ask Needle to follow redirects (disabled by default),
     // but also to verify their SSL certificates when connecting.
     var stream = needle.get('https://backend.server.com/everything.html', options);
 
     stream.on('readable', function () {
         var data: any;
-        while (data = this.read()) {
+        while (data = stream.read()) {
             console.log(data.toString());
         }
     });
+
+    stream.on('end', function(err: any) {
+        // if our request had an error, our 'end' event will tell us.
+        if (!err) console.log('Great success!');
+    })
 }
 
 function API_head() {
     var options = {
-        timeout: 5000 // if we don't get a response in 5 seconds, boom.
+        open_timeout: 5000 // if we don't get a response in 5 seconds, boom.
     };
 
     needle.head('https://my.backend.server.com', function (err, resp) {
@@ -93,14 +99,131 @@ function API_delete() {
 }
 
 function API_request() {
-    var data = {
+    var params = {
         q: 'a very smart query',
         page: 2,
-        format: 'json'
     };
 
-    needle.request('get', 'forum.com/search', data, function (err, resp) {
+    needle.request('get', 'forum.com/search', params, function (err, resp) {
         if (!err && resp.statusCode == 200)
             console.log(resp.body); // here you go, mister.
     });
+
+    needle.request('get', 'forum.com/search', params, { json: true }, function(err, resp) {
+        if (resp.statusCode == 200) console.log('It worked!');
+    });
+}
+
+function HttpGetWithBasicAuth() {
+    needle.get('https://api.server.com', { username: 'you', password: 'secret' }, function(err, resp) {
+        // used HTTP auth
+    });
+    needle.get('https://username:password@api.server.com', function(err, resp) {
+        // used HTTP auth from URL
+    });
+}
+
+function DigestAuth() {
+    needle.get('other.server.com', { username: 'you', password: 'secret', auth: 'digest' }, function(err, resp, body) {
+        // needle prepends 'http://' to your URL, if missing
+    });
+}
+
+function CustomAcceptHeaderDeflate() {
+    var options = {
+        compressed: true,
+        follow: 10,
+        accept: 'application/vnd.github.full+json'
+    }
+
+    needle.get('api.github.com/users/tomas', options, function(err, resp, body) {
+        // body will contain a JSON.parse(d) object
+        // if parsing fails, you'll simply get the original body
+    });
+
+}
+
+function Various() {
+
+    needle.get('https://news.ycombinator.com/rss', function(err, resp, body) {
+        // if xml2js is installed, you'll get a nice object containing the nodes in the RSS
+    });
+    needle.get('http://upload.server.com/tux.png', { output: '/tmp/tux.png' }, function(err, resp, body) {
+        // you can dump any response to a file, not only binaries.
+    });
+    needle.get('http://search.npmjs.org', { proxy: 'http://localhost:1234' }, function(err, resp, body) {
+        // request passed through proxy
+    });
+    const stream1 = needle.get('http://www.as35662.net/100.log');
+        stream1.on('readable', function() {
+        let chunk: any;
+        while (chunk = stream1.read()) {
+            console.log('got data: ', chunk);
+        }
+    });
+    const stream2 = needle.get('http://jsonplaceholder.typicode.com/db', { parse: true });
+    stream2.on('readable', function() {
+        let node: any;
+
+        // our stream2 will only emit a single JSON root node.
+        while (node = stream2.read()) {
+            console.log('got data: ', node);
+        }
+    });
+
+    /*
+    // Sample omitted, no JSONStream
+    needle.get('http://jsonplaceholder.typicode.com/db', { parse: true })
+        .pipe(new JSONStream.parse('posts.*.title'))
+        .on('data', function (obj) {
+            console.log('got post title: %s', obj);
+        });
+    */
+}
+
+function FileUpload() {
+    var data = {
+        foo: 'bar',
+        image: { file: '/home/tomas/linux.png', content_type: 'image/png' }
+    };
+
+    needle.post('http://my.other.app.com', data, { multipart: true }, function(err, resp, body) {
+        // needle will read the file and include it in the form-data as binary
+    });
+    needle.put('https://api.app.com/v2', fs.createReadStream('myfile.txt'), function(err, resp, body) {
+        // stream content is uploaded verbatim
+    });
+}
+
+function Multipart() {
+    var buffer = fs.readFileSync('/path/to/package.zip');
+
+    var data = {
+        zip_file: {
+            buffer: buffer,
+            filename: 'mypackage.zip',
+            content_type: 'application/octet-stream'
+        }
+    }
+
+    needle.post('http://somewhere.com/over/the/rainbow', data, { multipart: true }, function(err, resp, body) {
+        // if you see, when using buffers we need to pass the filename for the multipart body.
+        // you can also pass a filename when using the file path method, in case you want to override
+        // the default filename to be received on the other end.
+    });
+}
+
+function MultipartContentType() {
+    var data = {
+        token: 'verysecret',
+        payload: {
+            value: JSON.stringify({ title: 'test', version: 1 }),
+            content_type: 'application/json'
+        }
+    }
+
+    needle.post('http://test.com/', data, { timeout: 5000, multipart: true }, function(err, resp, body) {
+        // in this case, if the request takes more than 5 seconds
+        // the callback will return a [Socket closed] error
+    });
 }
diff --git a/needle/tsconfig.json b/needle/tsconfig.json
index 5af602dd4f..59f9b2b49e 100644
--- a/needle/tsconfig.json
+++ b/needle/tsconfig.json
@@ -5,8 +5,8 @@
             "es6"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,4 +19,4 @@
         "index.d.ts",
         "needle-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/needle/v0/index.d.ts b/needle/v0/index.d.ts
new file mode 100644
index 0000000000..28b5b8119f
--- /dev/null
+++ b/needle/v0/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for needle 0.7
+// Project: https://github.com/tomas/needle
+// Definitions by: San Chen <https://github.com/bigsan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare module "needle" {
+    import * as http from 'http';
+    import * as Buffer from 'buffer';
+    namespace Needle {
+        interface NeedleResponse extends http.IncomingMessage {
+            body: any;
+            raw: Buffer;
+            bytes: number;
+        }
+
+        type ReadableStream = NodeJS.ReadableStream;
+
+        type NeedleCallback = (error: Error, response: NeedleResponse, body: any) => void;
+
+        interface RequestOptions {
+            timeout?: number;
+            follow?: number;
+            follow_max?: number;
+            multipart?: boolean;
+            proxy?: string;
+            agent?: string;
+            headers?: {};
+            auth?: string; // auto | digest | basic (default)
+            json?: boolean;
+
+            // These properties are overwritten by those in the 'headers' field
+            compressed?: boolean;
+            cookies?: { [name: string]: any; };
+            // Overwritten if present in the URI
+            username?: string;
+            password?: string;
+        }
+
+        interface ResponseOptions {
+            decode?: boolean;
+            parse?: boolean;
+            output?: any;
+        }
+
+        interface TLSOptions {
+            pfx?: any;
+            key?: any;
+            passphrase?: string;
+            cert?: any;
+            ca?: any;
+            ciphers?: any;
+            rejectUnauthorized?: boolean;
+            secureProtocol?: any;
+        }
+
+        interface NeedleStatic {
+            defaults(options?: any): void;
+
+            head(url: string, callback?: NeedleCallback): ReadableStream;
+            head(url: string, options?: RequestOptions, callback?: NeedleCallback): ReadableStream;
+
+            get(url: string, callback?: NeedleCallback): ReadableStream;
+            get(url: string, options?: RequestOptions, callback?: NeedleCallback): ReadableStream;
+
+            post(url: string, data: any, callback?: NeedleCallback): ReadableStream;
+            post(url: string, data: any, options?: RequestOptions, callback?: NeedleCallback): ReadableStream;
+
+            put(url: string, data: any, callback?: NeedleCallback): ReadableStream;
+            put(url: string, data: any, options?: RequestOptions, callback?: NeedleCallback): ReadableStream;
+
+            delete(url: string, data: any, callback?: NeedleCallback): ReadableStream;
+            delete(url: string, data: any, options?: RequestOptions, callback?: NeedleCallback): ReadableStream;
+
+            request(method: string, url: string, data: any, callback?: NeedleCallback): ReadableStream;
+            request(method: string, url: string, data: any, options?: RequestOptions, callback?: NeedleCallback): ReadableStream;
+        }
+    }
+
+    var needle: Needle.NeedleStatic;
+    export = needle;
+}
diff --git a/needle/v0/needle-tests.ts b/needle/v0/needle-tests.ts
new file mode 100644
index 0000000000..5a849ec204
--- /dev/null
+++ b/needle/v0/needle-tests.ts
@@ -0,0 +1,106 @@
+import needle = require("needle");
+
+function Usage() {
+    // using callback
+    needle.get('http://ifconfig.me/all.json', function (error, response) {
+        if (!error)
+            console.log(response.body.ip_addr); // JSON decoding magic. :)
+    });
+
+    // using streams
+    var out: any; // = fs.createWriteStream('logo.png');
+    needle.get('https://google.com/images/logo.png').pipe(out);
+}
+
+function ResponsePipeline() {
+    needle.get('http://stackoverflow.com/feeds', { compressed: true }, function (err, resp) {
+        console.log(resp.body); // this little guy won't be a Gzipped binary blob
+        // but a nice object containing all the latest entries
+    });
+
+    var options = {
+        compressed: true,
+        follow: 5,
+        rejectUnauthorized: true
+    };
+
+    // in this case, we'll ask Needle to follow redirects (disabled by default),
+    // but also to verify their SSL certificates when connecting.
+    var stream = needle.get('https://backend.server.com/everything.html', options);
+
+    stream.on('readable', function () {
+        var data: any;
+        while (data = stream.read()) {
+            console.log(data.toString());
+        }
+    });
+}
+
+function API_head() {
+    var options = {
+        timeout: 5000 // if we don't get a response in 5 seconds, boom.
+    };
+
+    needle.head('https://my.backend.server.com', function (err, resp) {
+        if (err) {
+            console.log('Shoot! Something is wrong: ' + err.message);
+        }
+        else {
+            console.log('Yup, still alive.');
+        }
+    });
+}
+
+function API_get() {
+    needle.get('google.com/search?q=syd+barrett', function (err, resp) {
+        // if no http:// is found, Needle will automagically prepend it.
+    });
+}
+
+function API_post() {
+    var options = {
+        headers: { 'X-Custom-Header': 'Bumbaway atuna' }
+    };
+
+    needle.post('https://my.app.com/endpoint', 'foo=bar', options, function (err, resp) {
+        // you can pass params as a string or as an object.
+    });
+}
+
+function API_put() {
+    var nested = {
+        params: {
+            are: {
+                also: 'supported'
+            }
+        }
+    };
+
+    needle.put('https://api.app.com/v2', nested, function (err, resp) {
+        console.log('Got ' + resp.bytes + ' bytes.') // another nice treat from this handsome fella.
+    });
+}
+
+function API_delete() {
+    var options = {
+        username: 'fidelio',
+        password: 'x'
+    };
+
+    needle.delete('https://api.app.com/messages/123', null, options, function (err, resp) {
+        // in this case, data may be null, but you need to explicity pass it.
+    });
+}
+
+function API_request() {
+    var data = {
+        q: 'a very smart query',
+        page: 2,
+        format: 'json'
+    };
+
+    needle.request('get', 'forum.com/search', data, function (err, resp) {
+        if (!err && resp.statusCode == 200)
+            console.log(resp.body); // here you go, mister.
+    });
+}
diff --git a/needle/v0/tsconfig.json b/needle/v0/tsconfig.json
new file mode 100644
index 0000000000..44c8b59654
--- /dev/null
+++ b/needle/v0/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+          "needle": [
+            "needle/v0"
+          ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "needle-tests.ts"
+    ]
+}
diff --git a/node-waves/index.d.ts b/node-waves/index.d.ts
new file mode 100644
index 0000000000..ce5c63da2e
--- /dev/null
+++ b/node-waves/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for node-waves 0.7
+// Project: http://fian.my.id/Waves
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type ElementTarget = string | Element | Element[];
+
+export interface WavesConfig {
+	/**
+	 * Determines how long the waves effect duration (in milliseconds).
+	 *
+	 */
+	duration?: number;
+
+	/**
+	 * Delay amount to show waves effect on touch and hide the effect if user scrolls.
+	 * Set to 0 to disable delay (in milliseconds).
+	 *
+	 */
+	delay?: number;
+}
+
+export interface RippleOptions {
+
+	/**
+	 * Specify how long to wait between starting and stopping the ripple.
+	 *
+	 */
+	wait?: number | null;
+
+	/**
+	 * Specify the position inside the element.
+	 *
+	 */
+	position?: {
+		x: number;
+		y: number;
+	} | null;
+}
+
+/**
+ * Initializes waves with an optional config.
+ */
+export function init(config?: WavesConfig): void;
+
+/**
+ * Attach ripple effect by adding `.waves-effect` to HTML element.
+ * Make sure you call `init` to activate the ripple.
+ *
+ * @param {ElementTarget} elements elements to target.
+ * @param {(string | string[])} [classes] classes to add.
+ */
+export function attach(elements: ElementTarget, classes?: string | string[]): void;
+
+/**
+ * Creates a ripple effect in HTML element programmatically.
+ * @param {ElementTarget} elements elements to target (must have `.waves-effect` already applied, ideally via `attach`).
+ * @param {RippleOptions} [options] specify how long to wait between starting and stopping the ripple, and it's position inside the element.
+ */
+export function ripple(elements: ElementTarget, options?: RippleOptions): void;
+
+/**
+ * Removes all ripples from inside an element immediately.
+ *
+ * @param {ElementTarget} elements elements to remove ripples from.
+ */
+export function calm(elements: ElementTarget): void;
diff --git a/node-waves/node-waves-tests.ts b/node-waves/node-waves-tests.ts
new file mode 100644
index 0000000000..adfb59703a
--- /dev/null
+++ b/node-waves/node-waves-tests.ts
@@ -0,0 +1,10 @@
+
+import { init, ripple, attach, calm } from "node-waves";
+
+init({ delay: 300 });
+
+attach("button", "waves-light");
+
+ripple(".box", { wait: null });
+
+calm(".box");
diff --git a/node-waves/tsconfig.json b/node-waves/tsconfig.json
new file mode 100644
index 0000000000..c069824144
--- /dev/null
+++ b/node-waves/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-waves-tests.ts"
+    ]
+}
diff --git a/node-waves/tslint.json b/node-waves/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/node-waves/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/node-zookeeper-client/index.d.ts b/node-zookeeper-client/index.d.ts
new file mode 100644
index 0000000000..227ebd45ad
--- /dev/null
+++ b/node-zookeeper-client/index.d.ts
@@ -0,0 +1,169 @@
+// Type definitions for node-zookeeper-client 0.2
+// Project: https://github.com/alexguan/node-zookeeper-client
+// Definitions by: York Yao <https://github.com/plantain-00/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import * as EventEmitter from "events";
+
+export class Id {
+    scheme: string;
+    id: string;
+    constructor(scheme: string, id: string);
+}
+
+export class ACL {
+    perms: number;
+    id: Id;
+    constructor(perms: number, id: Id);
+}
+
+export const Permission: {
+    READ: number,
+    WRITE: number,
+    CREATE: number,
+    DELETE: number,
+    ADMIN: number,
+    ALL: number,
+};
+
+export interface Stat {
+    czxid: number;
+    mzxid: number;
+    ctime: number;
+    mtime: number;
+    version: number;
+    cversion: number;
+    aversion: number;
+    ephemeralOwner: number;
+    dataLength: number;
+    numChildren: number;
+    pzxid: number;
+}
+
+export class State {
+    static DISCONNECTED: State;
+    static SYNC_CONNECTED: State;
+    static AUTH_FAILED: State;
+    static CONNECTED_READ_ONLY: State;
+    static SASL_AUTHENTICATED: State;
+    static EXPIRED: State;
+
+    name: string;
+    code: number;
+    constructor(name: string, code: number);
+    toString(): string;
+}
+
+export class Event {
+    static NODE_CREATED: number;
+    static NODE_DELETED: number;
+    static NODE_DATA_CHANGED: number;
+    static NODE_CHILDREN_CHANGED: number;
+    type: string;
+    name: string;
+    path: string;
+    constructor(type: string, name: string, path: string);
+    toString(): string;
+    getType(): string;
+    getName(): string;
+    getPath(): string;
+}
+
+interface Transaction {
+    create(path: string, dataOrAclsOrmode1?: Buffer | ACL[] | number, dataOrAclsOrmode2?: Buffer | ACL[] | number, dataOrAclsOrmode3?: Buffer | ACL[] | number): this;
+    setData(path: string, data: Buffer | null, version?: number): this;
+    check(path: string, version?: number): this;
+    remove(path: string, version?: number): this;
+    commit(callback: (error: Error | Exception, results: any) => void): void;
+}
+
+interface Client extends EventEmitter {
+    connect(): void;
+    close(): void;
+    create(path: string, callback: (error: Error | Exception, path: string) => void): void;
+    create(path: string, dataOrAclsOrmode1: Buffer | ACL[] | number, callback: (error: Error | Exception, path: string) => void): void;
+    create(path: string, dataOrAclsOrmode1: Buffer | ACL[] | number, dataOrAclsOrmode2: Buffer | ACL[] | number, callback: (error: Error | Exception, path: string) => void): void;
+    create(path: string, dataOrAclsOrmode1: Buffer | ACL[] | number, dataOrAclsOrmode2: Buffer | ACL[] | number, dataOrAclsOrmode3: Buffer | ACL[] | number, callback: (error: Error | Exception, path: string) => void): void;
+    remove(path: string, callback: (error: Error | Exception) => void): void;
+    remove(path: string, version: number, callback: (error: Error | Exception) => void): void;
+    exists(path: string, callback: (error: Error | Exception, stat: Stat) => void): void;
+    exists(path: string, watcher: (event: Event) => void, callback: (error: Error | Exception, stat: Stat) => void): void;
+    getChildren(path: string, callback: (error: Error | Exception, children: string[], stat: Stat) => void): void;
+    getChildren(path: string, watcher: (event: Event) => void, callback: (error: Error | Exception, children: string[], stat: Stat) => void): void;
+    getData(path: string, callback: (error: Error | Exception, data: Buffer, stat: Stat) => void): void;
+    getData(path: string, watcher: (event: Event) => void, callback: (error: Error | Exception, data: Buffer, stat: Stat) => void): void;
+    setData(path: string, data: Buffer | null, callback: (error: Error | Exception, stat: Stat) => void): void;
+    setData(path: string, data: Buffer | null, version: number, callback: (error: Error | Exception, stat: Stat) => void): void;
+    getACL(path: string, callback: (error: Error | Exception, acls: ACL[], stat: Stat) => void): void;
+    setACL(path: string, acls: ACL[], callback: (error: Error | Exception, stat: Stat) => void): void;
+    setACL(path: string, acls: ACL[], version: number, callback: (error: Error | Exception, stat: Stat) => void): void;
+    transaction(): Transaction;
+    mkdirp(path: string, callback: (error: Error | Exception, path: string) => void): void;
+    mkdirp(path: string, dataOrAclsOrmode1: Buffer | ACL[] | number, callback: (error: Error | Exception, path: string) => void): void;
+    mkdirp(path: string, dataOrAclsOrmode1: Buffer | ACL[] | number, dataOrAclsOrmode2: Buffer | ACL[] | number, callback: (error: Error | Exception, path: string) => void): void;
+    mkdirp(path: string, dataOrAclsOrmode1: Buffer | ACL[] | number, dataOrAclsOrmode2: Buffer | ACL[] | number, dataOrAclsOrmode3: Buffer | ACL[] | number, callback: (error: Error | Exception, path: string) => void): void;
+    addAuthInfo(scheme: string, auth: Buffer): void;
+    getState(): State;
+    getSessionId(): Buffer;
+    getSessionPassword(): Buffer;
+    getSessionTimeout(): number;
+
+    on(event: "state", cb: (state: State) => void): this;
+    on(event: "connected" | "connectedReadOnly" | "disconnected" | "expired" | "authenticationFailed" | string, cb: () => void): this;
+
+    once(event: "state", cb: (state: State) => void): this;
+    once(event: "connected" | "connectedReadOnly" | "disconnected" | "expired" | "authenticationFailed" | string, cb: () => void): this;
+
+    addListener(event: "state", cb: (state: State) => void): this;
+    addListener(event: "connected" | "connectedReadOnly" | "disconnected" | "expired" | "authenticationFailed" | string, cb: () => void): this;
+}
+
+export interface Option {
+    sessionTimeout: number;
+    spinDelay: number;
+    retries: number;
+}
+
+export function createClient(connectionString: string, options?: Partial<Option>): Client;
+
+export const CreateMode: {
+    PERSISTENT: number,
+    PERSISTENT_SEQUENTIAL: number,
+    EPHEMERAL: number,
+    EPHEMERAL_SEQUENTIAL: number,
+};
+
+export class Exception {
+    static OK: number;
+    static SYSTEM_ERROR: number;
+    static RUNTIME_INCONSISTENCY: number;
+    static DATA_INCONSISTENCY: number;
+    static CONNECTION_LOSS: number;
+    static MARSHALLING_ERROR: number;
+    static UNIMPLEMENTED: number;
+    static OPERATION_TIMEOUT: number;
+    static BAD_ARGUMENTS: number;
+    static API_ERROR: number;
+    static NO_NODE: number;
+    static NO_AUTH: number;
+    static BAD_VERSION: number;
+    static NO_CHILDREN_FOR_EPHEMERALS: number;
+    static NODE_EXISTS: number;
+    static NOT_EMPTY: number;
+    static SESSION_EXPIRED: number;
+    static INVALID_CALLBACK: number;
+    static INVALID_ACL: number;
+    static AUTH_FAILED: number;
+
+    code: number;
+    name: string;
+    path: number;
+    constructor(code: number, name: string, path: number);
+    toString(): string;
+    getCode(): number;
+    getName(): string;
+    getPath(): string;
+}
diff --git a/node-zookeeper-client/node-zookeeper-client-tests.ts b/node-zookeeper-client/node-zookeeper-client-tests.ts
new file mode 100644
index 0000000000..71f2267878
--- /dev/null
+++ b/node-zookeeper-client/node-zookeeper-client-tests.ts
@@ -0,0 +1,253 @@
+import * as zookeeper from "node-zookeeper-client";
+
+{
+    const client = zookeeper.createClient('localhost:2181');
+    const path = process.argv[2];
+
+    client.once('connected', function () {
+        console.log('Connected to the server.');
+
+        client.create(path, function (error) {
+            if (error) {
+                console.log('Failed to create node: %s due to: %s.', path, error);
+            } else {
+                console.log('Node: %s is successfully created.', path);
+            }
+
+            client.close();
+        });
+    });
+
+    client.connect();
+}
+
+function listChildren(client: zookeeper.Client, path: string) {
+    client.getChildren(
+        path,
+        function (event) {
+            console.log('Got watcher event: %s', event);
+            listChildren(client, path);
+        },
+        function (error, children, stat) {
+            if (error) {
+                console.log(
+                    'Failed to list children of %s due to: %s.',
+                    path,
+                    error
+                );
+                return;
+            }
+
+            console.log('Children of %s are: %j.', path, children);
+        }
+    );
+}
+
+{
+    const client = zookeeper.createClient('localhost:2181');
+    const path = process.argv[2];
+
+    client.once('connected', function () {
+        console.log('Connected to ZooKeeper.');
+        listChildren(client, path);
+    });
+
+    client.connect();
+}
+
+const client = zookeeper.createClient(
+    'localhost:2181/test',
+    { sessionTimeout: 10000 }
+);
+
+{
+    client.create(
+        '/test/demo',
+        new Buffer('data'),
+        zookeeper.CreateMode.EPHEMERAL,
+        function (error: Error, path) {
+            if (error) {
+                console.log(error.stack);
+                return;
+            }
+
+            console.log('Node: %s is created.', path);
+        }
+    );
+}
+
+{
+    client.remove('/test/demo', -1, function (error: Error) {
+        if (error) {
+            console.log(error.stack);
+            return;
+        }
+
+        console.log('Node is deleted.');
+    });
+}
+
+{
+    client.exists('/test/demo', function (error: Error, stat) {
+        if (error) {
+            console.log(error.stack);
+            return;
+        }
+
+        if (stat) {
+            console.log('Node exists.');
+        } else {
+            console.log('Node does not exist.');
+        }
+    });
+}
+
+{
+    client.getChildren('/test/demo', function (error: Error, children, stats) {
+        if (error) {
+            console.log(error.stack);
+            return;
+        }
+
+        console.log('Children are: %j.', children);
+    });
+}
+
+{
+    client.getData(
+        '/test/demo',
+        function (event) {
+            console.log('Got event: %s.', event);
+        },
+        function (error: Error, data, stat) {
+            if (error) {
+                console.log(error.stack);
+                return;
+            }
+
+            console.log('Got data: %s', data.toString('utf8'));
+        }
+    );
+}
+
+{
+    client.setData('/test/demo', null, 2, function (error: Error, stat) {
+        if (error) {
+            console.log(error.stack);
+            return;
+        }
+
+        console.log('Data is set.');
+    });
+}
+
+{
+    client.getACL('/test/demo', function (error: Error, acls, stat) {
+        if (error) {
+            console.log(error.stack);
+            return;
+        }
+
+        console.log('ACL(s) are: %j', acls);
+    });
+}
+
+{
+    client.setACL(
+        '/test/demo',
+        [
+            new zookeeper.ACL(
+                zookeeper.Permission.ADMIN,
+                new zookeeper.Id('ip', '127.0.0.1')
+            )
+        ],
+        function (error: Error, stat) {
+            if (error) {
+                console.log(error.stack);
+                return;
+            }
+
+            console.log('New ACL is set.');
+        }
+    );
+}
+
+{
+    client.mkdirp('/test/demo/1/2/3', function (error: Error, path) {
+        if (error) {
+            console.log(error.stack);
+            return;
+        }
+
+        console.log('Node: %s is created.', path);
+    });
+}
+
+{
+    client.addAuthInfo('ip', new Buffer('127.0.0.1'));
+}
+
+{
+    const state = client.getState();
+    console.log('Current state is: %s', state);
+}
+
+{
+    const id = client.getSessionId();
+    console.log('Session id is: %s', id.toString('hex'));
+}
+
+{
+    client.getSessionPassword();
+    client.getSessionTimeout();
+
+    client.on('connected', function () {
+        console.log('Client state is changed to connected.');
+    });
+    client.on('state', function (state) {
+        if (state === zookeeper.State.SYNC_CONNECTED) {
+            console.log('Client state is changed to connected.');
+        }
+    });
+}
+
+{
+    client.once('connected', function () {
+        client.transaction().
+            create('/txn').
+            create('/txn/1', new Buffer('transaction')).
+            setData('/txn/1', new Buffer('test'), -1).
+            check('/txn/1').
+            remove('/txn/1', -1).
+            remove('/txn').
+            commit(function (error, results) {
+                if (error) {
+                    console.log(
+                        'Failed to execute the transaction: %s, results: %j',
+                        error,
+                        results
+                    );
+
+                    return;
+                }
+
+                console.log('Transaction completed.');
+                client.close();
+            });
+    });
+}
+
+{
+    client.create('/test/demo', function (error, path) {
+        if (error) {
+            if ((error as zookeeper.Exception).getCode() == zookeeper.Exception.NODE_EXISTS) {
+                console.log('Node exists.');
+            } else {
+                console.log((error as Error).stack);
+            }
+            return;
+        }
+
+        console.log('Node: %s is created.', path);
+    });
+}
diff --git a/node-zookeeper-client/tsconfig.json b/node-zookeeper-client/tsconfig.json
new file mode 100644
index 0000000000..1f5ffdedf8
--- /dev/null
+++ b/node-zookeeper-client/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-zookeeper-client-tests.ts"
+    ]
+}
diff --git a/node-zookeeper-client/tslint.json b/node-zookeeper-client/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/node-zookeeper-client/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/node/index.d.ts b/node/index.d.ts
index 93c0d7c709..d23cc981e4 100644
--- a/node/index.d.ts
+++ b/node/index.d.ts
@@ -11,7 +11,7 @@
 
 // This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
 interface Console {
-    Console: typeof NodeJS.Console;
+    Console: NodeJS.ConsoleConstructor;
     assert(value: any, message?: string, ...optionalParams: any[]): void;
     dir(obj: any, options?: {showHidden?: boolean, depth?: number, colors?: boolean}): void;
     error(message?: any, ...optionalParams: any[]): void;
@@ -247,7 +247,7 @@ declare var Buffer: {
 *                                               *
 ************************************************/
 declare namespace NodeJS {
-    export var Console: {
+    export interface ConsoleConstructor {
         prototype: Console;
         new(stdout: WritableStream, stderr?: WritableStream): Console;
     }
@@ -281,12 +281,12 @@ declare namespace NodeJS {
         readable: boolean;
         isTTY?: boolean;
         read(size?: number): string | Buffer;
-        setEncoding(encoding: string | null): void;
-        pause(): ReadableStream;
-        resume(): ReadableStream;
+        setEncoding(encoding: string | null): this;
+        pause(): this;
+        resume(): this;
         isPaused(): boolean;
         pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe<T extends WritableStream>(destination?: T): void;
+        unpipe<T extends WritableStream>(destination?: T): this;
         unshift(chunk: string): void;
         unshift(chunk: Buffer): void;
         wrap(oldStream: ReadableStream): ReadableStream;
@@ -303,10 +303,7 @@ declare namespace NodeJS {
         end(str: string, encoding?: string, cb?: Function): void;
     }
 
-    export interface ReadWriteStream extends ReadableStream, WritableStream {
-        pause(): ReadWriteStream;
-        resume(): ReadWriteStream;
-    }
+    export interface ReadWriteStream extends ReadableStream, WritableStream { }
 
     export interface Events extends EventEmitter { }
 
@@ -1904,11 +1901,11 @@ declare module "net" {
         connect(port: number, host?: string, connectionListener?: Function): void;
         connect(path: string, connectionListener?: Function): void;
         bufferSize: number;
-        setEncoding(encoding?: string): void;
+        setEncoding(encoding?: string): this;
         write(data: any, encoding?: string, callback?: Function): void;
         destroy(): void;
-        pause(): Socket;
-        resume(): Socket;
+        pause(): this;
+        resume(): this;
         setTimeout(timeout: number, callback?: Function): void;
         setNoDelay(noDelay?: boolean): void;
         setKeepAlive(enable?: boolean, initialDelay?: number): void;
@@ -3398,12 +3395,12 @@ declare module "stream" {
             constructor(opts?: ReadableOptions);
             protected _read(size: number): void;
             read(size?: number): any;
-            setEncoding(encoding: string): void;
-            pause(): Readable;
-            resume(): Readable;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
             isPaused(): boolean;
             pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-            unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
             unshift(chunk: any): void;
             wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
             push(chunk: any, encoding?: string): boolean;
@@ -3562,8 +3559,8 @@ declare module "stream" {
         // Note: Duplex extends both Readable and Writable.
         export class Duplex extends Readable implements NodeJS.ReadWriteStream {
             // Readable
-            pause(): Duplex;
-            resume(): Duplex;
+            pause(): this;
+            resume(): this;
             // Writeable
             writable: boolean;
             constructor(opts?: DuplexOptions);
@@ -3588,12 +3585,12 @@ declare module "stream" {
             protected _transform(chunk: any, encoding: string, callback: Function): void;
             protected _flush(callback: Function): void;
             read(size?: number): any;
-            setEncoding(encoding: string): void;
-            pause(): Transform;
-            resume(): Transform;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
             isPaused(): boolean;
             pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-            unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
             unshift(chunk: any): void;
             wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
             push(chunk: any, encoding?: string): boolean;
diff --git a/node/node-tests.ts b/node/node-tests.ts
index 03c3e9a1b6..9585b3893a 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -1634,6 +1634,11 @@ namespace console_tests {
         var _c: Console = console;
         _c = c;
     }
+    {
+        var writeStream     = fs.createWriteStream('./index.d.ts');
+        var consoleInstance = new console.Console(writeStream)
+
+    }
 }
 
 ///////////////////////////////////////////////////
diff --git a/ns-api/index.d.ts b/ns-api/index.d.ts
new file mode 100644
index 0000000000..db66f109f3
--- /dev/null
+++ b/ns-api/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for ns-api 2.0
+// Project: https://github.com/fvdm/nodejs-ns-api#readme
+// Definitions by: Sander Koenders <https://github.com/Archcry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = nsApi;
+declare function nsApi(conf: nsApi.Configuration): nsApi;
+
+interface nsApi {
+    /**
+     * Vertrektijden - departure times
+     *
+     * @callback callback
+     * @param station {string} - Station ID
+     * @param callback {function} - `function (err, data) {}`
+     * @returns {void}
+     */
+    vertrektijden(station: string, callback: (err: string, data: {}) => void): void;
+
+    /**
+     * Reisadvies - travel advise
+     *
+     * @callback callback
+     * @param params {object} - Parameters
+     * @param callback {function} - `function (err, data) {}`
+     * @returns {void}
+     */
+    reisadvies(params: {}, callback: (err: string, data: {}) => void): void;
+
+    /**
+     * Prijzen - tariffs
+     *
+     * @callback callback
+     * @param params {object} - Parameters
+     * @param callback {function} - `function (err, data) {}`
+     * @returns {void}
+     */
+    prijzen(params: {}, callback: (err: any, data: {}) => void): void;
+
+    /**
+     * List available stations
+     *
+     * @callback callback
+     * @param [treeKey] {string} - Group by this key
+     * @param callback {function} - `function (err, data) {}`
+     */
+    stations(treeKey: string, callback: (err: string, data: {}) => void): void;
+    stations(callback: (err: string, data: {}) => void): void;
+
+    /**
+     * List disruptions
+     *
+     * @callback callback
+     * @param params {object} - Parameters
+     * @param callback {function} - `function (err, data) {}`
+     */
+    storingen(params: {}, callback: (err: string, data: {}) => void): void;
+}
+
+declare namespace nsApi {
+    interface Configuration {
+        username: string;
+        password: string;
+        timeout?: number;
+    }
+}
diff --git a/ns-api/ns-api-tests.ts b/ns-api/ns-api-tests.ts
new file mode 100644
index 0000000000..8a3b8c5bb6
--- /dev/null
+++ b/ns-api/ns-api-tests.ts
@@ -0,0 +1,56 @@
+import * as NsApi from "ns-api";
+
+let ns: NsApi = NsApi({
+    username: "",
+    password: "",
+    timeout: 1500
+});
+
+ns.vertrektijden("", (err: any, data: Object) => {
+    if(err) {
+        console.log(err);
+    } else {
+        console.log(data);
+    }
+});
+
+// Get travel advise
+ns.reisadvies ({}, (err: any, data: Object) => {
+    if(err) {
+        console.log(err);
+    } else {
+        console.log(data);
+    }
+});
+
+ns.prijzen({}, (err: any, data: Object) => {
+    if(err) {
+        console.log(err);
+    } else {
+        console.log(data);
+    }
+});
+
+ns.stations("code", (err: any, data: Object) => {
+    if(err) {
+        console.log(err);
+    } else {
+        console.log(data);
+    }
+});
+
+ns.stations((err: any, data: Object) => {
+    if(err) {
+        console.log(err);
+    } else {
+        console.log(data);
+    }
+});
+
+ns.storingen({}, (err: any, data: Object) => {
+    if(err) {
+        console.log(err);
+    } else {
+        console.log(data);
+    }
+});
\ No newline at end of file
diff --git a/ns-api/tsconfig.json b/ns-api/tsconfig.json
new file mode 100644
index 0000000000..fae5845b2d
--- /dev/null
+++ b/ns-api/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ns-api-tests.ts"
+    ]
+}
diff --git a/ns-api/tslint.json b/ns-api/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/ns-api/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/paymentrequest/index.d.ts b/paymentrequest/index.d.ts
index 50ef94e1e6..5231f53bc3 100644
--- a/paymentrequest/index.d.ts
+++ b/paymentrequest/index.d.ts
@@ -1,26 +1,33 @@
 // Type definitions for PaymentRequest
 // Project: https://www.w3.org/TR/payment-request/
-// Definitions by: Adam Cmiel <https://github.com/adamcmiel>
+// Definitions by: Adam Cmiel <https://github.com/adamcmiel>, Eiji Kitamura <https://github.com/agektmr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface PaymentRequest extends EventTarget {
     new (methodData: PaymentMethodData[], details: PaymentDetails, options?: PaymentOptions): PaymentRequest;
     show(): PromiseLike<PaymentResponse>;
     abort(): PromiseLike<void>;
-    shippingAddress?: PaymentAddress;
-    shippingOption?: string;
+    canMakePayment(): Promise<boolean>;
+    readonly paymentRequestID: string;
+    readonly shippingAddress?: PaymentAddress;
+    readonly shippingOption?: string;
+    readonly shippingType?: string;
     onshippingaddresschange: PaymentUpdateEventListener;
     onshippingoptionchange: PaymentUpdateEventListener;
 }
 
 interface PaymentMethodData {
     supportedMethods: string[];
-    data?: Object;
+    data?: {
+        supportedNetworks: string[];
+        supportedTypes: string[];
+    };
 }
 
 interface PaymentCurrencyAmount {
     currency: string;
     value: string;
+    currencySystem?:string;
 }
 
 interface PaymentDetails {
@@ -28,55 +35,63 @@ interface PaymentDetails {
     displayItems?: PaymentItem[];
     shippingOptions?: PaymentShippingOption[];
     modifiers?: PaymentDetailsModifier[];
+    error?: string;
 }
 
 interface PaymentDetailsModifier {
     supportedMethods: string[];
     total?: PaymentItem;
-    additionalDisplayItems: PaymentItem[];
+    additionalDisplayItems?: PaymentItem[];
+    data?: Object;
 }
 
 interface PaymentOptions {
-    requestShipping: boolean;
-    requestPayerEmail: boolean;
-    requestPayerPhone: boolean;
+    requestShipping?: boolean;
+    requestPayerEmail?: boolean;
+    requestPayerPhone?: boolean;
+    requestPayerName?: boolean;
+    shippingType?: 'shipping' | 'delivery' | 'pickup';
 }
 
 interface PaymentItem {
     label: string;
-    amount: PaymentCurrencyAmount
+    amount: PaymentCurrencyAmount;
+    pending?: boolean;
 }
 
 interface PaymentAddress {
-    country: string;
-    addressLine: string[];
-    region: string;
-    city: string;
-    dependentLocality: string;
-    postalCode: string;
-    sortingCode: string;
-    languageCode: string;
-    organization: string;
-    recipient: string;
-    careOf: string;
-    phone: string;
+    readonly country: string;
+    readonly addressLine: string[];
+    readonly region: string;
+    readonly city: string;
+    readonly dependentLocality: string;
+    readonly postalCode: string;
+    readonly sortingCode: string;
+    readonly languageCode: string;
+    readonly organization: string;
+    readonly recipient: string;
+    readonly phone: string;
 }
 
 interface PaymentShippingOption {
     id: string;
     label: string;
     amount: PaymentCurrencyAmount;
+    selected?: boolean;
 }
 
 interface PaymentResponse {
-    methodName: string;
-    details: Object;
-    shippingAddress?: PaymentAddress;
-    shippingOption?: string;
-    payerEmail?: string;
-    payerPhone?: string;
+    readonly paymentRequestID: string;
+    readonly methodName: string;
+    readonly details: Object;
+    readonly shippingAddress?: PaymentAddress;
+    readonly shippingOption?: string;
+    readonly payerEmail?: string;
+    readonly payerPhone?: string;
+    readonly payerName?: string;
 
     complete(result?: '' | 'success' | 'fail'): PromiseLike<void>;
+    toJSON(): Object;
 }
 
 interface PaymentUpdateEventListener extends EventListener {
diff --git a/paymentrequest/paymentrequest-tests.ts b/paymentrequest/paymentrequest-tests.ts
index 4c36c3ff76..62c2721bfb 100644
--- a/paymentrequest/paymentrequest-tests.ts
+++ b/paymentrequest/paymentrequest-tests.ts
@@ -3,7 +3,7 @@
 /// Code examples derived from
 /// https://developers.google.com/web/fundamentals/discovery-and-monetization/payment-request/
 
-function makeRequest() {
+async function makeRequest() {
     if (!window.PaymentRequest) {
         return Promise.reject(new Error("PaymentRequest not available"))
     }
@@ -31,10 +31,12 @@ function makeRequest() {
         }
     }
 
-    const options = {
+    const options: PaymentOptions = {
         requestShipping: true,
         requestPayerEmail: true,
-        requestPayerPhone: true
+        requestPayerPhone: true,
+        requestPayerName: true,
+        shippingType: 'delivery'
     }
 
     const request = new window.PaymentRequest(methodData, details, options)
@@ -72,7 +74,12 @@ function makeRequest() {
 		})(details, request.shippingAddress));
 	})
 
-    return request.show()
+    let canMakePayment = await request.canMakePayment()
+    if (canMakePayment) {
+        return request.show()
+    } else {
+        throw 'can not make payment on this environment.'
+    }
 }
 
 async function processPayment(): Promise<PaymentResponse> {
diff --git a/paymentrequest/tsconfig.json b/paymentrequest/tsconfig.json
index 221e0618af..e5754a139a 100644
--- a/paymentrequest/tsconfig.json
+++ b/paymentrequest/tsconfig.json
@@ -5,6 +5,7 @@
             "es6",
             "dom"
         ],
+        "target": "es6",
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
diff --git a/pino/index.d.ts b/pino/index.d.ts
index 8e8a09c2f9..a9c4b949e2 100644
--- a/pino/index.d.ts
+++ b/pino/index.d.ts
@@ -12,13 +12,22 @@ declare function P(options: P.LoggerOptions, stream: stream.Writable | stream.Du
 
 declare namespace P {
 
-    function pretty(opts?: {timeTransOnly?: boolean, levelFirst?: boolean, formatter?: (str: string) => void}): stream.Transform;
+    function pretty(opts?: { timeTransOnly?: boolean, levelFirst?: boolean, formatter?: (log: IPinoLog) => string }): stream.Transform;
 
     type Level = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace' | 'silent';
     interface Headers {
         [header: string]: string;
     }
 
+    interface IPinoLog {
+        pid: number
+        hostname: string
+        level: number
+        time: string
+        msg: string
+        v: number
+    }
+
     interface LevelLabelsToValues {
         [level: string]: number;
     }
@@ -50,7 +59,8 @@ declare namespace P {
         extreme?: boolean;
         // enables logging, defaults to true.
         enabled?: boolean;
-        level?: Level;
+        level?: Level | string;
+        levelVal?: number;
     }
 
     interface Pino {
diff --git a/raven-js/index.d.ts b/raven-js/index.d.ts
index 6ecb6a0cdd..7b54ec7372 100644
--- a/raven-js/index.d.ts
+++ b/raven-js/index.d.ts
@@ -1,212 +1,301 @@
 // Type definitions for Raven.js
 // Project: https://github.com/getsentry/raven-js
-// Definitions by: Santi Albo <https://github.com/santialbo/>, Benjamin Pannell <http://github.com/spartan563>, Gary Blackwood <http://github.com/Garee>, Rich Rout <http://github.com/richrout>
+// Definitions by: Santi Albo <https://github.com/santialbo/>, Benjamin Pannell <http://github.com/spartan563>, Gary Blackwood <http://github.com/Garee>, Rich Rout <http://github.com/richrout>, Ben Vinegar <https://github.com/benvinegar>, Ilya Pirogov <https://github.com/ilya-pirogov>, Eli White <https://github.com/TheSavior>, David Cramer <https://github.com/dcramer>, Connor Peet <https://github.com/connor4312>, comaz <https://github.com/combmag>, Luca Vazzano <https://github.com/LucaVazz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var Raven: RavenStatic;
 
-declare module 'raven-js' {
-  export default Raven;
-}
-
-interface RavenOptions {
-    /** The name of the logger used by Sentry. Default: javascript */
-    logger?: string;
-
-    /** The release version of the application you are monitoring with Sentry */
-    release?: string;
-
-    /** The environment in which the application is running. */
-    environment?: string;
-
-    /** The name of the server or device that the client is running on */
-    serverName?: string;
-
-    /** List of messages to be fitlered out before being sent to Sentry. */
-    ignoreErrors?: string[];
-
-    /** Similar to ignoreErrors, but will ignore errors from whole urls patching a regex pattern. */
-    ignoreUrls?: RegExp[];
-
-    /** The inverse of ignoreUrls. Only report errors from whole urls matching a regex pattern. */
-    whitelistUrls?: RegExp[];
-
-    /** An array of regex patterns to indicate which urls are a part of your app. */
-    includePaths?: RegExp[];
-
-    /** Additional data to be tagged onto the error. */
-    tags?: {
-        [id: string]: string;
-    };
-
-    /** A function which allows mutation of the data payload right before being sent to Sentry */
-    dataCallback?: (data: any) => any;
-
-    /** A callback function that allows you to apply your own filters to determine if the message should be sent to Sentry. */
-    shouldSendCallback?: (data: any) => boolean;
-
-    /** By default, Raven does not truncate messages. If you need to truncate characters for whatever reason, you may set this to limit the length. */
-    maxMessageLength?: number;
-
-    /** Enables/disables automatic collection of breadcrumbs. Default: true. */
-    autoBreadcrumbs?: any;
-
-    /** The max number of breadcrumb captures. Default: 100. */
-    maxBreadcrumbs?: number;
-
-    /** Override the default HTTP data transport handler. */
-    transport?: (options: RavenTransportOptions) => void;
-
-    /** Allow the use of a Sentry DSN with a private key. Default: false. */
-    allowSecretKey?: boolean;
-}
-
-interface RavenAdditionalData {
-    /** The name of the logger used by Sentry. Default: javascript */
-    logger?: string;
-
-    /** The log level associated with this event. Default: error */
-    level?: string;
-
-    /** Additional data to be tagged onto the error. */
-    tags?: {
-      [id: string]: string;
-    };
-
-    extra?: any;
-}
+declare let Raven: RavenStatic;
+export default Raven;
 
 interface RavenStatic {
-
     /** Raven.js version. */
     VERSION: string;
 
+    /** A list of currently active plugins. */
     Plugins: { [id: string]: RavenPlugin };
 
-    /*
-     * Allow Raven to be configured as soon as it is loaded
+    /**
+     * Allow Raven to be configured as soon as it is loaded.
      * It uses a global RavenConfig = {dsn: '...', config: {}}
-     *
-     * @return undefined
      */
     afterLoad(): void;
 
-    /*
+    /**
      * Allow multiple versions of Raven to be installed.
      * Strip Raven from the global context and returns the instance.
-     *
-     * @return {Raven}
      */
     noConflict(): RavenStatic;
 
-    /*
+    /**
      * Configure Raven with a DSN and extra options
      *
-     * @param {string} dsn The public Sentry DSN
-     * @param {object} options Optional set of of global options [optional]
-     * @return {Raven}
+     * @param dsn The public Sentry DSN
+     * @param options Optional set of of global options
      */
-    config(dsn: string, options?: RavenOptions): RavenStatic;
+    config(dsn: string, options?: RavenGlobalOptions): RavenStatic;
 
-    /*
-     * Installs a global window.onerror error handler
-     * to capture and report uncaught exceptions.
-     * At this point, install() is required to be called due
-     * to the way TraceKit is set up.
+    /**
+     * Set the DSN (can be called multiple times, unlike config)
      *
-     * @return {Raven}
+     * @param dsn The public Sentry DSN
+     */
+    setDSN(dsn: string): RavenStatic;
+
+    /**
+     * Installs a global window.onerror error handler to capture and report uncaught exceptions.
+     * At this point, install() is required to be called due to the way TraceKit is set up.
      */
     install(): RavenStatic;
 
-    /*
+    /**
      * Adds a plugin to Raven
-     *
-     * @return {Raven}
      */
     addPlugin(plugin: RavenPlugin, ...pluginArgs: any[]): RavenStatic;
 
-    /*
-     * Wrap code within a context so Raven can capture errors
-     * reliably across domains that is executed immediately.
+    /**
+     * Wrap code within a context so Raven can capture errors reliably across domains that is 
+     * executed immediately.
      *
-     * @param {object} options A specific set of options for this context [optional]
-     * @param {function} func The callback to be immediately executed within the context
-     * @param {array} args An array of arguments to be called with the callback [optional]
+     * @param options A specific set of options for this context
+     * @param func The callback to be immediately executed within the context
+     * @param args An array of arguments to be called with the callback
      */
     context(func: Function, ...args: any[]): void;
-    context(options: RavenAdditionalData, func: Function, ...args: any[]): void;
+    context(options: RavenWrapOptions, func: Function, ...args: any[]): void;
 
-    /*
+    /**
      * Wrap code within a context and returns back a new function to be executed
      *
-     * @param {object} options A specific set of options for this context [optional]
-     * @param {function} func The function to be wrapped in a new context
-     * @return {function} The newly wrapped functions with a context
+     * @param options A specific set of options for this context
+     * @param func The function to be wrapped in a new context
+     * @return The newly wrapped functions with a context
      */
     wrap(func: Function): Function;
-    wrap(options: RavenAdditionalData, func: Function): Function;
+    wrap(options: RavenWrapOptions, func: Function): Function;
     wrap<T extends Function>(func: T): T;
-    wrap<T extends Function>(options: RavenAdditionalData, func: T): T;
+    wrap<T extends Function>(options: RavenWrapOptions, func: T): T;
 
-    /*
+    /**
      * Uninstalls the global error handler.
-     *
-     * @return {Raven}
      */
     uninstall(): RavenStatic;
 
-    /*
+    /**
      * Manually capture an exception and send it over to Sentry
      *
-     * @param {error} ex An exception to be logged
-     * @param {object} options A specific set of options for this error [optional]
-     * @return {Raven}
+     * @param ex An exception to be logged
+     * @param options A specific set of options for this error
      */
-    captureException(ex: Error, options?: RavenAdditionalData): RavenStatic;
+    captureException(ex: Error, options?: RavenOptions): RavenStatic;
 
     /*
      * Manually send a message to Sentry
      *
-     * @param {string} msg A plain message to be captured in Sentry
-     * @param {object} options A specific set of options for this message [optional]
-     * @return {Raven}
+     * @param msg A plain message to be captured in Sentry
+     * @param options A specific set of options for this message
      */
-    captureMessage(msg: string, options?: RavenAdditionalData): RavenStatic;
+    captureMessage(msg: string, options?: RavenOptions): RavenStatic;
+
+    /** 
+     * Add a breadcrumb
+     * @param crumb The trail which should be added to the trail
+     */
+    captureBreadcrumb(crumb: RavenBreadcrumb): RavenStatic;
+
+    /**
+     * Set a user to be sent along with payloads.
+     *
+     * @param user The definition of the currently active user's unique identity
+     */
+    setUserContext(user: RavenUserContext): RavenStatic;
 
     /**
      * Clear the user context, removing the user data that would be sent to Sentry.
      */
     setUserContext(): RavenStatic;
 
-    /*
-     * Set a user to be sent along with the payload.
-     *
-     * @param {object} user An object representing user data [optional]
-     * @return {Raven}
+    /** 
+     * Add arbitrary data to be sent along with the payload.
+     * @param extra data of an arbitrary, nested type which will be added
      */
-    setUserContext(user: {
-        id?: string;
-        username?: string;
-        email?: string;
-    }): RavenStatic;
+    setExtraContext(extra: { [prop: string]: any }): RavenStatic;
 
-    /** Override the default HTTP data transport handler. */
-    setTransport(transportFunction: (options: RavenTransportOptions) => void): RavenStatic;
+    /** 
+     * Add additional tags to be sent along with payloads.
+     * @param tags A key/value-pair which will be added
+     */
+    setTagsContext(tags: { [id: string]: string }): RavenStatic;
 
-    /** An event id is a globally unique id for the event that was just sent. This event id can be used to find the exact event from within Sentry. */
+    /** 
+     * Clear the whole currently set context.
+     */
+    clearContext(): RavenStatic;
+
+    /** 
+     * Get a copy of the current context.
+     */
+    getContext(): Object;
+
+    /** 
+     * Set environment of application
+     * @param environment Typically something like 'production'
+     */
+    setEnvironment(environment: string): RavenStatic;
+
+    /**
+     * Set release version of application
+     * @param release Typically something like a git SHA to identify the current version
+     */
+    setRelease(release: string): RavenStatic;
+
+    /**
+     * Specify a function that can mutate the payload right before it is being sent to Sentry.
+     * @param callback The function which can mutate the data
+     */
+    setDataCallback(callback: (data: any, orig?: string) => any): RavenStatic;
+
+    /** 
+     * Specify a callback function that can mutate or filter breadcrumbs when they are captured.
+     * @param callback The function which applies the filter
+     */
+    setBreadcrumbCallback(callback :(data: any, orig?: string) => any): RavenStatic;
+
+    /**
+     * Specify a callback function that determines if the given message should be sent to Sentry.
+     * @param callback The function which determines if the given blob should be sent
+     */
+    setShouldSendCallback(callback: (data: any, orig?: string) => boolean): RavenStatic;
+
+    /**
+     * Override the default HTTP data transport handler.
+     * @param transport The function which will be invoked to handle the data transmission
+     */
+    setTransport(transport: (options: RavenTransportOptions) => void): RavenStatic;
+
+    /**
+     * Get the latest raw exception that was captured by Raven.
+     */
+    lastException(): Error;
+
+    /**
+     * Get the ID of the last Event captured by Raven.
+     */
     lastEventId(): string;
 
-    /** If you need to conditionally check if raven needs to be initialized or not, you can use the isSetup function. It will return true if Raven is already initialized. */
+    /** 
+     * Determine if Raven is setup and ready to go.
+     */
     isSetup(): boolean;
 
-    showReportDialog(options: RavenOptions): void;
-
-    setTagsContext(tags: { [id: string]: string; }): void;
-
-    setExtraContext(context: any): void;
+    /**
+     * Show the User Feedback Dialog of Sentry
+     * @param RavenReportDialogOptions Optional Options to set for the User Feedback
+     */
+    showReportDialog(options?: RavenReportDialogOptions): void;
 }
 
-interface RavenTransportOptions {
+
+// --- Helper Interfaces for Options --------------
+export interface RavenBreadcrumOptions {
+    /** Whether to collect XHR calls, defaults to true */
+    xhr?: boolean;
+
+    /** Whether to collect console logs, defaults to true */
+    console?: boolean;
+
+    /** Whether to collect dom events, defaults to true */
+    dom?: boolean;
+
+    /** Whether to record window location and navigation, defaults to true */
+    location?: boolean;
+}
+
+export interface CommonRavenOptions {
+    /** The environment of the application you are monitoring with Sentry */
+    environment?: string;
+
+    /** The release version of the application you are monitoring with Sentry */
+    release?: string;
+
+    /** Additional key/value-data to be tagged onto the error. */
+    tags?: { [id: string]: string };
+
+    /** Additional, arbitrary metadata to collect */
+    extra?: { [prop: string]: any };
+
+    /** The name of the logger used by Sentry. Default: javascript */
+    logger?: string;
+
+    /** set to true to get the strack trace of your message */
+    stacktrace?: boolean;
+}
+
+export interface RavenOptions extends CommonRavenOptions {
+    /** The name of the server or device that the client is running on */
+    server_name?: string;
+
+    /** The log level associated with this event. Default: error */
+    level?: string;
+
+    /** In some cases you may see issues where Sentry groups multiple events together when they 
+     * should be separate entities. In other cases, Sentry simply doesn’t group events together 
+     * because they’re so sporadic that they never look the same. */
+    fingerprint?: string[];
+
+    /** Number of frames to trim off the stacktrace. Default: 1 */
+    trimHeadFrames?: number;
+
+    /** The name of the device platform. Default: "javascript" */
+    platform?: string;
+}
+
+export interface RavenGlobalOptions extends CommonRavenOptions  {
+    /** The name of the server or device that the client is running on */
+    serverName?: string;
+
+    /** Configures which breadcrumbs are collected automatically */
+    autoBreadcrumbs?: boolean | RavenBreadcrumOptions;
+
+    /** Whether to collect errors on the window via TraceKit.collectWindowErrors. Default: true. */
+    collectWindowErrors?: boolean;
+
+    /** Max number of breadcrumbs to collect. Default: 100 */
+    maxBreadcrumbs?: number;
+
+    /** Exclude messages which match one of the given RegEx-Patterns from being sent to Sentry. */
+    ignoreErrors?: (RegExp | string)[];
+
+    /** Exclude messages which come from whole urls matching one of the given RegEx patterns. */
+    ignoreUrls?: (RegExp | string)[];
+
+    /** Only report messages which come from whole urls matching one of the given RegEx patterns. */
+    whitelistUrls?: (RegExp | string)[];
+
+    /** An array of RegEx patterns to indicate which urls are a part of your app. */
+    includePaths?: (RegExp | string)[];
+
+    /** Maximum amount of stack frames to collect. Default: Infinity */
+    stackTraceLimit?: number;
+
+    /** Override the default HTTP data transport handler. */
+    transport?: (options: RavenTransportOptions) => void;
+
+    /** Limit the maxium length of a message to this number of characters. Default: Infinity */
+    maxMessageLength?: number;
+
+    /** Allows you to apply your own filters to determine if the message should be sent to Sentry. */
+    shouldSendCallback?: (data: any) => boolean;
+
+    /** A function which allows mutation of the data payload right before being sent to Sentry */
+    dataCallback?: (data: any) => any;
+}
+
+export interface RavenWrapOptions extends RavenOptions {
+    /** Whether to run the wrap recursively. Default: false. */
+    deep?: boolean;
+}
+
+export interface RavenTransportOptions {
     url: string;
     data: any;
     auth: {
@@ -218,6 +307,32 @@ interface RavenTransportOptions {
     onFailure: () => void;
 }
 
-interface RavenPlugin {
+export interface RavenReportDialogOptions {
+    eventId?: number,
+    dsn?: string,
+    user?: {
+        name?: string,
+        email?: string
+    }
+}
+
+
+// --- Helper Interfaces for complex Data Structures --------------
+export interface RavenPlugin {
     (raven: RavenStatic, ...args: any[]): RavenStatic;
 }
+
+export interface RavenUserContext {
+    id?: string;
+    username?: string;
+    email?: string;
+    ip_address?: string;
+    extra?: { [prop: string]: any };
+}
+
+export interface RavenBreadcrumb {
+    message: string;
+    data: { [id: string]: string };
+    category: string;
+    level: string; 
+}
diff --git a/raven-js/raven-js-tests.ts b/raven-js/raven-js-tests.ts
index 9608e41322..bbd3285e1e 100644
--- a/raven-js/raven-js-tests.ts
+++ b/raven-js/raven-js-tests.ts
@@ -1,24 +1,24 @@
-
-
 import RavenJS from 'raven-js';
 
 RavenJS.config('https://public@getsentry.com/1').install();
 
-var options: RavenOptions = {
-    logger: 'my-logger',
-    ignoreUrls: [
-        /graph\.facebook\.com/i
-    ],
-    ignoreErrors: [
-        'fb_xd_fragment'
-    ],
-    includePaths: [
-        /https?:\/\/(www\.)?getsentry\.com/,
-        /https?:\/\/d3nslu0hdya83q\.cloudfront\.net/
-    ]
-};
 
-Raven.config('https://public@getsentry.com/1', options).install();
+RavenJS.config(
+    'https://public@getsentry.com/1', 
+    {
+        logger: 'my-logger',
+        ignoreUrls: [
+            /graph\.facebook\.com/i
+        ],
+        ignoreErrors: [
+            'fb_xd_fragment'
+        ],
+        includePaths: [
+            /https?:\/\/(www\.)?getsentry\.com/,
+            /https?:\/\/d3nslu0hdya83q\.cloudfront\.net/
+        ]
+    }
+).install();
 
 var throwsError = () => {
     throw new Error('broken');
@@ -27,28 +27,35 @@ var throwsError = () => {
 try {
     throwsError();
 } catch(e) {
-    Raven.captureException(e);
-    Raven.captureException(e, {tags: { key: "value" }});
+    RavenJS.captureException(e);
+    RavenJS.captureException(e, {tags: { key: "value" }});
 }
 
-Raven.context(throwsError);
-Raven.context({tags: { key: "value" }}, throwsError);
-Raven.context({extra: {planet: {name: 'Earth'}}}, throwsError);
+RavenJS.context(throwsError);
+RavenJS.context({tags: { key: "value" }}, throwsError);
+RavenJS.context({extra: {planet: {name: 'Earth'}}}, throwsError);
 
-setTimeout(Raven.wrap(throwsError), 1000);
-Raven.wrap({logger: "my.module"}, throwsError)();
-Raven.wrap({tags: {git_commit: 'c0deb10c4'}}, throwsError)();
+setTimeout(RavenJS.wrap(throwsError), 1000);
+RavenJS.wrap({logger: "my.module"}, throwsError)();
+RavenJS.wrap({tags: {git_commit: 'c0deb10c4'}}, throwsError)();
 
-Raven.setUserContext({
+RavenJS.setUserContext({
     email: 'matt@example.com',
     id: '123'
 });
 
-Raven.captureMessage('Broken!');
-Raven.captureMessage('Broken!', {tags: { key: "value" }});
+RavenJS.captureMessage('Broken!');
+RavenJS.captureMessage('Broken!', {tags: { key: "value" }});
 
-Raven.showReportDialog(options);
+RavenJS.showReportDialog({
+    eventId: 0815,
+    dsn:'1337asdf',
+    user: {
+        name: 'DefenitelyTyped',
+        email: 'df@ts.ms'
+    }
+});
 
-Raven.setTagsContext({ key: "value" });
+RavenJS.setTagsContext({ key: "value" });
 
-Raven.setExtraContext({ foo: "bar" });
+RavenJS.setExtraContext({ foo: "bar" });
diff --git a/raw-body/index.d.ts b/raw-body/index.d.ts
index 94131c5764..44a9289e6a 100644
--- a/raw-body/index.d.ts
+++ b/raw-body/index.d.ts
@@ -11,24 +11,53 @@ declare namespace getRawBody {
     export type Encoding = string | true;
 
     export interface Options {
-        length?: number;
-        limit?: number;
-        encoding?: Encoding;
+        /**
+         * The length of the stream. If the contents of the stream do not add up to this length, an 400 error code is returned.
+         */
+        length?: number | string | null;
+        /**
+         * The byte limit of the body. This is the number of bytes or any string format supported by `bytes`, for example `1000`, `'500kb'` or `'3mb'`. If the body ends up being larger than this limit, a `413` error code is returned.
+         */
+        limit?: number | string | null;
+        /**
+         * The encoding to use to decode the body into a string. By default, a `Buffer` instance will be returned when no encoding is specified. Most likely, you want `utf-8`, so setting encoding to `true` will decode as `utf-8`. You can use any type of encoding supported by `iconv-lite`.
+         */
+        encoding?: Encoding | null;
     }
 
     export interface RawBodyError extends Error {
+        /**
+         * The limit in bytes.
+         */
         limit?: number;
+        /**
+         * The expected length of the stream.
+         */
         length?: number;
         expected?: number;
+        /**
+         * The received bytes.
+         */
         received?: number;
+        /**
+         * The invalid encoding.
+         */
         encoding?: string;
+        /**
+         * The corresponding status code for the error.
+         */
         status: number;
         statusCode: number;
+        /**
+         * Either `entity.too.large`, `request.aborted`, `request.size.invalid`, `stream.encoding.set`, or `encoding.unsupported`.
+         */
         type: string;
     }
 }
 
-
+/**
+ * Gets the entire buffer of a stream either as a `Buffer` or a string. Validates the stream's length against an expected length and maximum limit. Ideal for parsing request bodies.
+ */
 declare function getRawBody(stream: Readable, callback: (err: getRawBody.RawBodyError, body: Buffer) => void): void;
 declare function getRawBody(stream: Readable, options: (getRawBody.Options & { encoding: getRawBody.Encoding }) | getRawBody.Encoding, callback: (err: getRawBody.RawBodyError, body: string) => void): void;
 declare function getRawBody(stream: Readable, options: getRawBody.Options, callback: (err: getRawBody.RawBodyError, body: Buffer) => void): void;
diff --git a/react-bootstrap/index.d.ts b/react-bootstrap/index.d.ts
index 3e5c69c034..e211264bc7 100644
--- a/react-bootstrap/index.d.ts
+++ b/react-bootstrap/index.d.ts
@@ -606,6 +606,7 @@ declare namespace ReactBootstrap {
         position?: string;
         tabWidth?: any; // TODO: Add more specific type
         unmountOnExit?: boolean;
+        justified?: boolean;
     }
     type Tabs = React.ClassicComponent<TabsProps, {}>;
     var Tabs: React.ClassicComponentClass<TabsProps>;
diff --git a/react-breadcrumbs/index.d.ts b/react-breadcrumbs/index.d.ts
index af35bccaa1..6fecdb7dc2 100644
--- a/react-breadcrumbs/index.d.ts
+++ b/react-breadcrumbs/index.d.ts
@@ -1,14 +1,18 @@
-// Type definitions for react-breadcrumbs 1.3.16
+// Type definitions for react-breadcrumbs 1.3
 // Project: https://github.com/svenanders/react-breadcrumbs
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-///<reference types="react"/>
-///<reference types="react-router"/>
+import * as React from "react";
+import * as ReactRouter from "react-router";
 
-declare namespace ReactBreadcrumbs {
-    interface BreadcrumbsProps extends React.Props<Breadcrumbs> {
+export = Breadcrumbs;
+type Breadcrumbs = React.ComponentClass<Breadcrumbs.Props>;
+declare const Breadcrumbs: Breadcrumbs;
+
+declare namespace Breadcrumbs {
+    interface Props extends React.ClassAttributes<Breadcrumbs> {
         separator?: string | JSX.Element;
         displayMissing?: boolean;
         prettify?: boolean;
@@ -27,13 +31,4 @@ declare namespace ReactBreadcrumbs {
         setDocumentTitle?: boolean;
         params?: any;  // todo make it compatible with params of the ReactRouter.RouteComponentProps<P, R>
     }
-
-    interface Breadcrumbs extends React.ComponentClass<BreadcrumbsProps> {}
-    const Breadcrumbs: Breadcrumbs;
-}
-
-declare module 'react-breadcrumbs' {
-    import Breadcrumbs = ReactBreadcrumbs.Breadcrumbs;
-
-    export = Breadcrumbs;
 }
diff --git a/react-breadcrumbs/tsconfig.json b/react-breadcrumbs/tsconfig.json
index 0092616bce..d1a0ccc542 100644
--- a/react-breadcrumbs/tsconfig.json
+++ b/react-breadcrumbs/tsconfig.json
@@ -10,7 +10,8 @@
         "strictNullChecks": false,
         "baseUrl": "../",
         "paths": {
-            "history": ["history/v2"]
+            "history": ["history/v2"],
+            "react-router": ["react-router/v2"]
         },
         "typeRoots": [
             "../"
diff --git a/react-datepicker/index.d.ts b/react-datepicker/index.d.ts
index 895dcac4ce..ae33a5c24f 100644
--- a/react-datepicker/index.d.ts
+++ b/react-datepicker/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for react-datepicker v0.28.1
+// Type definitions for react-datepicker v0.40.0
 // Project: https://github.com/Hacker0x01/react-datepicker
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>, Andrey Balokha <https://github.com/andrewBalekha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/// <reference types="react"/>
-
 declare module "react-datepicker" {
+    import * as React from "react";
+    import * as moment from "moment";
+
     interface ReactDatePickerProps {
         autoComplete?: string;
         autoFocus?: boolean;
@@ -15,7 +16,7 @@ declare module "react-datepicker" {
         dateFormat?: string;
         dateFormatCalendar?: string;
         disabled?: boolean;
-        endDate?: {};
+        endDate?: moment.Moment;
         excludeDates?: any[];
         filterDate?(): any;
         fixedHeight?: boolean;
@@ -23,12 +24,12 @@ declare module "react-datepicker" {
         includeDates?: any[];
         isClearable?: boolean;
         locale?: string;
-        maxDate?: {};
-        minDate?: {};
+        maxDate?: moment.Moment;
+        minDate?: moment.Moment;
         name?: string;
-        onBlur?(handler: (e: any) => void): any;
-        onChange(handler: (date?: any, e?: any) => void): any;
-        onFocus?(handler: (e: any) => void): any;
+        onBlur?(event: React.FocusEvent<HTMLInputElement>): void;
+        onChange(date: moment.Moment | null, event: React.SyntheticEvent<any> | undefined): any;
+        onFocus?(event: React.FocusEvent<HTMLInputElement>): void;
         peekNextMonth?: boolean;
         placeholderText?: string;
         popoverAttachment?: string;
@@ -38,13 +39,13 @@ declare module "react-datepicker" {
         renderCalendarTo?: any;
         required?: boolean;
         scrollableYearDropdown?: boolean;
-        selected?: {};
+        selected?: moment.Moment | null;
         selectsEnd?: boolean;
         selectsStart?: boolean;
         showMonthDropdown?: boolean;
         showYearDropdown?: boolean;
         showWeekNumbers?: boolean;
-        startDate?: {};
+        startDate?: moment.Moment;
         tabIndex?: number;
         tetherConstraints?: any[];
         title?: string;
diff --git a/react-datepicker/react-datepicker-tests.tsx b/react-datepicker/react-datepicker-tests.tsx
index 53cd4723b5..df1b02dacf 100644
--- a/react-datepicker/react-datepicker-tests.tsx
+++ b/react-datepicker/react-datepicker-tests.tsx
@@ -2,8 +2,8 @@ import * as React from "react";
 import * as moment from 'moment';
 import * as DatePicker from 'react-datepicker';
 
-class ReactDatePicker extends React.Component<{}, {startDate:any,displayName:string}> {
-     constructor(props:any) {
+class ReactDatePicker extends React.Component<{}, { startDate: moment.Moment; displayName:string; }> {
+     constructor(props: {}) {
         super();
         this.state = {
           startDate: moment(),
@@ -12,7 +12,7 @@ class ReactDatePicker extends React.Component<{}, {startDate:any,displayName:str
         this.handleChange = this.handleChange.bind(this);
      }
 
-     handleChange = function(date?:any) {
+     handleChange = function(date?: moment.Moment | null) {
         this.setState({
           startDate: date
         });
diff --git a/react-day-picker/index.d.ts b/react-day-picker/index.d.ts
index 01c5492922..f2993d95c5 100644
--- a/react-day-picker/index.d.ts
+++ b/react-day-picker/index.d.ts
@@ -75,7 +75,7 @@ declare namespace ReactDayPicker {
         toMonth?: Date;
         localeUtils?: LocaleUtils;
         locale?: string;
-        captionElement?: React.ReactElement<CaptionElementProps>;
+        captionElement?: React.ReactElement<CaptionElementProps> | null;
         onDayClick?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
         onDayTouchTap?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
         onDayMouseEnter?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
diff --git a/react-dom/index.d.ts b/react-dom/index.d.ts
index 00520fc6ed..bf0a246211 100644
--- a/react-dom/index.d.ts
+++ b/react-dom/index.d.ts
@@ -28,7 +28,7 @@ declare namespace ReactDOM {
         container: Element | null,
         callback?: (component: T) => any): T;
     function render<P>(
-        element: ReactElement<P>,
+        element: ReactElement<P> | null,
         container: Element | null,
         callback?: (component?: Component<P, ComponentState> | Element) => any): Component<P, ComponentState> | Element | void;
 
@@ -57,7 +57,7 @@ declare namespace ReactDOM {
         callback?: () => any): void;
     function unstable_renderSubtreeIntoContainer<P>(
         parentComponent: Component<any, any>,
-        element: ReactElement<P>,
+        element: ReactElement<P> | null,
         container: Element,
         callback?: (component?: Component<P, ComponentState> | Element) => any): Component<P, ComponentState> | Element | void;
 }
diff --git a/react-i18next/tsconfig.json b/react-i18next/tsconfig.json
index bba519bbd3..c64579c2e8 100644
--- a/react-i18next/tsconfig.json
+++ b/react-i18next/tsconfig.json
@@ -11,7 +11,8 @@
         "baseUrl": "../",
         "paths": {
             "history": ["history/v2"],
-            "history/*": ["history/v2/*"]
+            "history/*": ["history/v2/*"],
+            "react-router": ["react-router/v2"]
         },
         "typeRoots": [
             "../"
diff --git a/react-input-mask/index.d.ts b/react-input-mask/index.d.ts
index 6fc8c6008f..c6acce5858 100644
--- a/react-input-mask/index.d.ts
+++ b/react-input-mask/index.d.ts
@@ -13,7 +13,7 @@ declare namespace reactInputMask {
          * * `9`: `0-9`
          * * `a`: `A-Z, a-z`
          * * `\*`: `A-Z, a-z, 0-9`
-         * 
+         *
          * Any character can be escaped with backslash, which usually will appear as double backslash in JS strings. For example, German phone mask with unremoveable prefix +49 will look like `mask="+4\\9 99 999 99"` or `mask={"+4\\\\9 99 999 99"}`
          */
         mask: string;
diff --git a/react-native-scrollable-tab-view/index.d.ts b/react-native-scrollable-tab-view/index.d.ts
index 2f22f1bcf4..9287ede79d 100644
--- a/react-native-scrollable-tab-view/index.d.ts
+++ b/react-native-scrollable-tab-view/index.d.ts
@@ -37,9 +37,9 @@ export interface renderTabBarProperties {
 interface ScrollableTabViewProperties extends React.Props<ScrollableTabView> {
 
   /**
-   * tabBarPosition (String) Defaults to "top". 
+   * tabBarPosition (String) Defaults to "top".
    * "bottom" to position the tab bar below content.
-   * "overlayTop" or "overlayBottom" for a semitransparent tab bar that overlays content. Custom 
+   * "overlayTop" or "overlayBottom" for a semitransparent tab bar that overlays content. Custom
    * tab bars must consume a style prop on their outer element to support this feature: style={this.props.style}.
    */
   tabBarPosition?: 'top' | 'bottom' | 'overlayTop' | 'overlayBottom';
@@ -50,27 +50,27 @@ interface ScrollableTabViewProperties extends React.Props<ScrollableTabView> {
   initialPage?: number;
 
   /**
-   * (Integer) - set selected tab(can be buggy see 
+   * (Integer) - set selected tab(can be buggy see
    * https://github.com/skv-headless/react-native-scrollable-tab-view/issues/126
    */
   page?: number;
 
   /**
-   * onChangeTab (Function) - function to call when tab changes, should accept 1 argument which is 
-   * an Object containing two keys: i: the index of the tab that is selected, ref: the ref of the 
+   * onChangeTab (Function) - function to call when tab changes, should accept 1 argument which is
+   * an Object containing two keys: i: the index of the tab that is selected, ref: the ref of the
    * tab that is selected
    */
   onChangeTab?: (value: onChangeTabProperties) => void;
 
   /**
-   * onScroll (Function) - function to call when the pages are sliding, 
+   * onScroll (Function) - function to call when the pages are sliding,
    * should accept 1 argument which is an Float number representing the page position in the slide frame.
    */
   onScroll?: (value: number) => void;
 
   /**
    * renderTabBar (Function:ReactComponent) - accept 1 argument props and should return a component
-   * to use as the tab bar. The component has goToPage, tabs, activeTab and ref added to the props, 
+   * to use as the tab bar. The component has goToPage, tabs, activeTab and ref added to the props,
    * and should implement setAnimationValue to be able to animate itself along with the tab content.
    * You can manually pass the props to the TabBar component.
    */
@@ -82,7 +82,7 @@ interface ScrollableTabViewProperties extends React.Props<ScrollableTabView> {
   style?: ViewStyle;
 
   /**
-   * contentProps (Object) - props that are applied to root ScrollView/ViewPagerAndroid. 
+   * contentProps (Object) - props that are applied to root ScrollView/ViewPagerAndroid.
    * Note that overriding defaults set by the library may break functionality; see the source for details.
    */
   contentProps?: React.ScrollViewProperties;
@@ -98,7 +98,7 @@ interface ScrollableTabViewProperties extends React.Props<ScrollableTabView> {
   locked?: boolean;
 
   /**
-   * prerenderingSiblingsNumber (Integer) - pre-render nearby # sibling, Infinity === render all 
+   * prerenderingSiblingsNumber (Integer) - pre-render nearby # sibling, Infinity === render all
    * the siblings, default to 0 === render current page.
    */
   prerenderingSiblingsNumber?: number;
diff --git a/react-native-swiper/react-native-swiper-tests.tsx b/react-native-swiper/react-native-swiper-tests.tsx
index 93cdfcfd18..c8dae8511e 100644
--- a/react-native-swiper/react-native-swiper-tests.tsx
+++ b/react-native-swiper/react-native-swiper-tests.tsx
@@ -18,7 +18,7 @@ class SwiperTest extends React.Component<IProperties, IState> {
     super(props);
   }
 
-  public render(): React.ReactElement<any> {
+  public render(): React.ReactElement<any> | null {
     return (
       <Swiper
         style={styles.wrapper}>
diff --git a/react-router-bootstrap/index.d.ts b/react-router-bootstrap/index.d.ts
index 7cf6ebaafc..99e7a6052a 100644
--- a/react-router-bootstrap/index.d.ts
+++ b/react-router-bootstrap/index.d.ts
@@ -1,44 +1,8 @@
-// Type definitions for react-router-bootstrap
+// Type definitions for react-router-bootstrap 0.23
 // Project: https://github.com/react-bootstrap/react-router-bootstrap
-// Definitions by: Vincent Lesierse <https://github.com/vlesierse>
+// Definitions by: Vincent Lesierse <https://github.com/vlesierse>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/// <reference types="react"/>
-/// <reference types="react-router"/>
-
-declare namespace ReactRouterBootstrap {
-    interface LinkContainerProps extends ReactRouter.LinkProps {
-        disabled?: boolean
-    }
-    interface LinkContainer extends React.ComponentClass<LinkContainerProps> {}
-    interface LinkContainerElement extends React.ReactElement<LinkContainerProps> {}
-    const LinkContainer: LinkContainer
-
-    const IndexLinkContainer: LinkContainer
-}
-
-declare module "react-router-bootstrap/lib/LinkContainer" {
-
-    export default ReactRouterBootstrap.LinkContainer
-
-}
-
-declare module "react-router-bootstrap/lib/IndexLinkContainer" {
-
-    export default ReactRouterBootstrap.IndexLinkContainer
-
-}
-
-declare module "react-router-bootstrap" {
-
-    import LinkContainer from "react-router-bootstrap/lib/LinkContainer"
-    
-    import IndexLinkContainer from "react-router-bootstrap/lib/IndexLinkContainer"
-
-    export {
-        LinkContainer,
-        IndexLinkContainer
-    }
-
-}
+export { default as LinkContainer } from "react-router-bootstrap/lib/LinkContainer"
+export { default as IndexLinkContainer } from "react-router-bootstrap/lib/IndexLinkContainer"
diff --git a/react-router-bootstrap/lib/IndexLinkContainer.d.ts b/react-router-bootstrap/lib/IndexLinkContainer.d.ts
new file mode 100644
index 0000000000..045edc1fde
--- /dev/null
+++ b/react-router-bootstrap/lib/IndexLinkContainer.d.ts
@@ -0,0 +1,7 @@
+import { ComponentClass } from "react";
+import { IndexLinkProps } from "react-router/lib/IndexLink";
+
+type IndexLinkContainer = ComponentClass<IndexLinkProps>;
+declare const IndexLinkContainer: IndexLinkContainer;
+
+export default IndexLinkContainer;
diff --git a/react-router-bootstrap/lib/LinkContainer.d.ts b/react-router-bootstrap/lib/LinkContainer.d.ts
new file mode 100644
index 0000000000..df5ac3cbdb
--- /dev/null
+++ b/react-router-bootstrap/lib/LinkContainer.d.ts
@@ -0,0 +1,7 @@
+import { ComponentClass } from "react";
+import { LinkProps } from "react-router/lib/Link";
+
+type LinkContainer = ComponentClass<LinkProps>;
+declare const LinkContainer: LinkContainer;
+
+export default LinkContainer;
diff --git a/react-router-bootstrap/tsconfig.json b/react-router-bootstrap/tsconfig.json
index 7e111b1004..1760fc3f1a 100644
--- a/react-router-bootstrap/tsconfig.json
+++ b/react-router-bootstrap/tsconfig.json
@@ -10,9 +10,6 @@
         "strictNullChecks": false,
         "jsx": "preserve",
         "baseUrl": "../",
-        "paths": {
-            "history": ["history/v2"]
-        },
         "typeRoots": [
             "../"
         ],
@@ -22,6 +19,8 @@
     },
     "files": [
         "index.d.ts",
+        "lib/IndexLinkContainer.d.ts",
+        "lib/LinkContainer.d.ts",
         "react-router-bootstrap-tests.tsx"
     ]
 }
diff --git a/react-router-redux/index.d.ts b/react-router-redux/index.d.ts
index 62c6137a7a..226b3152e3 100644
--- a/react-router-redux/index.d.ts
+++ b/react-router-redux/index.d.ts
@@ -1,66 +1,60 @@
-// Type definitions for react-router-redux v4.0.0
+// Type definitions for react-router-redux 4.0
 // Project: https://github.com/rackt/react-router-redux
-// Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>
+// Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/// <reference types="react-router"/>
+import { Action, Middleware, Store } from "redux";
+import { History } from "history";
+import { Location, LocationDescriptor } from "react-router";
 
-import * as Redux from "redux";
-import * as History from "history";
+export const CALL_HISTORY_METHOD: string;
+export const LOCATION_CHANGE: string;
 
-export = ReactRouterRedux;
-
-declare namespace ReactRouterRedux {
-    import R = Redux;
-
-    const CALL_HISTORY_METHOD: string;
-    const LOCATION_CHANGE: string;
-
-    const push: PushAction;
-    const replace: ReplaceAction;
-    const go: GoAction;
-    const goBack: GoForwardAction;
-    const goForward: GoBackAction;
-    const routerActions: RouteActions;
-
-    type LocationDescriptor = History.LocationDescriptor;
-    type PushAction = (nextLocation: LocationDescriptor) => RouterAction;
-    type ReplaceAction = (nextLocation: LocationDescriptor) => RouterAction;
-    type GoAction = (n: number) => RouterAction;
-    type GoForwardAction = () => RouterAction;
-    type GoBackAction = () => RouterAction;
-
-    type RouterAction = {
-        type: string
-        payload?: LocationDescriptor
-    }
-
-    interface RouteActions {
-        push: PushAction;
-        replace: ReplaceAction;
-        go: GoAction;
-        goForward: GoForwardAction;
-        goBack: GoBackAction;
-    }
-    interface ReactRouterReduxHistory extends History.History {
-        unsubscribe(): void;
-    }
-
-    interface DefaultSelectLocationState extends Function {
-        (state: any): any;
-    }
-
-    interface SyncHistoryWithStoreOptions {
-        selectLocationState?: DefaultSelectLocationState;
-        adjustUrlOnReplay?: boolean;
-    }
-
-    interface RouterState {
-        locationBeforeTransitions: History.Location
-    }
-
-    function routerReducer(state?: RouterState, action?: R.Action): RouterState;
-    function syncHistoryWithStore(history: History.History, store: R.Store<any>, options?: SyncHistoryWithStoreOptions): ReactRouterReduxHistory;
-    function routerMiddleware(history: History.History): R.Middleware;
+export interface LocationActionPayload {
+    method: string;
+    args?: any[];
 }
+
+export interface RouterAction extends Action {
+    payload?: LocationActionPayload;
+}
+
+type LocationAction = (nextLocation: LocationDescriptor) => RouterAction;
+type GoAction = (n: number) => RouterAction;
+type NavigateAction = () => RouterAction;
+
+export const push: LocationAction;
+export const replace: LocationAction;
+export const go: GoAction;
+export const goBack: NavigateAction;
+export const goForward: NavigateAction;
+
+interface RouteActions {
+    push: typeof push;
+    replace: typeof replace;
+    go: typeof go;
+    goForward: typeof goForward;
+    goBack: typeof goBack;
+}
+
+export const routerActions: RouteActions;
+
+export interface RouterState {
+    locationBeforeTransitions: Location;
+}
+
+export type DefaultSelectLocationState = (state: any) => RouterState;
+
+export interface SyncHistoryWithStoreOptions {
+    selectLocationState?: DefaultSelectLocationState;
+    adjustUrlOnReplay?: boolean;
+}
+
+export interface HistoryUnsubscribe {
+    unsubscribe(): void;
+}
+
+export function routerReducer(state?: RouterState, action?: Action): RouterState;
+export function syncHistoryWithStore(history: History, store: Store<any>, options?: SyncHistoryWithStoreOptions): History & HistoryUnsubscribe;
+export function routerMiddleware(history: History): Middleware;
diff --git a/react-router-redux/react-router-redux-tests.ts b/react-router-redux/react-router-redux-tests.ts
index 1d73706c4e..bcf4eaaed1 100644
--- a/react-router-redux/react-router-redux-tests.ts
+++ b/react-router-redux/react-router-redux-tests.ts
@@ -1,13 +1,21 @@
-/// <reference types="redux" />
-/// <reference types="react-router" />
-
 import { createStore, combineReducers, applyMiddleware } from 'redux';
-import { browserHistory } from 'react-router';
-import { syncHistoryWithStore, routerReducer, routerMiddleware, push, replace, go, goForward, goBack } from 'react-router-redux';
+import { createBrowserHistory } from 'history';
+import {
+    syncHistoryWithStore,
+    routerReducer,
+    routerMiddleware,
+    push,
+    replace,
+    go,
+    goForward,
+    goBack,
+    routerActions
+} from 'react-router-redux';
 
 const reducer = combineReducers({ routing: routerReducer });
 
 // Apply the middleware to the store
+const browserHistory = createBrowserHistory()
 const middleware = routerMiddleware(browserHistory);
 const store = createStore(
     reducer,
@@ -25,3 +33,8 @@ store.dispatch(replace('/foo'));
 store.dispatch(go(1));
 store.dispatch(goForward());
 store.dispatch(goBack());
+store.dispatch(routerActions.push('/foo'));
+store.dispatch(routerActions.replace('/foo'));
+store.dispatch(routerActions.go(1));
+store.dispatch(routerActions.goForward());
+store.dispatch(routerActions.goBack());
diff --git a/react-router-redux/tsconfig.json b/react-router-redux/tsconfig.json
index 66c3e91f9b..0b29093460 100644
--- a/react-router-redux/tsconfig.json
+++ b/react-router-redux/tsconfig.json
@@ -1,8 +1,4 @@
 {
-    "files": [
-        "index.d.ts",
-        "react-router-redux-tests.ts"
-    ],
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
@@ -11,16 +7,17 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
-        "paths": {
-            "history": ["history/v2"]
-        },
         "typeRoots": [
-            "../"
+          "../"
         ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-    }
-}
\ No newline at end of file
+    },
+    "files": [
+        "index.d.ts",
+        "react-router-redux-tests.ts"
+    ]
+}
diff --git a/react-router-redux/tslint.json b/react-router-redux/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/react-router-redux/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/react-router-redux/v3/index.d.ts b/react-router-redux/v3/index.d.ts
index e0b3a62698..105d081f30 100644
--- a/react-router-redux/v3/index.d.ts
+++ b/react-router-redux/v3/index.d.ts
@@ -7,40 +7,38 @@
 import * as Redux from "redux";
 import * as History from "history";
 
-/// <reference types="react-router"/>
 
-declare namespace ReactRouterRedux {
-    const TRANSITION: string;
-    const UPDATE_LOCATION: string;
+export const TRANSITION: string;
+export const UPDATE_LOCATION: string;
 
-    const push: PushAction;
-    const replace: ReplaceAction;
-    const go: GoAction;
-    const goBack: GoForwardAction;
-    const goForward: GoBackAction;
-    const routeActions: RouteActions;
+export const push: PushAction;
+export const replace: ReplaceAction;
+export const go: GoAction;
+export const goBack: GoForwardAction;
+export const goForward: GoBackAction;
+export const routeActions: RouteActions;
 
-    type LocationDescriptor = History.LocationDescriptor;
-    type PushAction = (nextLocation: LocationDescriptor) => void;
-    type ReplaceAction = (nextLocation: LocationDescriptor) => void;
-    type GoAction = (n: number) => void;
-    type GoForwardAction = () => void;
-    type GoBackAction = () => void;
+export type LocationDescriptor = History.LocationDescriptor;
+export type PushAction = (nextLocation: LocationDescriptor) => void;
+export type ReplaceAction = (nextLocation: LocationDescriptor) => void;
+export type GoAction = (n: number) => void;
+export type GoForwardAction = () => void;
+export type GoBackAction = () => void;
 
-    interface RouteActions {
-        push: PushAction;
-        replace: ReplaceAction;
-        go: GoAction;
-        goForward: GoForwardAction;
-        goBack: GoBackAction;
-    }
-    interface HistoryMiddleware extends Redux.Middleware {
-        listenForReplays(store: Redux.Store<any>, selectLocationState?: Function): void;
-        unsubscribe(): void;
-    }
-
-    function routeReducer(state?: any, options?: any): Redux.Reducer<any>;
-    function syncHistory(history: History.History): HistoryMiddleware;
+export interface RouteActions {
+    push: PushAction;
+    replace: ReplaceAction;
+    go: GoAction;
+    goForward: GoForwardAction;
+    goBack: GoBackAction;
 }
 
-export = ReactRouterRedux;
+export interface HistoryMiddleware extends Redux.Middleware {
+    listenForReplays(store: Redux.Store<any>, selectLocationState?: Function): void;
+    unsubscribe(): void;
+}
+
+export function routeReducer(state?: any, options?: any): Redux.Reducer<any>;
+export function syncHistory(history: History.History): HistoryMiddleware;
+
+
diff --git a/react-router-redux/v3/react-router-redux-tests.ts b/react-router-redux/v3/react-router-redux-tests.ts
index b92af315b2..90d68841ff 100644
--- a/react-router-redux/v3/react-router-redux-tests.ts
+++ b/react-router-redux/v3/react-router-redux-tests.ts
@@ -1,16 +1,11 @@
-
-/// <reference types="redux" />
-/// <reference types="react-router" />
-
-
-
 import { createStore, combineReducers, applyMiddleware } from 'redux';
-import { browserHistory } from 'react-router';
+import { createBrowserHistory } from 'history';
 import { syncHistory, routeReducer } from 'react-router-redux';
 
 const reducer = combineReducers({ routing: routeReducer });
 
 // Sync dispatched route actions to the history
+const browserHistory = createBrowserHistory()
 const reduxRouterMiddleware = syncHistory(browserHistory);
 const createStoreWithMiddleware = applyMiddleware(reduxRouterMiddleware)(createStore);
 
diff --git a/react-router-redux/v3/tslint.json b/react-router-redux/v3/tslint.json
new file mode 100644
index 0000000000..5e200e7d9b
--- /dev/null
+++ b/react-router-redux/v3/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../tslint.json",
+  "rules": {
+    "forbidden-types": false,
+    "no-empty-interface": false
+  }
+}
diff --git a/react-router/index.d.ts b/react-router/index.d.ts
index b1a577c617..da1f23c87e 100644
--- a/react-router/index.d.ts
+++ b/react-router/index.d.ts
@@ -1,92 +1,70 @@
-// Type definitions for react-router 2.0
+// Type definitions for react-router 3.0
 // Project: https://github.com/rackt/react-router
-// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>, Nathan Brown <https://github.com/ngbrown>, Alex Wendland <https://github.com/awendland>, Kostya Esmukov <https://github.com/KostyaEsmukov>
+// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>, Nathan Brown <https://github.com/ngbrown>, Alex Wendland <https://github.com/awendland>, Kostya Esmukov <https://github.com/KostyaEsmukov>, John Reilly <https://github.com/johnnyreilly>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/// <reference types="history" />
+/* Replacement from old history definitions */
+export interface HistoryOptions {
+    getCurrentLocation?(): Location;
+    getUserConfirmation?(message: string, callback: (result: boolean) => void): void;
+    pushLocation?(nextLocation: Location): void;
+    replaceLocation?(nextLocation: Location): void;
+    go?(n: number): void;
+    keyLength?: number;
+}
 
-export as namespace ReactRouter;
-
-import * as React from 'react';
-
-export const routerShape: React.Requireable<any>;
-
-export const locationShape: React.Requireable<any>;
-
-import Router from "./lib/Router";
-import Link from "./lib/Link";
-import IndexLink from "./lib/IndexLink";
-import IndexRedirect from "./lib/IndexRedirect";
-import IndexRoute from "./lib/IndexRoute";
-import Redirect from "./lib/Redirect";
-import Route from "./lib/Route";
-import * as History from "./lib/routerHistory";
-import Lifecycle from "./lib/Lifecycle";
-import RouteContext from "./lib/RouteContext";
-import browserHistory from "./lib/browserHistory";
-import hashHistory from "./lib/hashHistory";
-import useRoutes from "./lib/useRoutes";
-import { createRoutes } from "./lib/RouteUtils";
-import { formatPattern } from "./lib/PatternUtils";
-import RouterContext from "./lib/RouterContext";
-import PropTypes from "./lib/PropTypes";
-import match from "./lib/match";
-import useRouterHistory from "./lib/useRouterHistory";
-import createMemoryHistory from "./lib/createMemoryHistory";
-import withRouter from "./lib/withRouter";
-import applyRouterMiddleware from "./lib/applyRouterMiddleware";
-
-// PlainRoute is defined in the API documented at:
-// https://github.com/rackt/react-router/blob/master/docs/API.md
-// but not included in any of the .../lib modules above.
-export type PlainRoute = Router.PlainRoute;
-
-// The following definitions are also very useful to export
-// because by using these types lots of potential type errors
-// can be exposed:
-export type EnterHook = Router.EnterHook;
-export type LeaveHook = Router.LeaveHook;
-export type ParseQueryString = Router.ParseQueryString;
-export type LocationDescriptor = Router.LocationDescriptor;
-export type RedirectFunction = Router.RedirectFunction;
-export type RouteComponent = Router.RouteComponent;
-export type RouteComponentProps<P, R> = Router.RouteComponentProps<P, R>;
-export type RouteConfig = Router.RouteConfig;
-export type RouteHook = Router.RouteHook;
-export type StringifyQuery = Router.StringifyQuery;
-export type RouterListener = Router.RouterListener;
-export type RouterState = Router.RouterState;
-export type InjectedRouter = Router.InjectedRouter;
-
-export type HistoryBase = History.HistoryBase;
-export type RouterOnContext = Router.RouterOnContext;
-export type RouteProps = Route.RouteProps;
-export type LinkProps = Link.LinkProps;
+export type CreateHistory<T> = (options?: HistoryOptions) => T;
+export type CreateHistoryEnhancer<T> = (createHistory: CreateHistory<T>) => CreateHistory<T>;
 
 export {
-    Router,
-    Link,
-    IndexLink,
-    IndexRedirect,
-    IndexRoute,
-    Redirect,
-    Route,
-    History,
-    browserHistory,
-    hashHistory,
-    Lifecycle,
-    RouteContext,
-    useRoutes,
-    createRoutes,
-    formatPattern,
-    RouterContext,
-    PropTypes,
-    match,
-    useRouterHistory,
-    createMemoryHistory,
-    withRouter,
-    applyRouterMiddleware
-};
+    Basename,
+    ChangeHook,
+    EnterHook,
+    InjectedRouter,
+    LeaveHook,
+    Location,
+    LocationDescriptor,
+    ParseQueryString,
+    RouteComponent,
+    RouteComponents,
+    RouteComponentProps,
+    RouteConfig,
+    RoutePattern,
+    RouterProps,
+    RouterState,
+    StringifyQuery,
+    Query
+} from "react-router/lib/Router";
+export { LinkProps } from "react-router/lib/Link";
+export { IndexLinkProps } from "react-router/lib/IndexLink";
+export { RouteProps, PlainRoute } from "react-router/lib/Route";
+export { IndexRouteProps } from "react-router/lib/IndexRoute";
+export { RedirectProps } from "react-router/lib/Redirect";
+export { IndexRedirectProps } from "react-router/lib/IndexRedirect";
 
-export default Router;
+/* components */
+export { default as Router } from "react-router/lib/Router";
+export { default as Link } from "react-router/lib/Link";
+export { default as IndexLink } from "react-router/lib/IndexLink";
+export { default as withRouter } from "react-router/lib/withRouter";
+
+/* components (configuration) */
+export { default as IndexRedirect } from "react-router/lib/IndexRedirect";
+export { default as IndexRoute } from "react-router/lib/IndexRoute";
+export { default as Redirect } from "react-router/lib/Redirect";
+export { default as Route } from "react-router/lib/Route";
+
+/* utils */
+export { createRoutes } from "react-router/lib/RouteUtils";
+export { default as RouterContext } from "react-router/lib/RouterContext";
+export { routerShape, locationShape } from "react-router/lib/PropTypes";
+export { default as match } from "react-router/lib/match";
+export { default as useRouterHistory } from "react-router/lib/useRouterHistory";
+export { formatPattern } from "react-router/lib/PatternUtils";
+export { default as applyRouterMiddleware } from "react-router/lib/applyRouterMiddleware";
+
+/* histories */
+export { default as browserHistory } from "react-router/lib/browserHistory";
+export { default as hashHistory } from "react-router/lib/hashHistory";
+export { default as createMemoryHistory } from "react-router/lib/createMemoryHistory";
diff --git a/react-router/lib/IndexLink.d.ts b/react-router/lib/IndexLink.d.ts
index 56ecf82c1d..0c62010262 100644
--- a/react-router/lib/IndexLink.d.ts
+++ b/react-router/lib/IndexLink.d.ts
@@ -1,5 +1,15 @@
-import Link from './Link';
+import { ComponentClass, CSSProperties, HTMLProps } from "react";
+import { Location, LocationDescriptor } from "react-router/lib/Router";
+
+type ToLocationFunction = (location: Location) => LocationDescriptor;
+
+export interface IndexLinkProps extends HTMLProps<any> {
+    to: LocationDescriptor | ToLocationFunction;
+    activeClassName?: string;
+    activeStyle?: CSSProperties;
+}
+
+type IndexLink = ComponentClass<IndexLinkProps>;
+declare const IndexLink: IndexLink;
 
-declare const IndexLink: Link;
 export default IndexLink;
-
diff --git a/react-router/lib/IndexRedirect.d.ts b/react-router/lib/IndexRedirect.d.ts
index 41dab299c8..3b8187d09b 100644
--- a/react-router/lib/IndexRedirect.d.ts
+++ b/react-router/lib/IndexRedirect.d.ts
@@ -1,17 +1,12 @@
-import Router from './Router';
-import * as React from 'react';
-import * as H from 'history';
+import { ComponentClass, ClassAttributes } from "react";
+import { RoutePattern, Query } from "react-router";
 
-declare const self: self.IndexRedirect;
-type self = self.IndexRedirect;
-export default self;
-
-declare namespace self {
-	interface IndexRedirectProps extends React.Props<self> {
-	    to: Router.RoutePattern;
-	    query?: H.Query;
-	    state?: H.LocationState;
-	}
-	interface IndexRedirectElement extends React.ReactElement<IndexRedirectProps> { }
-	interface IndexRedirect extends React.ComponentClass<self.IndexRedirectProps> { }
+export interface IndexRedirectProps extends ClassAttributes<any> {
+	to: RoutePattern;
+	query?: Query;
 }
+
+type IndexRedirect = ComponentClass<IndexRedirectProps>;
+declare const IndexRedirect: IndexRedirect;
+
+export default IndexRedirect;
diff --git a/react-router/lib/IndexRoute.d.ts b/react-router/lib/IndexRoute.d.ts
index b11b16d0e2..b0574df26a 100644
--- a/react-router/lib/IndexRoute.d.ts
+++ b/react-router/lib/IndexRoute.d.ts
@@ -1,20 +1,28 @@
-import * as React from 'react';
-import Router from './Router';
-import * as H from 'history';
+import { ComponentClass, ClassAttributes } from "react";
+import { LocationState } from "history";
+import {
+    EnterHook,
+    ChangeHook,
+    LeaveHook,
+    RouteComponent,
+    RouteComponents,
+    RouterState
+} from "react-router";
 
-declare const self: self.IndexRoute;
-type self = self.IndexRoute;
-export default self;
+type ComponentCallback = (err: any, component: RouteComponent) => void;
+type ComponentsCallback = (err: any, components: RouteComponents) => void;
 
-declare namespace self {
-    interface IndexRouteProps extends React.Props<IndexRoute> {
-        component?: Router.RouteComponent;
-        components?: Router.RouteComponents;
-        getComponent?: (location: H.Location, cb: (error: any, component?: Router.RouteComponent) => void) => void;
-        getComponents?: (location: H.Location, cb: (error: any, components?: Router.RouteComponents) => void) => void;
-        onEnter?: Router.EnterHook;
-        onLeave?: Router.LeaveHook;
-    }
-    interface IndexRoute extends React.ComponentClass<IndexRouteProps> { }
-    interface IndexRouteElement extends React.ReactElement<IndexRouteProps> { }
-}
\ No newline at end of file
+export interface IndexRouteProps {
+    component?: RouteComponent;
+    components?: RouteComponents;
+    getComponent?(nextState: RouterState, callback: ComponentCallback): void;
+    getComponents?(nextState: RouterState, callback: ComponentsCallback): void;
+    onEnter?: EnterHook;
+    onChange?: ChangeHook;
+    onLeave?: LeaveHook;
+}
+
+type IndexRoute = ComponentClass<IndexRouteProps>;
+declare const IndexRoute: IndexRoute;
+
+export default IndexRoute;
diff --git a/react-router/lib/Link.d.ts b/react-router/lib/Link.d.ts
index d90578b9f9..eca6e66abd 100644
--- a/react-router/lib/Link.d.ts
+++ b/react-router/lib/Link.d.ts
@@ -1,19 +1,11 @@
-import * as React from 'react';
-import Router from './Router';
+import { ComponentClass, CSSProperties, HTMLProps } from "react";
+import { IndexLinkProps } from "react-router/lib/IndexLink";
 
+export interface LinkProps extends IndexLinkProps {
+    onlyActiveOnIndex?: boolean;
+}
+
+type Link = ComponentClass<LinkProps>;
 declare const Link: Link;
-type Link = Link.Link;
 
 export default Link;
-
-declare namespace Link {
-    interface LinkProps extends React.HTMLAttributes<Link> {
-        activeStyle?: React.CSSProperties;
-        activeClassName?: string;
-        onlyActiveOnIndex?: boolean;
-        to: Router.RoutePattern | Router.LocationDescriptor | ((...args: any[]) => Router.LocationDescriptor);
-    }
-
-    interface Link extends React.ComponentClass<LinkProps> {}
-    interface LinkElement extends React.ReactElement<LinkProps> {}
-}
diff --git a/react-router/lib/PatternUtils.d.ts b/react-router/lib/PatternUtils.d.ts
index 50e90f6e49..2c32b2a286 100644
--- a/react-router/lib/PatternUtils.d.ts
+++ b/react-router/lib/PatternUtils.d.ts
@@ -1 +1,3 @@
-export function formatPattern(pattern: string, params: {}): string;
+import { RoutePattern } from "react-router";
+
+export function formatPattern(pattern: RoutePattern, params: any): string;
diff --git a/react-router/lib/PropTypes.d.ts b/react-router/lib/PropTypes.d.ts
index bbd6431070..c9140777cb 100644
--- a/react-router/lib/PropTypes.d.ts
+++ b/react-router/lib/PropTypes.d.ts
@@ -1,19 +1,22 @@
-import * as React from 'react';
+import { Requireable, Validator } from "react";
 
-export function falsy(props: any, propName: string, componentName: string): Error;
-export const history: React.Requireable<any>;
-export const location: React.Requireable<any>;
-export const component: React.Requireable<any>;
-export const components: React.Requireable<any>;
-export const route: React.Requireable<any>;
-export const routes: React.Requireable<any>;
+export interface RouterShape extends Validator<any> {
+    push: Requireable<any>;
+    replace: Requireable<any>;
+    go: Requireable<any>;
+    goBack: Requireable<any>;
+    goForward: Requireable<any>;
+    setRouteLeaveHook: Requireable<any>;
+    isActive: Requireable<any>;
+}
 
-export default {
-    falsy,
-    history,
-    location,
-    component,
-    components,
-    route
-};
+export interface LocationShape extends Validator<any> {
+    pathname: Requireable<any>;
+    search: Requireable<any>;
+    state: any;
+    action: Requireable<any>;
+    key: any;
+}
 
+export const routerShape: RouterShape;
+export const locationShape: LocationShape;
diff --git a/react-router/lib/Redirect.d.ts b/react-router/lib/Redirect.d.ts
index e09b576d53..bb8254b4f5 100644
--- a/react-router/lib/Redirect.d.ts
+++ b/react-router/lib/Redirect.d.ts
@@ -1,19 +1,12 @@
-import * as React from 'react';
-import Router from './Router';
-import * as H from 'history';
+import { ComponentClass, ClassAttributes } from "react";
+import { RoutePattern, Query } from "react-router";
+import { IndexRedirectProps } from "react-router/lib/IndexRedirect";
 
-declare const self: self.Redirect;
-type self = typeof self;
-export default self;
-
-declare namespace self {
-    interface RedirectProps extends React.Props<Redirect> {
-        path?: Router.RoutePattern;
-        from?: Router.RoutePattern; // alias for path
-        to: Router.RoutePattern;
-        query?: H.Query;
-        state?: H.LocationState;
-    }
-    interface Redirect extends React.ComponentClass<RedirectProps> { }
-    interface RedirectElement extends React.ReactElement<RedirectProps> { }
+export interface RedirectProps extends IndexRedirectProps {
+    from: RoutePattern;
 }
+
+type Redirect = ComponentClass<RedirectProps>;
+declare const Redirect: Redirect;
+
+export default Redirect;
diff --git a/react-router/lib/Route.d.ts b/react-router/lib/Route.d.ts
index cf1e6a7fc4..15aafebc75 100644
--- a/react-router/lib/Route.d.ts
+++ b/react-router/lib/Route.d.ts
@@ -1,25 +1,31 @@
-import * as React from 'react';
-import Router from './Router';
-import { Location } from 'history';
+import { ComponentClass, ClassAttributes } from "react";
+import { LocationState } from "history";
+import {
+    EnterHook,
+    ChangeHook,
+    LeaveHook,
+    RouteComponent,
+    RouteComponents,
+    RoutePattern,
+    RouterState
+} from "react-router";
+import { IndexRouteProps } from "react-router/lib/IndexRoute";
 
-declare const self: self.Route;
-type self = self.Route;
-export default self;
+export interface RouteProps extends IndexRouteProps {
+    path?: RoutePattern;
+}
 
-declare namespace self {
+type Route = ComponentClass<RouteProps>;
+declare const Route: Route;
 
-    interface RouteProps extends React.Props<Route> {
-        path?: Router.RoutePattern;
-        component?: Router.RouteComponent;
-        components?: Router.RouteComponents;
-        getComponent?: (nextState: Router.RouterState, cb: (error: any, component?: Router.RouteComponent) => void) => void;
-        getComponents?: (nextState: Router.RouterState, cb: (error: any, components?: Router.RouteComponents) => void) => void;
-        onEnter?: Router.EnterHook;
-        onLeave?: Router.LeaveHook;
-        onChange?: Router.ChangeHook;
-        getIndexRoute?: (location: Location, cb: (error: any, indexRoute: Router.RouteConfig) => void) => void;
-        getChildRoutes?: (location: Location, cb: (error: any, childRoutes: Router.RouteConfig) => void) => void;
-    }
-    interface Route extends React.ComponentClass<RouteProps> {}
-    interface RouteElement extends React.ReactElement<RouteProps> {}
-}
\ No newline at end of file
+export default Route;
+
+type RouteCallback = (err: any, route: PlainRoute) => void;
+type RoutesCallback = (err: any, routesArray: PlainRoute[]) => void;
+
+export interface PlainRoute extends RouteProps {
+    childRoutes?: PlainRoute[];
+    getChildRoutes?(partialNextState: LocationState, callback: RoutesCallback): void;
+    indexRoute?: PlainRoute;
+    getIndexRoute?(partialNextState: LocationState, callback: RouteCallback): void;
+}
diff --git a/react-router/lib/RouteUtils.d.ts b/react-router/lib/RouteUtils.d.ts
index 7065056ff5..6304f5d7bf 100644
--- a/react-router/lib/RouteUtils.d.ts
+++ b/react-router/lib/RouteUtils.d.ts
@@ -1,8 +1,3 @@
-import * as React from 'react';
-import Router from './Router';
+import { RouteConfig, PlainRoute } from "react-router";
 
-type E = React.ReactElement<any>;
-export function isReactChildren(object: E | E[]): boolean;
-export function createRouteFromReactElement(element: E): Router.PlainRoute;
-export function createRoutesFromReactChildren(children: E | E[], parentRoute: Router.PlainRoute): Router.PlainRoute[];
-export function createRoutes(routes: Router.RouteConfig): Router.PlainRoute[];
+export function createRoutes(routes: RouteConfig): PlainRoute[];
diff --git a/react-router/lib/Router.d.ts b/react-router/lib/Router.d.ts
index a7dff58369..dbd2d43fff 100644
--- a/react-router/lib/Router.d.ts
+++ b/react-router/lib/Router.d.ts
@@ -1,116 +1,108 @@
-import * as React from 'react';
-import RouterContext from './RouterContext';
+import { Component, ComponentClass, ClassAttributes, ReactNode, StatelessComponent } from "react";
 import {
-    QueryString, Query,
-    Location, LocationDescriptor, LocationState as HLocationState,
-    History, Href,
-    Pathname, Path } from 'history';
+    Action,
+    Hash,
+    History,
+    Href,
+    LocationKey,
+    LocationState,
+    Path,
+    Pathname,
+    Search
+} from "history";
+import { PlainRoute } from "react-router";
 
+/* Replacement from old history definitions */
+export type Basename = string;
+export type Query = any;
+export interface Params {
+    [key: string]: string;
+}
+
+export type RoutePattern = string;
+export type RouteComponent = ComponentClass<any> | StatelessComponent<any>;
+export interface RouteComponents {
+    [name: string]: RouteComponent;
+}
+export type RouteConfig = ReactNode | PlainRoute | PlainRoute[];
+
+export type ParseQueryString = (queryString: Search) => Query;
+export type StringifyQuery = (queryObject: Query) => Search;
+
+type AnyFunction = (...args: any[]) => any;
+
+export type EnterHook = (nextState: RouterState, replace: RedirectFunction, callback?: AnyFunction) => any;
+export type LeaveHook = (prevState: RouterState) => any;
+export type ChangeHook = (prevState: RouterState, nextState: RouterState, replace: RedirectFunction, callback?: AnyFunction) => any;
+export type RouteHook = (nextLocation?: Location) => any;
+
+export interface Location {
+    patname: Pathname;
+    search: Search;
+    query: Query;
+    state: LocationState;
+    action: Action;
+    key: LocationKey;
+}
+
+export interface LocationDescriptorObject {
+    pathname?: Pathname;
+    query?: Query;
+    hash?: Hash;
+    state?: LocationState;
+}
+
+export type LocationDescriptor = Path | LocationDescriptorObject;
+
+export interface RedirectFunction {
+    (location: LocationDescriptor): void;
+    (state: LocationState, pathname: Pathname | Path, query?: Query): void;
+}
+
+export interface RouterState {
+    location: Location;
+    routes: PlainRoute[];
+    params: Params;
+    components: RouteComponent[];
+}
+
+type LocationFunction = (location: LocationDescriptor) => void;
+type GoFunction = (n: number) => void;
+type NavigateFunction = () => void;
+type ActiveFunction = (location: LocationDescriptor, indexOnly?: boolean) => boolean;
+type LeaveHookFunction = (route: any, callback: RouteHook) => void;
+type CreatePartFunction<Part> = (path: Path, query?: any) => Part;
+
+export interface InjectedRouter {
+    push: LocationFunction;
+    replace: LocationFunction;
+    go: GoFunction;
+    goBack: NavigateFunction;
+    goForward: NavigateFunction;
+    setRouteLeaveHook: LeaveHookFunction;
+    createPath: CreatePartFunction<Path>;
+    createHref: CreatePartFunction<Href>;
+    isActive: ActiveFunction;
+}
+
+export interface RouteComponentProps<P, R> {
+    location?: Location;
+    params?: P & R;
+    route?: PlainRoute;
+    router?: InjectedRouter;
+    routeParams?: R;
+}
+
+export interface RouterProps extends ClassAttributes<any> {
+    routes?: RouteConfig;
+    history?: History;
+    createElement?(component: RouteComponent, props: any): any;
+    onError?(error: any): any;
+    onUpdate?(): any;
+    render?(props: any): ReactNode;
+}
+
+type Router = ComponentClass<RouterProps>;
 declare const Router: Router;
-interface Router extends React.ComponentClass<Router.RouterProps> { }
 
 export default Router;
-
-// types based on https://github.com/rackt/react-router/blob/master/docs/Glossary.md
-
-declare namespace Router {
-    type RouteConfig = React.ReactNode | PlainRoute | PlainRoute[];
-    type RoutePattern = string;
-    interface RouteComponents { [key: string]: RouteComponent; }
-
-    type ParseQueryString = (queryString: QueryString) => Query;
-    type StringifyQuery = (queryObject: Query) => QueryString;
-
-    type Component = React.ReactType;
-    type RouteComponent = Component;
-
-    type EnterHook = (nextState: RouterState, replace: RedirectFunction, callback?: Function) => void;
-    type LeaveHook = () => void;
-    type ChangeHook = (prevState: RouterState, nextState: RouterState, replace: RedirectFunction, callback: Function) => void;
-    type RouteHook = (nextLocation?: Location) => any;
-
-    interface Params { [param: string]: string; }
-
-    type RouterListener = (error: Error, nextState: RouterState) => void;
-
-    interface LocationDescriptor {
-        pathname?: Pathname;
-        query?: Query;
-        hash?: Href;
-        state?: HLocationState;
-    }
-
-    interface RedirectFunction {
-        (location: LocationDescriptor): void;
-        /**
-        * @deprecated `replaceState(state, pathname, query) is deprecated; Use `replace(location)` with a location descriptor instead. http://tiny.cc/router-isActivedeprecated
-        */
-        (state: HLocationState, pathname: Pathname | Path, query?: Query): void;
-    }
-
-    interface RouterState {
-        location: Location;
-        routes: PlainRoute[];
-        params: Params;
-        components: RouteComponent[];
-    }
-
-    interface RouterProps extends React.Props<Router> {
-        history?: History;
-        routes?: RouteConfig; // alias for children
-        createElement?: (component: RouteComponent, props: Object) => any;
-        onError?: (error: any) => any;
-        onUpdate?: () => any;
-        parseQueryString?: ParseQueryString;
-        stringifyQuery?: StringifyQuery;
-        basename?: string;
-        render?: (renderProps: React.Props<{}>) => RouterContext;
-    }
-
-    interface PlainRoute {
-        path?: RoutePattern;
-        component?: RouteComponent;
-        components?: RouteComponents;
-        getComponent?: (location: Location, cb: (error: any, component?: RouteComponent) => void) => void;
-        getComponents?: (location: Location, cb: (error: any, components?: RouteComponents) => void) => void;
-        onEnter?: EnterHook;
-        onLeave?: LeaveHook;
-        indexRoute?: PlainRoute;
-        getIndexRoute?: (location: Location, cb: (error: any, indexRoute: RouteConfig) => void) => void;
-        childRoutes?: PlainRoute[];
-        getChildRoutes?: (location: Location, cb: (error: any, childRoutes: RouteConfig) => void) => void;
-    }
-
-    interface RouteComponentProps<P, R> {
-        history?: History;
-        location?: Location;
-        params?: P;
-        route?: PlainRoute;
-        routeParams?: R;
-        routes?: PlainRoute[];
-        children?: React.ReactElement<any>;
-    }
-
-    interface RouterOnContext extends History {
-        setRouteLeaveHook(route: PlainRoute, hook?: RouteHook): () => void;
-        isActive(pathOrLoc: Path | LocationDescriptor, indexOnly?: boolean): boolean;
-    }
-
-    // Wrap a component using withRouter(Component) to provide a router object
-    // to the Component's props, allowing the Component to programmatically call
-    // push and other functions.
-    //
-    // https://github.com/reactjs/react-router/blob/v2.4.0/upgrade-guides/v2.4.0.md
-
-    interface InjectedRouter {
-        push: (pathOrLoc: Path | LocationDescriptor) => void;
-        replace: (pathOrLoc: Path | LocationDescriptor) => void;
-        go: (n: number) => void;
-        goBack: () => void;
-        goForward: () => void;
-        setRouteLeaveHook(route: PlainRoute, callback: RouteHook): void;
-        createPath(path: History.Path, query?: History.Query): History.Path;
-        createHref(path: History.Path, query?: History.Query): History.Href;
-        isActive: (pathOrLoc: Path | LocationDescriptor, indexOnly?: boolean) => boolean;
-    }
-}
diff --git a/react-router/lib/RouterContext.d.ts b/react-router/lib/RouterContext.d.ts
index b6eab5831c..b04e6e01ae 100644
--- a/react-router/lib/RouterContext.d.ts
+++ b/react-router/lib/RouterContext.d.ts
@@ -1,25 +1,6 @@
-import * as React from 'react';
-import * as H from 'history';
-import Router from './Router';
+import { ComponentClass } from "react";
 
-declare const self: self.RouterContext;
-type self = self.RouterContext;
-export default self;
+type RouterContext = ComponentClass<any>;
+declare const RouterContext: RouterContext;
 
-declare namespace self {
-    interface RouterContextProps extends React.Props<RouterContext> {
-        history?: H.History;
-        router: Router;
-        createElement: (component: Router.RouteComponent, props: Object) => any;
-        location: H.Location;
-        routes: Router.RouteConfig;
-        params: Router.Params;
-        components?: Router.RouteComponent[];
-    }
-    interface RouterContext extends React.ComponentClass<RouterContextProps> {}
-    interface RouterContextElement extends React.ReactElement<RouterContextProps> {
-        history?: H.History;
-        location: H.Location;
-        router?: Router;
-    }
-}
\ No newline at end of file
+export default RouterContext;
diff --git a/react-router/lib/applyRouterMiddleware.d.ts b/react-router/lib/applyRouterMiddleware.d.ts
index ed87d815db..e4d023a792 100644
--- a/react-router/lib/applyRouterMiddleware.d.ts
+++ b/react-router/lib/applyRouterMiddleware.d.ts
@@ -1,9 +1,9 @@
-import * as React from 'react';
-import Router from './Router';
-import RouterContext from './RouterContext';
+import { RouteComponent } from "react-router";
+import RouterContext from "react-router/lib/RouterContext";
 
 export interface Middleware {
-    renderRouterContext?: (previous: RouterContext, props: React.Props<{}>) => RouterContext;
-    renderRouteComponent?: (previous: Router.RouteComponent, props: React.Props<{}>) => Router.RouteComponent;
+    renderRouterContext?: (previous: RouterContext, props: any) => RouterContext;
+    renderRouteComponent?: (previous: RouteComponent, props: any) => RouteComponent;
 }
-export default function applyRouterMiddleware(...middlewares: Middleware[]): (renderProps: React.Props<{}>) => RouterContext;
+
+export default function applyRouterMiddleware(...middlewares: Middleware[]): (renderProps: any) => RouterContext;
diff --git a/react-router/lib/browserHistory.d.ts b/react-router/lib/browserHistory.d.ts
index aabbdc23f9..8f45db6412 100644
--- a/react-router/lib/browserHistory.d.ts
+++ b/react-router/lib/browserHistory.d.ts
@@ -1,3 +1,5 @@
-import { History } from './routerHistory';
+import { History } from "history";
+
 declare const browserHistory: History;
+
 export default browserHistory;
diff --git a/react-router/lib/createMemoryHistory.d.ts b/react-router/lib/createMemoryHistory.d.ts
index 5df481bfa1..038e707e6b 100644
--- a/react-router/lib/createMemoryHistory.d.ts
+++ b/react-router/lib/createMemoryHistory.d.ts
@@ -1,3 +1,6 @@
-import * as H from 'history';
+import { History } from "history";
+import { CreateHistory } from "react-router";
 
-export default function createMemoryHistory(options?: H.HistoryOptions): H.History;
\ No newline at end of file
+declare const createMemoryHistory: CreateHistory<History>;
+
+export default createMemoryHistory;
diff --git a/react-router/lib/hashHistory.d.ts b/react-router/lib/hashHistory.d.ts
index 79f89c2f1a..6a17e65af9 100644
--- a/react-router/lib/hashHistory.d.ts
+++ b/react-router/lib/hashHistory.d.ts
@@ -1,3 +1,5 @@
-import { History } from './routerHistory';
+import { History } from "history";
+
 declare const hashHistory: History;
+
 export default hashHistory;
diff --git a/react-router/lib/match.d.ts b/react-router/lib/match.d.ts
index e311ea69df..407bcc80c2 100644
--- a/react-router/lib/match.d.ts
+++ b/react-router/lib/match.d.ts
@@ -1,17 +1,24 @@
-import * as H from 'history';
-import Router from './Router';
+import { History } from "history";
+import { Basename, LocationDescriptor, ParseQueryString, RouteConfig, StringifyQuery } from "react-router";
 
 interface MatchArgs {
-    routes?: Router.RouteConfig;
-    history?: H.History;
-    location?: H.Location | string;
-    parseQueryString?: Router.ParseQueryString;
-    stringifyQuery?: Router.StringifyQuery;
+    routes: RouteConfig;
+    basename?: Basename;
+    parseQueryString?: ParseQueryString;
+    stringifyQuery?: StringifyQuery;
 }
-interface MatchState extends Router.RouterState {
-    history: H.History;
-    router: Router;
-    createElement: (component: Router.RouteComponent, props: Object) => any;
+
+interface MatchLocationArgs extends MatchArgs {
+    location: LocationDescriptor;
+    history?: History;
 }
-export default function match(args: MatchArgs, cb: (error: any, nextLocation: H.Location, nextState: MatchState) => void): void;
+
+interface MatchHistoryArgs extends MatchArgs {
+    location?: LocationDescriptor;
+    history: History;
+}
+
+export type MatchCallback = (error: any, redirectLocation: Location, renderProps: any) => void;
+
+export default function match(args: MatchLocationArgs | MatchHistoryArgs, cb: MatchCallback): void;
 
diff --git a/react-router/lib/useRouterHistory.d.ts b/react-router/lib/useRouterHistory.d.ts
index 160375d2f0..7dc2bdd3ab 100644
--- a/react-router/lib/useRouterHistory.d.ts
+++ b/react-router/lib/useRouterHistory.d.ts
@@ -1,3 +1,6 @@
-import { History, HistoryOptions, HistoryQueries, CreateHistory } from 'history';
+import { History } from "history";
+import { CreateHistoryEnhancer } from "react-router";
 
-export default function useRouterHistory<T>(createHistory: CreateHistory<T>): (options?: HistoryOptions) => History & HistoryQueries;
+declare const useRouterHistory: CreateHistoryEnhancer<History>;
+
+export default useRouterHistory;
diff --git a/react-router/lib/withRouter.d.ts b/react-router/lib/withRouter.d.ts
index 71330bbb21..25f9d357c7 100644
--- a/react-router/lib/withRouter.d.ts
+++ b/react-router/lib/withRouter.d.ts
@@ -1,4 +1,9 @@
-import * as React from 'react';
+import { ComponentClass, StatelessComponent } from "react";
 
-declare function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any, any>>(component: C): C;
-export default withRouter;
+interface Options {
+    withRef?: boolean;
+}
+
+type ComponentConstructor<P> = ComponentClass<P> | StatelessComponent<P>;
+
+export default function withRouter<P>(component: ComponentConstructor<P>, options?: Options): ComponentClass<P>;
diff --git a/react-router/react-router-tests.tsx b/react-router/react-router-tests.tsx
index 6c83ca180a..894dfec8c7 100644
--- a/react-router/react-router-tests.tsx
+++ b/react-router/react-router-tests.tsx
@@ -1,22 +1,39 @@
-import * as React from "react"
-import * as ReactDOM from "react-dom"
-import {renderToString} from "react-dom/server";
+import * as React from "react";
+import { Component, ValidationMap } from "react";
+import * as ReactDOM from "react-dom";
+import { renderToString } from "react-dom/server";
 
-import { applyRouterMiddleware, browserHistory, hashHistory, match, createMemoryHistory, withRouter, routerShape, Router, Route, IndexRoute, InjectedRouter, Link, RouterOnContext, RouterContext, LinkProps} from "react-router";
+import {
+	applyRouterMiddleware,
+	browserHistory,
+	hashHistory,
+	match,
+	createMemoryHistory,
+	withRouter,
+	routerShape,
+	Router,
+	Route,
+	IndexRoute,
+	InjectedRouter,
+	Link,
+	RouterContext,
+	LinkProps
+} from "react-router";
 
 const NavLink = (props: LinkProps) => (
 	<Link {...props} activeClassName="active" />
 )
 
 interface MasterContext {
-	router: RouterOnContext;
+	router: InjectedRouter;
 }
 
-class Master extends React.Component<React.Props<{}>, {}> {
+class Master extends Component<any, any> {
 
-	static contextTypes: React.ValidationMap<any> = {
-		router: routerShape
+	static contextTypes: ValidationMap<any> = {
+		"router": routerShape
 	};
+
 	context: MasterContext;
 
 	navigate() {
@@ -106,7 +123,11 @@ const routes = (
 	</Route>
 );
 
-match({history, routes, location: "baseurl"}, (error, redirectLocation, renderProps) => {
+match({ routes, location: "baseurl" }, (error, redirectLocation, renderProps) => {
+	renderToString(<RouterContext {...renderProps} />);
+});
+
+match({ history, routes }, (error, redirectLocation, renderProps) => {
 	renderToString(<RouterContext {...renderProps} />);
 });
 
diff --git a/react-router/tsconfig.json b/react-router/tsconfig.json
index 69c7baf8e5..e2a4e054ad 100644
--- a/react-router/tsconfig.json
+++ b/react-router/tsconfig.json
@@ -1,8 +1,4 @@
 {
-    "files": [
-        "index.d.ts",
-        "react-router-tests.tsx"
-    ],
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
@@ -14,14 +10,31 @@
         "strictNullChecks": false,
         "jsx": "react",
         "baseUrl": "../",
-        "paths": {
-            "history": ["history/v2"]
-        },
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-    }
+    },
+    "files": [
+        "index.d.ts",
+        "lib/applyRouterMiddleware.d.ts",
+        "lib/browserHistory.d.ts",
+        "lib/createMemoryHistory.d.ts",
+        "lib/hashHistory.d.ts",
+        "lib/IndexLink.d.ts",
+        "lib/IndexRedirect.d.ts",
+        "lib/IndexRoute.d.ts",
+        "lib/Link.d.ts",
+        "lib/match.d.ts",
+        "lib/PatternUtils.d.ts",
+        "lib/PropTypes.d.ts",
+        "lib/Redirect.d.ts",
+        "lib/Route.d.ts",
+        "lib/Router.d.ts",
+        "lib/RouterContext.d.ts",
+        "lib/RouteUtils.d.ts",
+        "lib/useRouterHistory.d.ts",
+        "lib/withRouter.d.ts",
+        "react-router-tests.tsx"
+    ]
 }
diff --git a/react-router/tslint.json b/react-router/tslint.json
index e050abdce9..f9e30021f4 100644
--- a/react-router/tslint.json
+++ b/react-router/tslint.json
@@ -1,7 +1,3 @@
 {
-    "extends": "../tslint.json",
-    "rules": {
-        "forbidden-types": false,
-        "no-empty-interface": false
-    }
-}
\ No newline at end of file
+    "extends": "../tslint.json"
+}
diff --git a/react-router/v2/index.d.ts b/react-router/v2/index.d.ts
new file mode 100644
index 0000000000..b0a96487bf
--- /dev/null
+++ b/react-router/v2/index.d.ts
@@ -0,0 +1,90 @@
+// Type definitions for react-router 2.0
+// Project: https://github.com/rackt/react-router
+// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>, Nathan Brown <https://github.com/ngbrown>, Alex Wendland <https://github.com/awendland>, Kostya Esmukov <https://github.com/KostyaEsmukov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export as namespace ReactRouter;
+
+import * as React from 'react';
+
+export const routerShape: React.Requireable<any>;
+
+export const locationShape: React.Requireable<any>;
+
+import Router from "./lib/Router";
+import Link from "./lib/Link";
+import IndexLink from "./lib/IndexLink";
+import IndexRedirect from "./lib/IndexRedirect";
+import IndexRoute from "./lib/IndexRoute";
+import Redirect from "./lib/Redirect";
+import Route from "./lib/Route";
+import * as History from "./lib/routerHistory";
+import Lifecycle from "./lib/Lifecycle";
+import RouteContext from "./lib/RouteContext";
+import browserHistory from "./lib/browserHistory";
+import hashHistory from "./lib/hashHistory";
+import useRoutes from "./lib/useRoutes";
+import { createRoutes } from "./lib/RouteUtils";
+import { formatPattern } from "./lib/PatternUtils";
+import RouterContext from "./lib/RouterContext";
+import PropTypes from "./lib/PropTypes";
+import match from "./lib/match";
+import useRouterHistory from "./lib/useRouterHistory";
+import createMemoryHistory from "./lib/createMemoryHistory";
+import withRouter from "./lib/withRouter";
+import applyRouterMiddleware from "./lib/applyRouterMiddleware";
+
+// PlainRoute is defined in the API documented at:
+// https://github.com/rackt/react-router/blob/master/docs/API.md
+// but not included in any of the .../lib modules above.
+export type PlainRoute = Router.PlainRoute;
+
+// The following definitions are also very useful to export
+// because by using these types lots of potential type errors
+// can be exposed:
+export type EnterHook = Router.EnterHook;
+export type LeaveHook = Router.LeaveHook;
+export type ParseQueryString = Router.ParseQueryString;
+export type LocationDescriptor = Router.LocationDescriptor;
+export type RedirectFunction = Router.RedirectFunction;
+export type RouteComponent = Router.RouteComponent;
+export type RouteComponentProps<P, R> = Router.RouteComponentProps<P, R>;
+export type RouteConfig = Router.RouteConfig;
+export type RouteHook = Router.RouteHook;
+export type StringifyQuery = Router.StringifyQuery;
+export type RouterListener = Router.RouterListener;
+export type RouterState = Router.RouterState;
+export type InjectedRouter = Router.InjectedRouter;
+
+export type HistoryBase = History.HistoryBase;
+export type RouterOnContext = Router.RouterOnContext;
+export type RouteProps = Route.RouteProps;
+export type LinkProps = Link.LinkProps;
+
+export {
+    Router,
+    Link,
+    IndexLink,
+    IndexRedirect,
+    IndexRoute,
+    Redirect,
+    Route,
+    History,
+    browserHistory,
+    hashHistory,
+    Lifecycle,
+    RouteContext,
+    useRoutes,
+    createRoutes,
+    formatPattern,
+    RouterContext,
+    PropTypes,
+    match,
+    useRouterHistory,
+    createMemoryHistory,
+    withRouter,
+    applyRouterMiddleware
+};
+
+export default Router;
diff --git a/react-router/v2/lib/IndexLink.d.ts b/react-router/v2/lib/IndexLink.d.ts
new file mode 100644
index 0000000000..56ecf82c1d
--- /dev/null
+++ b/react-router/v2/lib/IndexLink.d.ts
@@ -0,0 +1,5 @@
+import Link from './Link';
+
+declare const IndexLink: Link;
+export default IndexLink;
+
diff --git a/react-router/v2/lib/IndexRedirect.d.ts b/react-router/v2/lib/IndexRedirect.d.ts
new file mode 100644
index 0000000000..41dab299c8
--- /dev/null
+++ b/react-router/v2/lib/IndexRedirect.d.ts
@@ -0,0 +1,17 @@
+import Router from './Router';
+import * as React from 'react';
+import * as H from 'history';
+
+declare const self: self.IndexRedirect;
+type self = self.IndexRedirect;
+export default self;
+
+declare namespace self {
+	interface IndexRedirectProps extends React.Props<self> {
+	    to: Router.RoutePattern;
+	    query?: H.Query;
+	    state?: H.LocationState;
+	}
+	interface IndexRedirectElement extends React.ReactElement<IndexRedirectProps> { }
+	interface IndexRedirect extends React.ComponentClass<self.IndexRedirectProps> { }
+}
diff --git a/react-router/v2/lib/IndexRoute.d.ts b/react-router/v2/lib/IndexRoute.d.ts
new file mode 100644
index 0000000000..b11b16d0e2
--- /dev/null
+++ b/react-router/v2/lib/IndexRoute.d.ts
@@ -0,0 +1,20 @@
+import * as React from 'react';
+import Router from './Router';
+import * as H from 'history';
+
+declare const self: self.IndexRoute;
+type self = self.IndexRoute;
+export default self;
+
+declare namespace self {
+    interface IndexRouteProps extends React.Props<IndexRoute> {
+        component?: Router.RouteComponent;
+        components?: Router.RouteComponents;
+        getComponent?: (location: H.Location, cb: (error: any, component?: Router.RouteComponent) => void) => void;
+        getComponents?: (location: H.Location, cb: (error: any, components?: Router.RouteComponents) => void) => void;
+        onEnter?: Router.EnterHook;
+        onLeave?: Router.LeaveHook;
+    }
+    interface IndexRoute extends React.ComponentClass<IndexRouteProps> { }
+    interface IndexRouteElement extends React.ReactElement<IndexRouteProps> { }
+}
\ No newline at end of file
diff --git a/react-router/lib/Lifecycle.d.ts b/react-router/v2/lib/Lifecycle.d.ts
similarity index 100%
rename from react-router/lib/Lifecycle.d.ts
rename to react-router/v2/lib/Lifecycle.d.ts
diff --git a/react-router/v2/lib/Link.d.ts b/react-router/v2/lib/Link.d.ts
new file mode 100644
index 0000000000..d90578b9f9
--- /dev/null
+++ b/react-router/v2/lib/Link.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import Router from './Router';
+
+declare const Link: Link;
+type Link = Link.Link;
+
+export default Link;
+
+declare namespace Link {
+    interface LinkProps extends React.HTMLAttributes<Link> {
+        activeStyle?: React.CSSProperties;
+        activeClassName?: string;
+        onlyActiveOnIndex?: boolean;
+        to: Router.RoutePattern | Router.LocationDescriptor | ((...args: any[]) => Router.LocationDescriptor);
+    }
+
+    interface Link extends React.ComponentClass<LinkProps> {}
+    interface LinkElement extends React.ReactElement<LinkProps> {}
+}
diff --git a/react-router/v2/lib/PatternUtils.d.ts b/react-router/v2/lib/PatternUtils.d.ts
new file mode 100644
index 0000000000..50e90f6e49
--- /dev/null
+++ b/react-router/v2/lib/PatternUtils.d.ts
@@ -0,0 +1 @@
+export function formatPattern(pattern: string, params: {}): string;
diff --git a/react-router/v2/lib/PropTypes.d.ts b/react-router/v2/lib/PropTypes.d.ts
new file mode 100644
index 0000000000..bbd6431070
--- /dev/null
+++ b/react-router/v2/lib/PropTypes.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+
+export function falsy(props: any, propName: string, componentName: string): Error;
+export const history: React.Requireable<any>;
+export const location: React.Requireable<any>;
+export const component: React.Requireable<any>;
+export const components: React.Requireable<any>;
+export const route: React.Requireable<any>;
+export const routes: React.Requireable<any>;
+
+export default {
+    falsy,
+    history,
+    location,
+    component,
+    components,
+    route
+};
+
diff --git a/react-router/v2/lib/Redirect.d.ts b/react-router/v2/lib/Redirect.d.ts
new file mode 100644
index 0000000000..e09b576d53
--- /dev/null
+++ b/react-router/v2/lib/Redirect.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import Router from './Router';
+import * as H from 'history';
+
+declare const self: self.Redirect;
+type self = typeof self;
+export default self;
+
+declare namespace self {
+    interface RedirectProps extends React.Props<Redirect> {
+        path?: Router.RoutePattern;
+        from?: Router.RoutePattern; // alias for path
+        to: Router.RoutePattern;
+        query?: H.Query;
+        state?: H.LocationState;
+    }
+    interface Redirect extends React.ComponentClass<RedirectProps> { }
+    interface RedirectElement extends React.ReactElement<RedirectProps> { }
+}
diff --git a/react-router/v2/lib/Route.d.ts b/react-router/v2/lib/Route.d.ts
new file mode 100644
index 0000000000..7e4b548a21
--- /dev/null
+++ b/react-router/v2/lib/Route.d.ts
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import Router from './Router';
+import { Location } from 'history';
+
+declare const self: self.Route;
+type self = self.Route;
+export default self;
+
+declare namespace self {
+
+    interface RouteProps extends React.Props<Route> {
+        path?: Router.RoutePattern;
+        component?: Router.RouteComponent;
+        components?: Router.RouteComponents;
+        getComponent?: (nextState: Router.RouterState, cb: (error: any, component?: Router.RouteComponent) => void) => void;
+        getComponents?: (nextState: Router.RouterState, cb: (error: any, components?: Router.RouteComponents) => void) => void;
+        onEnter?: Router.EnterHook;
+        onLeave?: Router.LeaveHook;
+        onChange?: Router.ChangeHook;
+        getIndexRoute?: (location: Location, cb: (error: any, indexRoute: Router.RouteConfig) => void) => void;
+        getChildRoutes?: (location: Location, cb: (error: any, childRoutes: Router.RouteConfig) => void) => void;
+    }
+    interface Route extends React.ComponentClass<RouteProps> {}
+    interface RouteElement extends React.ReactElement<RouteProps> {}
+}
diff --git a/react-router/lib/RouteContext.d.ts b/react-router/v2/lib/RouteContext.d.ts
similarity index 100%
rename from react-router/lib/RouteContext.d.ts
rename to react-router/v2/lib/RouteContext.d.ts
diff --git a/react-router/v2/lib/RouteUtils.d.ts b/react-router/v2/lib/RouteUtils.d.ts
new file mode 100644
index 0000000000..7065056ff5
--- /dev/null
+++ b/react-router/v2/lib/RouteUtils.d.ts
@@ -0,0 +1,8 @@
+import * as React from 'react';
+import Router from './Router';
+
+type E = React.ReactElement<any>;
+export function isReactChildren(object: E | E[]): boolean;
+export function createRouteFromReactElement(element: E): Router.PlainRoute;
+export function createRoutesFromReactChildren(children: E | E[], parentRoute: Router.PlainRoute): Router.PlainRoute[];
+export function createRoutes(routes: Router.RouteConfig): Router.PlainRoute[];
diff --git a/react-router/v2/lib/Router.d.ts b/react-router/v2/lib/Router.d.ts
new file mode 100644
index 0000000000..a7dff58369
--- /dev/null
+++ b/react-router/v2/lib/Router.d.ts
@@ -0,0 +1,116 @@
+import * as React from 'react';
+import RouterContext from './RouterContext';
+import {
+    QueryString, Query,
+    Location, LocationDescriptor, LocationState as HLocationState,
+    History, Href,
+    Pathname, Path } from 'history';
+
+declare const Router: Router;
+interface Router extends React.ComponentClass<Router.RouterProps> { }
+
+export default Router;
+
+// types based on https://github.com/rackt/react-router/blob/master/docs/Glossary.md
+
+declare namespace Router {
+    type RouteConfig = React.ReactNode | PlainRoute | PlainRoute[];
+    type RoutePattern = string;
+    interface RouteComponents { [key: string]: RouteComponent; }
+
+    type ParseQueryString = (queryString: QueryString) => Query;
+    type StringifyQuery = (queryObject: Query) => QueryString;
+
+    type Component = React.ReactType;
+    type RouteComponent = Component;
+
+    type EnterHook = (nextState: RouterState, replace: RedirectFunction, callback?: Function) => void;
+    type LeaveHook = () => void;
+    type ChangeHook = (prevState: RouterState, nextState: RouterState, replace: RedirectFunction, callback: Function) => void;
+    type RouteHook = (nextLocation?: Location) => any;
+
+    interface Params { [param: string]: string; }
+
+    type RouterListener = (error: Error, nextState: RouterState) => void;
+
+    interface LocationDescriptor {
+        pathname?: Pathname;
+        query?: Query;
+        hash?: Href;
+        state?: HLocationState;
+    }
+
+    interface RedirectFunction {
+        (location: LocationDescriptor): void;
+        /**
+        * @deprecated `replaceState(state, pathname, query) is deprecated; Use `replace(location)` with a location descriptor instead. http://tiny.cc/router-isActivedeprecated
+        */
+        (state: HLocationState, pathname: Pathname | Path, query?: Query): void;
+    }
+
+    interface RouterState {
+        location: Location;
+        routes: PlainRoute[];
+        params: Params;
+        components: RouteComponent[];
+    }
+
+    interface RouterProps extends React.Props<Router> {
+        history?: History;
+        routes?: RouteConfig; // alias for children
+        createElement?: (component: RouteComponent, props: Object) => any;
+        onError?: (error: any) => any;
+        onUpdate?: () => any;
+        parseQueryString?: ParseQueryString;
+        stringifyQuery?: StringifyQuery;
+        basename?: string;
+        render?: (renderProps: React.Props<{}>) => RouterContext;
+    }
+
+    interface PlainRoute {
+        path?: RoutePattern;
+        component?: RouteComponent;
+        components?: RouteComponents;
+        getComponent?: (location: Location, cb: (error: any, component?: RouteComponent) => void) => void;
+        getComponents?: (location: Location, cb: (error: any, components?: RouteComponents) => void) => void;
+        onEnter?: EnterHook;
+        onLeave?: LeaveHook;
+        indexRoute?: PlainRoute;
+        getIndexRoute?: (location: Location, cb: (error: any, indexRoute: RouteConfig) => void) => void;
+        childRoutes?: PlainRoute[];
+        getChildRoutes?: (location: Location, cb: (error: any, childRoutes: RouteConfig) => void) => void;
+    }
+
+    interface RouteComponentProps<P, R> {
+        history?: History;
+        location?: Location;
+        params?: P;
+        route?: PlainRoute;
+        routeParams?: R;
+        routes?: PlainRoute[];
+        children?: React.ReactElement<any>;
+    }
+
+    interface RouterOnContext extends History {
+        setRouteLeaveHook(route: PlainRoute, hook?: RouteHook): () => void;
+        isActive(pathOrLoc: Path | LocationDescriptor, indexOnly?: boolean): boolean;
+    }
+
+    // Wrap a component using withRouter(Component) to provide a router object
+    // to the Component's props, allowing the Component to programmatically call
+    // push and other functions.
+    //
+    // https://github.com/reactjs/react-router/blob/v2.4.0/upgrade-guides/v2.4.0.md
+
+    interface InjectedRouter {
+        push: (pathOrLoc: Path | LocationDescriptor) => void;
+        replace: (pathOrLoc: Path | LocationDescriptor) => void;
+        go: (n: number) => void;
+        goBack: () => void;
+        goForward: () => void;
+        setRouteLeaveHook(route: PlainRoute, callback: RouteHook): void;
+        createPath(path: History.Path, query?: History.Query): History.Path;
+        createHref(path: History.Path, query?: History.Query): History.Href;
+        isActive: (pathOrLoc: Path | LocationDescriptor, indexOnly?: boolean) => boolean;
+    }
+}
diff --git a/react-router/v2/lib/RouterContext.d.ts b/react-router/v2/lib/RouterContext.d.ts
new file mode 100644
index 0000000000..b6eab5831c
--- /dev/null
+++ b/react-router/v2/lib/RouterContext.d.ts
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import * as H from 'history';
+import Router from './Router';
+
+declare const self: self.RouterContext;
+type self = self.RouterContext;
+export default self;
+
+declare namespace self {
+    interface RouterContextProps extends React.Props<RouterContext> {
+        history?: H.History;
+        router: Router;
+        createElement: (component: Router.RouteComponent, props: Object) => any;
+        location: H.Location;
+        routes: Router.RouteConfig;
+        params: Router.Params;
+        components?: Router.RouteComponent[];
+    }
+    interface RouterContext extends React.ComponentClass<RouterContextProps> {}
+    interface RouterContextElement extends React.ReactElement<RouterContextProps> {
+        history?: H.History;
+        location: H.Location;
+        router?: Router;
+    }
+}
\ No newline at end of file
diff --git a/react-router/v2/lib/applyRouterMiddleware.d.ts b/react-router/v2/lib/applyRouterMiddleware.d.ts
new file mode 100644
index 0000000000..ed87d815db
--- /dev/null
+++ b/react-router/v2/lib/applyRouterMiddleware.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+import Router from './Router';
+import RouterContext from './RouterContext';
+
+export interface Middleware {
+    renderRouterContext?: (previous: RouterContext, props: React.Props<{}>) => RouterContext;
+    renderRouteComponent?: (previous: Router.RouteComponent, props: React.Props<{}>) => Router.RouteComponent;
+}
+export default function applyRouterMiddleware(...middlewares: Middleware[]): (renderProps: React.Props<{}>) => RouterContext;
diff --git a/react-router/v2/lib/browserHistory.d.ts b/react-router/v2/lib/browserHistory.d.ts
new file mode 100644
index 0000000000..aabbdc23f9
--- /dev/null
+++ b/react-router/v2/lib/browserHistory.d.ts
@@ -0,0 +1,3 @@
+import { History } from './routerHistory';
+declare const browserHistory: History;
+export default browserHistory;
diff --git a/react-router/v2/lib/createMemoryHistory.d.ts b/react-router/v2/lib/createMemoryHistory.d.ts
new file mode 100644
index 0000000000..5df481bfa1
--- /dev/null
+++ b/react-router/v2/lib/createMemoryHistory.d.ts
@@ -0,0 +1,3 @@
+import * as H from 'history';
+
+export default function createMemoryHistory(options?: H.HistoryOptions): H.History;
\ No newline at end of file
diff --git a/react-router/v2/lib/hashHistory.d.ts b/react-router/v2/lib/hashHistory.d.ts
new file mode 100644
index 0000000000..79f89c2f1a
--- /dev/null
+++ b/react-router/v2/lib/hashHistory.d.ts
@@ -0,0 +1,3 @@
+import { History } from './routerHistory';
+declare const hashHistory: History;
+export default hashHistory;
diff --git a/react-router/v2/lib/match.d.ts b/react-router/v2/lib/match.d.ts
new file mode 100644
index 0000000000..e311ea69df
--- /dev/null
+++ b/react-router/v2/lib/match.d.ts
@@ -0,0 +1,17 @@
+import * as H from 'history';
+import Router from './Router';
+
+interface MatchArgs {
+    routes?: Router.RouteConfig;
+    history?: H.History;
+    location?: H.Location | string;
+    parseQueryString?: Router.ParseQueryString;
+    stringifyQuery?: Router.StringifyQuery;
+}
+interface MatchState extends Router.RouterState {
+    history: H.History;
+    router: Router;
+    createElement: (component: Router.RouteComponent, props: Object) => any;
+}
+export default function match(args: MatchArgs, cb: (error: any, nextLocation: H.Location, nextState: MatchState) => void): void;
+
diff --git a/react-router/lib/routerHistory.d.ts b/react-router/v2/lib/routerHistory.d.ts
similarity index 100%
rename from react-router/lib/routerHistory.d.ts
rename to react-router/v2/lib/routerHistory.d.ts
diff --git a/react-router/v2/lib/useRouterHistory.d.ts b/react-router/v2/lib/useRouterHistory.d.ts
new file mode 100644
index 0000000000..160375d2f0
--- /dev/null
+++ b/react-router/v2/lib/useRouterHistory.d.ts
@@ -0,0 +1,3 @@
+import { History, HistoryOptions, HistoryQueries, CreateHistory } from 'history';
+
+export default function useRouterHistory<T>(createHistory: CreateHistory<T>): (options?: HistoryOptions) => History & HistoryQueries;
diff --git a/react-router/lib/useRoutes.d.ts b/react-router/v2/lib/useRoutes.d.ts
similarity index 100%
rename from react-router/lib/useRoutes.d.ts
rename to react-router/v2/lib/useRoutes.d.ts
diff --git a/react-router/v2/lib/withRouter.d.ts b/react-router/v2/lib/withRouter.d.ts
new file mode 100644
index 0000000000..71330bbb21
--- /dev/null
+++ b/react-router/v2/lib/withRouter.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+
+declare function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any, any>>(component: C): C;
+export default withRouter;
diff --git a/react-router/v2/tsconfig.json b/react-router/v2/tsconfig.json
new file mode 100644
index 0000000000..d9c384bdcf
--- /dev/null
+++ b/react-router/v2/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "history": ["history/v2"],
+            "react-router": ["react-router/v2"],
+            "react-router/*": ["react-router/v2/*"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
diff --git a/react-router/v2/tslint.json b/react-router/v2/tslint.json
new file mode 100644
index 0000000000..d032145676
--- /dev/null
+++ b/react-router/v2/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "forbidden-types": false,
+        "no-empty-interface": false
+    }
+}
diff --git a/react/index.d.ts b/react/index.d.ts
index 8bf7bb21af..f25e5c0afd 100644
--- a/react/index.d.ts
+++ b/react/index.d.ts
@@ -81,6 +81,9 @@ declare namespace React {
     interface HTMLFactory<T extends HTMLElement> extends DOMFactory<HTMLAttributes<T>, T> {
     }
 
+    interface ChangeTargetHTMLFactory<T extends HTMLElement> extends DOMFactory<ChangeTargetHTMLAttributes<T>, T> {
+    }
+
     interface SVGFactory extends DOMFactory<SVGAttributes<SVGElement>, SVGElement> {
     }
 
@@ -168,7 +171,7 @@ declare namespace React {
         setState<K extends keyof S>(f: (prevState: S, props: P) => Pick<S, K>, callback?: () => any): void;
         setState<K extends keyof S>(state: Pick<S, K>, callback?: () => any): void;
         forceUpdate(callBack?: () => any): void;
-        render(): JSX.Element | null;
+        render(): JSX.Element;
 
         // React.Props<T> is now deprecated, which means that the `children`
         // property is not available on `P` by default, even though you can
@@ -201,7 +204,7 @@ declare namespace React {
 
     type SFC<P> = StatelessComponent<P>;
     interface StatelessComponent<P> {
-        (props: P & { children?: ReactNode }, context?: any): ReactElement<any>;
+        (props: P & { children?: ReactNode }, context?: any): ReactElement<any> | null;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         defaultProps?: P;
@@ -270,9 +273,10 @@ declare namespace React {
     //
     // Event System
     // ----------------------------------------------------------------------
-    interface SyntheticEventBase<CURRENT, TARGET> {
+
+    interface SyntheticEvent<T> {
         bubbles: boolean;
-        currentTarget: EventTarget & CURRENT;
+        currentTarget: EventTarget & T;
         cancelable: boolean;
         defaultPrevented: boolean;
         eventPhase: number;
@@ -283,16 +287,12 @@ declare namespace React {
         stopPropagation(): void;
         isPropagationStopped(): boolean;
         persist(): void;
-        target: EventTarget & TARGET;
+        // If you thought this should be `EventTarget & T`, see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/12239
+        target: EventTarget;
         timeStamp: Date;
         type: string;
     }
 
-    interface SyntheticEvent<T> extends SyntheticEventBase<T, EventTarget> {
-      // If you thought target should be `EventTarget & T`,
-      // see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/12239
-    }
-
     interface ClipboardEvent<T> extends SyntheticEvent<T> {
         clipboardData: DataTransfer;
     }
@@ -312,7 +312,8 @@ declare namespace React {
     interface FormEvent<T> extends SyntheticEvent<T> {
     }
 
-    interface ChangeEvent<T> extends SyntheticEventBase<T, T> {
+    interface ChangeEvent<T> extends SyntheticEvent<T> {
+        target: EventTarget & T;
     }
 
     interface KeyboardEvent<T> extends SyntheticEvent<T> {
@@ -433,6 +434,9 @@ declare namespace React {
     interface HTMLProps<T> extends HTMLAttributes<T>, ClassAttributes<T> {
     }
 
+    interface ChangeTargetHTMLProps<T extends HTMLElement> extends ChangeTargetHTMLAttributes<T>, ClassAttributes<T> {
+    }
+
     interface SVGProps extends SVGAttributes<SVGElement>, ClassAttributes<SVGElement> {
     }
 
@@ -465,7 +469,7 @@ declare namespace React {
         onBlurCapture?: FocusEventHandler<T>;
 
         // Form Events
-        onChange?: ChangeEventHandler<T>;
+        onChange?: FormEventHandler<T>;
         onChangeCapture?: FormEventHandler<T>;
         onInput?: FormEventHandler<T>;
         onInputCapture?: FormEventHandler<T>;
@@ -2149,6 +2153,10 @@ declare namespace React {
         unselectable?: boolean;
     }
 
+    interface ChangeTargetHTMLAttributes<T extends HTMLElement> extends HTMLAttributes<T> {
+        onChange?: ChangeEventHandler<T>;
+    }
+
     // this list is "complete" in that it contains every SVG attribute
     // that React supports, but the types can be improved.
     // Full list here: https://facebook.github.io/react/docs/dom-elements.html
@@ -2459,7 +2467,7 @@ declare namespace React {
         i: HTMLFactory<HTMLElement>;
         iframe: HTMLFactory<HTMLIFrameElement>;
         img: HTMLFactory<HTMLImageElement>;
-        input: HTMLFactory<HTMLInputElement>;
+        input: ChangeTargetHTMLFactory<HTMLInputElement>;
         ins: HTMLFactory<HTMLModElement>;
         kbd: HTMLFactory<HTMLElement>;
         keygen: HTMLFactory<HTMLElement>;
@@ -2494,7 +2502,7 @@ declare namespace React {
         samp: HTMLFactory<HTMLElement>;
         script: HTMLFactory<HTMLElement>;
         section: HTMLFactory<HTMLElement>;
-        select: HTMLFactory<HTMLSelectElement>;
+        select: ChangeTargetHTMLFactory<HTMLSelectElement>;
         small: HTMLFactory<HTMLElement>;
         source: HTMLFactory<HTMLSourceElement>;
         span: HTMLFactory<HTMLSpanElement>;
@@ -2506,7 +2514,7 @@ declare namespace React {
         table: HTMLFactory<HTMLTableElement>;
         tbody: HTMLFactory<HTMLTableSectionElement>;
         td: HTMLFactory<HTMLTableDataCellElement>;
-        textarea: HTMLFactory<HTMLTextAreaElement>;
+        textarea: ChangeTargetHTMLFactory<HTMLTextAreaElement>;
         tfoot: HTMLFactory<HTMLTableSectionElement>;
         th: HTMLFactory<HTMLTableHeaderCellElement>;
         thead: HTMLFactory<HTMLTableSectionElement>;
@@ -2620,9 +2628,11 @@ declare namespace React {
 
 declare global {
     namespace JSX {
-        interface Element extends React.ReactElement<any> { }
+        interface JSXElement extends React.ReactElement<any> { }
+        type Element = JSXElement | null;
+
         interface ElementClass extends React.Component<any, any> {
-            render(): JSX.Element | null;
+            render(): JSX.Element;
         }
         interface ElementAttributesProperty { props: {}; }
 
@@ -2684,7 +2694,7 @@ declare global {
             i: React.HTMLProps<HTMLElement>;
             iframe: React.HTMLProps<HTMLIFrameElement>;
             img: React.HTMLProps<HTMLImageElement>;
-            input: React.HTMLProps<HTMLInputElement>;
+            input: React.ChangeTargetHTMLProps<HTMLInputElement>;
             ins: React.HTMLProps<HTMLModElement>;
             kbd: React.HTMLProps<HTMLElement>;
             keygen: React.HTMLProps<HTMLElement>;
@@ -2720,7 +2730,7 @@ declare global {
             samp: React.HTMLProps<HTMLElement>;
             script: React.HTMLProps<HTMLElement>;
             section: React.HTMLProps<HTMLElement>;
-            select: React.HTMLProps<HTMLSelectElement>;
+            select: React.ChangeTargetHTMLProps<HTMLSelectElement>;
             small: React.HTMLProps<HTMLElement>;
             source: React.HTMLProps<HTMLSourceElement>;
             span: React.HTMLProps<HTMLSpanElement>;
@@ -2732,7 +2742,7 @@ declare global {
             table: React.HTMLProps<HTMLTableElement>;
             tbody: React.HTMLProps<HTMLTableSectionElement>;
             td: React.HTMLProps<HTMLTableDataCellElement>;
-            textarea: React.HTMLProps<HTMLTextAreaElement>;
+            textarea: React.ChangeTargetHTMLProps<HTMLTextAreaElement>;
             tfoot: React.HTMLProps<HTMLTableSectionElement>;
             th: React.HTMLProps<HTMLTableHeaderCellElement>;
             thead: React.HTMLProps<HTMLTableSectionElement>;
diff --git a/react/test/index.ts b/react/test/index.ts
index b575055514..38ad574aa4 100644
--- a/react/test/index.ts
+++ b/react/test/index.ts
@@ -674,3 +674,18 @@ class SyntheticEventTargetValue extends React.Component<{}, { value: string }> {
     });
   }
 }
+
+React.DOM.input({
+    onChange: event => {
+        // `event.target` is guaranteed to be HTMLInputElement
+        event.target.value;
+    }
+});
+
+// A ChangeEvent is a valid FormEvent (maintain compatibility with existing
+// event handlers)
+
+type InputChangeEvent = React.ChangeEvent<HTMLInputElement>;
+type InputFormEvent = React.FormEvent<HTMLInputElement>;
+const changeEvent:InputChangeEvent = undefined as any;
+const formEvent:InputFormEvent = changeEvent;
diff --git a/react/test/tsx.tsx b/react/test/tsx.tsx
index 0531cb52c0..0b0bc096ae 100644
--- a/react/test/tsx.tsx
+++ b/react/test/tsx.tsx
@@ -32,3 +32,6 @@ StatelessComponent2.defaultProps = {
         </text>
     </g>
 </svg>;
+
+const CustomComponent = (props: { flag: boolean }) => props.flag ? React.createElement('div') : null;
+const UseComponent2 = (f: boolean) => <CustomComponent flag={f} />;
diff --git a/realm/index.d.ts b/realm/index.d.ts
index ad77dc5598..034d9e390f 100644
--- a/realm/index.d.ts
+++ b/realm/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for realm-js 0.14.3
+// Type definitions for realm-js 0.14
 // Project: https://github.com/realm/realm-js
 // Definitions by: Akim <https://github.com/Akim95>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -94,7 +94,7 @@ declare namespace Realm {
     * Collection
     * @see { @link https://realm.io/docs/react-native/latest/api/Realm.Collection.html }
     */
-    export interface Collection {
+    export interface Collection<T> {
         readonly length: number;
 
         /**
@@ -107,24 +107,24 @@ declare namespace Realm {
          * @param  {any[]} ...arg
          * @returns Results
          */
-        filtered(query: string, ...arg: any[]): Results;
+        filtered(query: string, ...arg: any[]): Results<T>;
 
         /**
          * @param  {string|SortDescriptor} descriptor
          * @param  {boolean} reverse?
          * @returns Results
          */
-        sorted(descriptor: string | SortDescriptor, reverse?: boolean): Results;
- 
+        sorted(descriptor: string | SortDescriptor, reverse?: boolean): Results<T>;
+
         /**
-         * @returns Iterator<any>
+         * @returns Iterator<T|any>
          */
-        [Symbol.iterator](): Iterator<any>;
+        [Symbol.iterator](): Iterator<T>;
 
         /**
          * @returns Results
          */
-        snapshot(): Results;
+        snapshot(): Results<T>;
 
         /**
          * @returns Iterator<any>
@@ -150,65 +150,65 @@ declare namespace Realm {
         /**
          * @param  {number} start?
          * @param  {number} end?
-         * @returns Object
+         * @returns T[] | Object[]
          */
-        slice(start?: number, end?: number): Object[];
+        slice(start?: number, end?: number): T[];
 
         /**
          * @param  {(object:any,index?:any,collection?:any)=>void} callback
          * @param  {any} thisArg?
          * @returns Object|void
          */
-        find(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): Object | void;
+        find(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): T | null | undefined;
 
         /**
          * @param  {(object:any,index?:any,collection?:any)=>void} callback
          * @param  {any} thisArg?
          * @returns number
          */
-        findIndex(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): number;
+        findIndex(callback: (object: any, index?: number, collection?: any) => void, thisArg?: any): number;
 
         /**
-         * @param  {(object:any,index?:any,collection?:any)=>void} callback
+         * @param  {(object:T|any,index?:number,collection?:any)=>void} callback
          * @param  {any} thisArg?
          * @returns void
          */
-        forEach(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): void;
+        forEach(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): void;
 
         /**
-         * @param  {(object:any,index?:any,collection?:any)=>void} callback
+         * @param  {(object:T|any,index?:number,collection?:any)=>void} callback
          * @param  {any} thisArg?
          * @returns boolean
          */
-        every(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): boolean;
+        every(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): boolean;
 
         /**
-         * @param  {(object:any,index?:any,collection?:any)=>void} callback
+         * @param  {(object:any,index?:number,collection?:any)=>void} callback
          * @param  {any} thisArg?
          * @returns boolean
          */
-        some(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): boolean;
+        some(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): boolean;
 
         /**
-         * @param  {(object:any,index?:any,collection?:any)=>void} callback
+         * @param  {(object:any,index?:number,collection?:any)=>void} callback
          * @param  {any} thisArg?
          * @returns any
          */
-        map(callback: (object: any, index?: any, collection?: any) => void, thisArg?: any): any[];
+        map(callback: (object: T, index?: number, collection?: any) => void, thisArg?: any): any[];
+
+        /**
+         * @param  {(previousValue:T|any,object?:any,index?:number,collection?:any)=>void} callback
+         * @param  {any} initialValue?
+         * @returns any
+         */
+        reduce(callback: (previousValue: T, object?: T, index?: number, collection?: any) => void, initialValue?: any): any;
 
         /**
          * @param  {(previousValue:any,object?:any,index?:any,collection?:any)=>void} callback
          * @param  {any} initialValue?
          * @returns any
          */
-        reduce(callback: (previousValue: any, object?: any, index?: any, collection?: any) => void, initialValue?: any): any;
-
-        /**
-         * @param  {(previousValue:any,object?:any,index?:any,collection?:any)=>void} callback
-         * @param  {any} initialValue?
-         * @returns any
-         */
-        reduceRight(callback: (previousValue: any, object?: any, index?: any, collection?: any) => void, initialValue?: any): any;
+        reduceRight(callback: (previousValue: T, object?: T, index?: any, collection?: any) => void, initialValue?: any): any;
     }
 
     /**
@@ -226,22 +226,22 @@ declare namespace Realm {
     * List
     * @see { @link https://realm.io/docs/react-native/latest/api/Realm.List.html }
     */
-    export interface List extends Collection {
+    export interface List<T> extends Collection<T> {
         /**
          * @returns Object|void
          */
-        pop(): Object | void;
+        pop(): T | null | undefined;
 
         /**
          * @param  {any} object
          * @returns number
          */
-        push(object: any): number;
+        push(object: T): number;
 
         /**
          * @returns Object|void
          */
-        shift(): Object | void;
+        shift(): T | null | undefined;
 
         /**
          * @param  {number} index
@@ -249,20 +249,20 @@ declare namespace Realm {
          * @param  {any} object?
          * @returns Object
          */
-        splice(index: number, count?: number, object?: any): Object[];
+        splice(index: number, count?: number, object?: any): T[];
 
         /**
          * @param  {any} object
          * @returns number
          */
-        unshift(object: any): number;
+        unshift(object: T): number;
     }
 
     /**
     * Results
     * @see { @link https://realm.io/docs/react-native/latest/api/Realm.Results.html }
     */
-    export interface Results extends Collection {}
+    export type Results<T> = Collection<T>;
 }
 
 declare class Realm {
@@ -297,13 +297,13 @@ declare class Realm {
      * @param  {boolean} update?
      * @returns Realm.Object|T|any
      */
-    create<T>(type: string | Realm.ObjectType, properties: Realm.ObjectPropsType, update?: boolean): Realm.Object | T | any;
+    create<T>(type: string | Realm.ObjectType, properties: T & Realm.ObjectPropsType, update?: boolean): T;
 
     /**
      * @param  {Realm.Object|Realm.Object[]|Realm.List|Realm.Results|any} object
      * @returns void
      */
-    delete(object: Realm.Object | Realm.Object[] | Realm.List | Realm.Results | any): void;
+    delete(object: Realm.Object | Realm.Object[] | Realm.List<any> | Realm.Results<any> | any): void;
 
     /**
      * @returns void
@@ -315,13 +315,13 @@ declare class Realm {
      * @param  {number|string} key
      * @returns Realm.Object|void
      */
-    objectForPrimaryKey(type: string | Realm.ObjectType, key: number | string): Realm.Object | void;
+    objectForPrimaryKey<T>(type: string | Realm.ObjectType, key: number | string): T | void;
 
     /**
      * @param  {string|Realm.ObjectType} type
      * @returns Realm.Results
      */
-    objects(type: string | Realm.ObjectType): Realm.Results;
+    objects<T>(type: string | Realm.ObjectType): Realm.ObjectType & Realm.Results<T>;
 
     /**
      * @param  {string} name
diff --git a/realm/tslint.json b/realm/tslint.json
new file mode 100644
index 0000000000..ccdb64abf2
--- /dev/null
+++ b/realm/tslint.json
@@ -0,0 +1,2 @@
+{ "extends": "../tslint.json" }
+
diff --git a/redis/index.d.ts b/redis/index.d.ts
index 75745b99f4..0e7e2ec4de 100644
--- a/redis/index.d.ts
+++ b/redis/index.d.ts
@@ -94,6 +94,16 @@ export interface RedisClient extends NodeJS.EventEmitter {
     end(): void;
     unref(): void;
 
+    /**
+     * Stop sending commands and queue the commands.
+     */
+    cork(): void;
+
+    /**
+     * Resume and send the queued commands at once.
+     */
+    uncork(): void;
+
     // Low level command execution
     send_command(command: string, ...args: any[]): boolean;
 
diff --git a/redis/redis-tests.ts b/redis/redis-tests.ts
index d98979f256..e0315a809f 100644
--- a/redis/redis-tests.ts
+++ b/redis/redis-tests.ts
@@ -112,4 +112,10 @@ client.monitor(resCallback);
 // Send command
 client.send_command(str, args, resCallback);
 // Duplicate
-client.duplicate();
\ No newline at end of file
+client.duplicate();
+
+// Pipeline
+client.cork();
+client.set("abc", "fff", strCallback);
+client.get("abc", resCallback);
+client.uncork();
diff --git a/redux-bootstrap/index.d.ts b/redux-bootstrap/index.d.ts
index 171cf4d764..60d53bb713 100644
--- a/redux-bootstrap/index.d.ts
+++ b/redux-bootstrap/index.d.ts
@@ -1,30 +1,30 @@
-// Type definitions for react-bootstrap v1.0.0
+// Type definitions for react-bootstrap 1.0
 // Project: https://github.com/remojansen/redux-bootstrap
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-declare module "redux-bootstrap" {
-    import * as Redux from "redux";
-    import ReactRouterRedux = require("react-router-redux");
+import * as React from "react";
+import { Middleware, Reducer, Store } from "redux";
+import { History } from "history";
 
-    interface BootstrapOptions {
-        routes: JSX.Element;
-        reducers: ReducersOption;
-        middlewares?: Redux.Middleware[];
-        initialState?: any;
-        container?: string;
-    }
-
-    interface BootstrapResult {
-        store: Redux.Store<any>;
-        history: ReactRouterRedux.ReactRouterReduxHistory;
-        root: JSX.Element;
-    }
-
-    interface ReducersOption {
-        [index: string]: Redux.Reducer<any>;
-    }
-
-    export default function bootstrap(options: BootstrapOptions): BootstrapResult;
+export interface BootstrapOptions {
+    routes: JSX.Element;
+    reducers: ReducersOption;
+    middlewares?: Middleware[];
+    initialState?: any;
+    container?: string;
 }
+
+export interface BootstrapResult {
+    store: Store<any>;
+    history: History;
+    root: JSX.Element;
+}
+
+export interface ReducersOption {
+    [index: string]: Reducer<any>;
+}
+
+export default function bootstrap(options: BootstrapOptions): BootstrapResult;
+
diff --git a/redux-bootstrap/tsconfig.json b/redux-bootstrap/tsconfig.json
index a5c0900ca4..cca0524f9c 100644
--- a/redux-bootstrap/tsconfig.json
+++ b/redux-bootstrap/tsconfig.json
@@ -9,9 +9,6 @@
         "noImplicitThis": true,
         "strictNullChecks": false,
         "baseUrl": "../",
-        "paths": {
-            "history": ["history/v2"]
-        },
         "typeRoots": [
             "../"
         ],
diff --git a/redux-router/tsconfig.json b/redux-router/tsconfig.json
index 786008c59c..10120c4840 100644
--- a/redux-router/tsconfig.json
+++ b/redux-router/tsconfig.json
@@ -10,7 +10,8 @@
         "strictNullChecks": false,
         "baseUrl": "../",
         "paths": {
-            "history": ["history/v2"]
+            "history": ["history/v2"],
+            "react-router": ["react-router/v2"]
         },
         "typeRoots": [
             "../"
diff --git a/roslib/index.d.ts b/roslib/index.d.ts
index c195387901..923bcb6396 100644
--- a/roslib/index.d.ts
+++ b/roslib/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for roslib.js
+// Type definitions for roslib.js 1.9
 // Project: http://wiki.ros.org/roslibjs
 // Definitions by: Stefan Profanter <https://github.com/Pro/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -67,6 +67,16 @@ declare namespace ROSLIB {
 		 */
 		callOnConnection(message:any):void;
 
+		/**
+		 * Retrieves list of actionlib servers in ROS as an array.
+		 *
+		 * @param callback function with params:
+		 *   * action_servers - Array of actionlib servers names
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+    	getActionServers(callback:(action_servers:string[]) => void, failedCallback?:(error:any)=>void):void;
+
 		/**
 		 * Retrieves list of topics in ROS as an array.
 		 *
diff --git a/rx-lite/index.d.ts b/rx-lite/index.d.ts
index fb5056c478..7e085031aa 100644
--- a/rx-lite/index.d.ts
+++ b/rx-lite/index.d.ts
@@ -232,7 +232,7 @@ declare namespace Rx {
         withLatestFrom<TOther, TResult>(souces: (Observable<TOther> | IPromise<TOther>)[], resultSelector: (firstValue: T, ...otherValues: TOther[]) => TResult): Observable<TResult>;
         concat(...sources: (Observable<T> | IPromise<T>)[]): Observable<T>;
         concat(sources: (Observable<T> | IPromise<T>)[]): Observable<T>;
-        concatAll(): Observable<T>;
+        concatAll(): T;
         concatObservable(): Observable<T>;    // alias for concatAll
         concatMap<T2, R>(selector: (value: T, index: number) => Observable<T2>, resultSelector: (value1: T, value2: T2, index: number) => R): Observable<R>;    // alias for selectConcat
         concatMap<T2, R>(selector: (value: T, index: number) => IPromise<T2>, resultSelector: (value1: T, value2: T2, index: number) => R): Observable<R>;    // alias for selectConcat
diff --git a/sequelize/v3/index.d.ts b/sequelize/v3/index.d.ts
index 81a4eab0ed..9142dc9a6c 100644
--- a/sequelize/v3/index.d.ts
+++ b/sequelize/v3/index.d.ts
@@ -3819,8 +3819,8 @@ declare namespace sequelize {
          * Find a row that matches the query, or build (but don't save) the row if none is found.
          * The successfull result of the promise will be (instance, initialized) - Make sure to use .spread()
          */
-        findOrInitialize(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
-        findOrBuild(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+        findOrInitialize(options: FindOrInitializeOptions<TAttributes>): Promise<[TInstance, boolean]>;
+        findOrBuild(options: FindOrInitializeOptions<TAttributes>): Promise<[TInstance, boolean]>;
 
         /**
          * Find a row that matches the query, or build and save the row if none is found
@@ -3833,13 +3833,13 @@ declare namespace sequelize {
          * an instance of sequelize.TimeoutError will be thrown instead. If a transaction is created, a savepoint
          * will be created instead, and any unique constraint violation will be handled internally.
          */
-        findOrCreate(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+        findOrCreate(options: FindOrInitializeOptions<TAttributes>): Promise<[TInstance, boolean]>;
 
         /**
              * A more performant findOrCreate that will not work under a transaction (at least not in postgres)
              * Will execute a find call, if empty then attempt to create, if unique constraint then attempt to find again
              */
-        findCreateFind(options: FindCreateFindOptions<TAttributes>): Promise<TInstance>;
+        findCreateFind(options: FindCreateFindOptions<TAttributes>): Promise<[TInstance, boolean]>;
 
         /**
  * Insert or update a single row. An update will be executed if a row which matches the supplied values on
diff --git a/shipit-utils/index.d.ts b/shipit-utils/index.d.ts
new file mode 100644
index 0000000000..aec379f5f2
--- /dev/null
+++ b/shipit-utils/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for shipit-utils 1.4
+// Project: https://github.com/shipitjs/shipit-utils
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import shipit = require("shipit");
+
+type GruntOrShipit = typeof shipit | {};
+type EmptyCallback = () => void;
+
+export function equalValues(value: any[]): void;
+export function getShipit(gruntOrShipit: GruntOrShipit): typeof shipit;
+export function getShipit(gruntOrShipit: GruntOrShipit): typeof shipit;
+export function registerTask(gruntOrShipit: GruntOrShipit, name: string, dependenciesOrTask: string[] | EmptyCallback): typeof shipit;
+export function runTask(gruntOrShipit: {}): void;
diff --git a/shipit-utils/shipit-utils-tests.ts b/shipit-utils/shipit-utils-tests.ts
new file mode 100644
index 0000000000..81cb741054
--- /dev/null
+++ b/shipit-utils/shipit-utils-tests.ts
@@ -0,0 +1,11 @@
+import shipit = require("shipit");
+import utils = require("shipit-utils");
+
+var originalShipit = utils.getShipit(shipit);
+
+var task = () => {
+    return shipit.local("sleep 10s");
+};
+
+utils.registerTask(originalShipit, "myTask", task);
+utils.registerTask(originalShipit, "myTask", ["some", "other", "tasks"]);
diff --git a/shipit-utils/tsconfig.json b/shipit-utils/tsconfig.json
new file mode 100644
index 0000000000..d2fdb45d17
--- /dev/null
+++ b/shipit-utils/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "shipit-utils-tests.ts"
+  ]
+}
diff --git a/shipit-utils/tslint.json b/shipit-utils/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/shipit-utils/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/shipit/index.d.ts b/shipit/index.d.ts
new file mode 100644
index 0000000000..8c614f1627
--- /dev/null
+++ b/shipit/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for shipit-cli 1.5
+// Project: https://github.com/shipitjs/shipit
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as fs from "fs";
+import * as child_process from "child_process";
+
+declare namespace shipit {
+    type LocalOrRemoteCommand = (command: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void) => PromiseLike<ShipitLocal>;
+    type EmptyCallback = () => void;
+    type TaskExecution = (name: string, depsOrFn: string[] | EmptyCallback, fn: () => void) => any;
+
+    interface Options {
+        environment: string;
+        stderr: fs.WriteStream;
+        stdout: fs.WriteStream;
+    }
+
+    interface ShipitLocal {
+        child: child_process.ChildProcess;
+        stderr: fs.WriteStream;
+        stdout: fs.WriteStream;
+    }
+
+    interface Tasks {
+        [name: string]: Task;
+    }
+
+    interface Task {
+        blocking: boolean;
+        dep: string[];
+        fn: () => void;
+        name: string;
+    }
+
+    export function blTask(name: string, depsOrFn: string[] | EmptyCallback, fn?: () => void): any;
+    export function emit(name: string): any;
+    export function initConfig(config: {}): typeof shipit;
+    export function local(command: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
+    export function log(log: any): void;
+    export function log(...log: any[]): void;
+    export function on(name: string, callback: (e: any) => void): any;
+    export function remote(command: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
+    export function remoteCopy(src: string, dest: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
+    export function start(tasks: string | string[]): typeof shipit;
+    export function start(...tasks: string[]): typeof shipit;
+    export function task(name: string, depsOrFn: string[] | EmptyCallback, fn?: () => void): typeof shipit;
+
+    export var config: {};
+    export var domain: any;
+    export var doneCallback: any;
+    export var environment: string;
+    export var seq: any[];
+    export var tasks: Tasks;
+    export var isRunning: boolean;
+}
+
+//tslint:disable-next-line:export-just-namespace
+export = shipit;
+export as namespace shipit;
diff --git a/shipit/shipit-tests.ts b/shipit/shipit-tests.ts
new file mode 100644
index 0000000000..a256f87e07
--- /dev/null
+++ b/shipit/shipit-tests.ts
@@ -0,0 +1,50 @@
+import shipit = require("shipit");
+
+shipit.initConfig({
+    default: {
+        workspace: "/tmp/github-monitor",
+        deployTo: "/tmp/deploy_to",
+        repositoryUrl: "https://github.com/user/repo.git",
+        ignores: [".git", "node_modules"],
+        rsync: ["--del"],
+        keepReleases: 2,
+        key: "/path/to/key",
+        shallowClone: true
+    },
+    staging: {
+        servers: "user@myserver.com"
+    }
+});
+
+shipit.task("build", () => {
+  shipit.emit("built");
+});
+
+shipit.on("built", () => {
+  shipit.start("start-server");
+});
+
+shipit.task("pwd", () => {
+  return shipit.remote("pwd");
+});
+
+shipit.blTask("pwd", () => {
+  return shipit.remote("pwd");
+});
+
+shipit.start("task");
+shipit.start("task1", "task2");
+shipit.start(["task1", "task2"]);
+
+shipit.local("ls -lah", {cwd: "/tmp/deploy/workspace"}).then((res: any) => {
+  console.log(res.stdout);
+  console.log(res.stderr);
+});
+
+shipit.remote("ls -lah").then((res: any) => {
+  console.log(res[0].stdout);
+  console.log(res[0].stderr);
+});
+
+shipit.remoteCopy("/tmp/workspace", "/opt/web/myapp").then(() => {});
+shipit.log("hello %s", "world");
diff --git a/shipit/tsconfig.json b/shipit/tsconfig.json
new file mode 100644
index 0000000000..17049e7271
--- /dev/null
+++ b/shipit/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "shipit-tests.ts"
+  ]
+}
diff --git a/shipit/tslint.json b/shipit/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/shipit/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/simplemde/index.d.ts b/simplemde/index.d.ts
index 6c199f48a7..c78d4fb408 100644
--- a/simplemde/index.d.ts
+++ b/simplemde/index.d.ts
@@ -127,4 +127,7 @@ declare class SimpleMDE {
     static toggleFullScreen: (editor: SimpleMDE) => void;
     static undo: (editor: SimpleMDE) => void;
     static redo: (editor: SimpleMDE) => void;
-}
\ No newline at end of file
+}
+
+export = SimpleMDE;
+export as namespace SimpleMDE;
diff --git a/sip.js/index.d.ts b/sip.js/index.d.ts
new file mode 100644
index 0000000000..be01cd3682
--- /dev/null
+++ b/sip.js/index.d.ts
@@ -0,0 +1,332 @@
+// Type definitions for sip.js 0.7
+// Project: http://sipjs.com
+// Definitions by: Kir Dergachev <https://github.com/decyrus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare interface SIP {
+    UA: {
+        new (configuration?: sipjs.ConfigurationParameters): sipjs.UA;
+    };
+    URI: {
+        new (scheme?: string, user?: string, host?: string, port?: number, parameters?: string[], headers?: string[]): sipjs.URI;
+        parse(uri: string): sipjs.URI;
+    };
+    NameAddrHeader: {
+        new (uri: string | sipjs.URI, displayName: string, parameters: Array<{ key: string, value: string }>): sipjs.NameAddrHeader;
+        parse(name_addr_header: string): sipjs.NameAddrHeader;
+    };
+}
+
+declare namespace sipjs {
+
+    interface URI {
+        scheme?: string;
+        user?: string;
+        host?: string;
+        port?: number;
+
+        setParam(key: string, value?: string): void;
+        getParam(key: string): string;
+        hasParam(key: string): string;
+        deleteParam(key: string): string;
+        clearParams(): void;
+        setHeader(name: string, value: string): void;
+        getHeader(name: string): string[];
+        hasHeader(name: string): boolean;
+        deleteHeader(name: string): string[];
+        clearHeaders(): void;
+        clone(): URI;
+        toString(): string;
+    }
+
+    namespace UA.EventArgs {
+        interface ConnectedArgs { attempts: number; }
+        interface UnregisteredArgs { response: string; cause: string; }
+        interface RegistrationFailedArgs extends UnregisteredArgs { }
+    }
+
+    interface UA {
+        start(): void;
+        stop(): void;
+        register(options?: ExtraHeadersOptions): UA;
+        unregister(options?: UnregisterOptions): void;
+        isRegistered(): boolean;
+        isConnected(): boolean;
+        message(target: string | URI, body: string, options?: MessageOptions): Message;
+        subscribe(target: string | URI, event: string, options?: SubscribeOptions): Subscription;
+        invite(target: string | URI, element?: InviteOptions | HTMLAudioElement | HTMLVideoElement): Session;
+        request(method: string, target: string | URI, options?: RequestOptions): ClientContext;
+
+        on(name: 'connected', callback: (args: UA.EventArgs.ConnectedArgs) => void): void;
+        on(name: 'disconnected' | 'registered' | string, callback: () => void): void;
+        on(name: 'unregistered', callback: (args: UA.EventArgs.UnregisteredArgs) => void): void;
+        on(name: 'registrationFailed', callback: (args: UA.EventArgs.RegistrationFailedArgs) => void): void;
+        on(name: 'invite', callback: (session: Session) => void): void;
+        on(name: 'message', callback: (message: Message) => void): void;
+    }
+
+    namespace UA.C {
+        class supported {
+            REQUIRED: string;
+            SUPPORTED: string;
+            UNSUPPORTED: string;
+        }
+
+        class causes {
+            INVALID_TARGET: string;
+            CONNECTION_ERROR: string;
+            REQUEST_TIMEOUT: string;
+            SIP_FAILURE_CODE: string;
+        }
+    }
+
+    interface Session {
+        startTime?: Date;
+        endTime?: Date;
+        ua?: UA;
+        method?: string;
+        mediaHandler?: WebRTC.MediaHandler;
+        request?: IncomingRequest | OutgoingRequest;
+        localIdentity?: NameAddrHeader;
+        remoteIdentity?: NameAddrHeader;
+        data: ClientContext | ServerContext;
+
+        dtmf(tone: string | number, options?: Session.DtmfOptions): Session;
+        terminate(options?: Session.CommonOptions): Session;
+        bye(options?: Session.CommonOptions): Session;
+        getLocalStreams(): any[];
+        getRemoteStreams(): any[];
+        refer(target: string | Session, options?: ExtraHeadersOptions): Session;
+        mute(options?: ExtraHeadersOptions): void;
+        unmute(options?: ExtraHeadersOptions): void;
+        cancel(options?: Session.CommonOptions): void;
+        progress(options?: Session.ProgressOptions): void;
+        accept(options?: Session.AcceptOptions): void;
+        reject(options?: Session.CommonOptions): void;
+        reply(options?: Session.CommonOptions): void;
+        followRefer(callback: () => void): void;
+
+        on(name: 'progress', callback: (response: IncomingResponse) => void): void;
+        on(name: 'accepted', callback: (data: { code: number, response: IncomingResponse }) => void): void;
+        on(name: 'failed' | 'rejected', callback: (response: IncomingResponse, cause: string) => void): void;
+        on(name: 'terminated', callback: (message: IncomingResponse, cause: string) => void): void;
+        on(name: 'cancel' | string, callback: () => void): void;
+        on(name: 'replaced', callback: (newSession: Session) => void): void;
+        on(name: 'dtmf', callback: (request: IncomingRequest, dtmf: Session.DTMF) => void): void;
+        on(name: 'muted' | 'unmuted', callback: (data: Session.Muted) => void): void;
+        on(name: 'refer' | 'bye', callback: (request: IncomingRequest) => void): void;
+    }
+
+    namespace Session {
+        interface DtmfOptions extends ExtraHeadersOptions {
+            duration?: number;
+            interToneGap?: number;
+        }
+
+        interface CommonOptions extends ExtraHeadersOptions {
+            status_code?: number;
+            reason_phrase?: string;
+            body?: string;
+        }
+
+        interface ProgressOptions extends ExtraHeadersOptions {
+            rel100?: boolean;
+            media?: MediaConstraints;
+        }
+
+        interface AcceptOptions {
+            RTCConstraints?: any;
+            media?: MediaOptions;
+        }
+
+        interface DTMF extends Object {}
+
+        interface Muted {
+            audio?: boolean;
+            video?: boolean;
+        }
+    }
+
+    interface RenderHint {
+        remote?: Element;
+        local?: Element;
+    }
+
+    interface MediaConstraints {
+        audio: boolean;
+        video: boolean;
+    }
+
+    interface TurnServer {
+        urls?: string | string[];
+        username?: string;
+        password?: string;
+    }
+
+    namespace WebRTC {
+
+        interface Options {
+            stunServers?: string | string[];
+            turnServers?: TurnServer | TurnServer[];
+            RTCConstraints?: any;
+        }
+
+        type MediaHandlerFactory = (session: Session, options: Options) => MediaHandler;
+
+        class MediaHandler {
+            getLocalStreams(): any[];
+            getRemoteStreams(): any[];
+            render(renderHint: RenderHint): void;
+
+            on(name: 'userMediaRequest', callback: (constraints: MediaConstraints) => void): void;
+            on(name: 'addStream' | 'userMedia', callback: (stream: any) => void): void;
+            on(name: 'userMediaFailed', callback: (error: string) => void): void;
+            on(name: 'iceCandidate', callback: (candidate: any) => void): void;
+            on(name: 'iceGathering' | 'iceGatheringComplete' | 'iceConnection' | 'iceConnectionChecking' | 'iceConnectionConnected' | 'iceConnectionCompleted' | 'iceConnectionFailed' | 'iceConnectionDisconnected' | 'iceConnectionClosed' | string, callback: () => void): void;
+            on(name: 'dataChannel' | 'getDescription' | 'setDescription', callback: (sdpWrapper: { type: string, sdp: string }) => void): void;
+        }
+    }
+
+    /* Parameters */
+    interface ConfigurationParameters {
+        uri?: string;
+        wsServers?: string | string[] | Array<{ ws_uri: string; weigth: number }>;
+        allowLegacyNotifications?: boolean;
+        authenticationFactory?: WebRTC.MediaHandlerFactory;
+        authorizationUser?: string;
+        autostart?: boolean;
+        connectionRecoveryMaxInterval?: number;
+        connectionRecoveryMinInterval?: number;
+        displayName?: string;
+        hackCleanJitsiSdpImageattr?: boolean;
+        hackStripTcp?: boolean;
+        hackIpInContact?: boolean;
+        hackViaTcp?: boolean;
+        hackWssInTransport?: boolean;
+        iceCheckingTimeout?: number;
+        instanceId?: string;
+        log?: {
+            builtinEnabled?: boolean;
+            level?: number | string;
+            connector?: (level: string, category: string, label: string, content: string) => void;
+        };
+        mediaHandlerFactory?: WebRTC.MediaHandlerFactory;
+        noAnswerTimeout?: number;
+        password?: string;
+        register?: boolean;
+        registerExpires?: number;
+        registrarServer?: string;
+        rel100?: string;
+        replaces?: string;
+        stunServers?: string | string[];
+        traceSip?: boolean;
+        turnServers?: TurnServer | TurnServer[];
+        usePreloadedRoute?: boolean;
+        userAgentString?: string;
+        wsServerMaxReconnection?: number;
+        wsServerReconnectionTimeout?: number;
+    }
+
+    /* Options */
+    interface ExtraHeadersOptions {
+        extraHeaders?: string[];
+    }
+
+    interface UnregisterOptions extends ExtraHeadersOptions {
+        all?: boolean;
+    }
+
+    interface MessageOptions extends ExtraHeadersOptions {
+        contentType?: string;
+    }
+
+    interface SubscribeOptions extends ExtraHeadersOptions {
+        expires?: number;
+    }
+
+    interface MediaOptions {
+        constraints?: MediaConstraints;
+        stream?: any;
+        render?: RenderHint;
+    }
+
+    interface InviteOptions extends ExtraHeadersOptions {
+        media?: MediaOptions;
+        anonymous?: boolean;
+        rel100?: string;
+        inviteWithoutSdp?: boolean;
+        RTCConstraints?: any;
+    }
+
+    interface RequestOptions extends ExtraHeadersOptions {
+        body?: string;
+    }
+
+    /* Contexts */
+    interface Message extends ClientContext {
+        body: string;
+    }
+
+    interface Subscription extends ClientContext {
+        id: string;
+        state: string;
+        event: string;
+        dialog: string;
+        timers: {};
+        errorCodes: number[];
+        subscribe(): Subscription;
+        unsubscribe(): void;
+        close(): void;
+    }
+
+    /* Context */
+    interface Context {
+        ua: UA;
+        method: string;
+        request: OutgoingRequest;
+        localIdentity: NameAddrHeader;
+        remoteIdentity: NameAddrHeader;
+        data: {};
+        on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
+        on(name: 'notify', callback: (request: IncomingRequest) => void): void;
+        on(name: string, callback: () => void): void;
+    }
+
+    interface ClientContext extends Context {
+        cancel(options?: { status_code?: number, reason_phrase?: string }): ClientContext;
+    }
+
+    interface ServerContext extends Context {
+        progress(options?: Session.ProgressOptions): void;
+        accept(options?: Session.AcceptOptions): void;
+        reject(options?: Session.CommonOptions): void;
+        reply(options?: Session.CommonOptions): void;
+    }
+
+    /* Request */
+    interface Request extends Context {
+    }
+
+    interface IncomingRequest extends Request {
+    }
+
+    interface OutgoingRequest extends Request {
+    }
+
+    interface IncomingResponse extends Request {
+    }
+
+    interface IncomingMessage extends Request {
+    }
+
+    /* Header */
+    interface NameAddrHeader {
+        uri: string | URI;
+        displayName: string;
+
+        setParam(key: string, value?: string): void;
+        getParam(key: string): string;
+        deleteParam(key: string): string;
+        clearParams(): void;
+    }
+}
diff --git a/sip.js/sip.js-tests.ts b/sip.js/sip.js-tests.ts
new file mode 100644
index 0000000000..524caf1827
--- /dev/null
+++ b/sip.js/sip.js-tests.ts
@@ -0,0 +1,99 @@
+declare var sip: SIP;
+
+let ua: sipjs.UA = new sip.UA();
+
+const mediaHandler = (session: sipjs.Session, options: sipjs.WebRTC.Options) => new sipjs.WebRTC.MediaHandler();
+const logConnector = (level: string, category: string, label: string, content: string) => null;
+
+const uaWithConfig: sipjs.UA = new sip.UA({
+    uri: "wss://uri",
+    wsServers: ["s1", "s2"],
+    allowLegacyNotifications: true,
+    authenticationFactory: mediaHandler,
+    authorizationUser: "user",
+    autostart: true,
+    connectionRecoveryMaxInterval: 1,
+    connectionRecoveryMinInterval: 1,
+    displayName: "name",
+    hackCleanJitsiSdpImageattr: true,
+    hackStripTcp: true,
+    hackIpInContact: true,
+    hackViaTcp: true,
+    hackWssInTransport: true,
+    iceCheckingTimeout: 1,
+    instanceId: "id",
+    log: {
+        builtinEnabled: true,
+        level: 1,
+        connector: logConnector
+    },
+    mediaHandlerFactory: mediaHandler,
+    noAnswerTimeout: 1,
+    password: "",
+    register: true,
+    registerExpires: 1,
+    registrarServer: "sip:registrar.mydomain.com",
+    rel100: "",
+    replaces: "",
+    stunServers: ["", ""],
+    turnServers: [
+        {
+            password: "",
+            username: "",
+            urls: ["", ""]
+        }
+    ],
+    usePreloadedRoute: true,
+    userAgentString: "",
+    wsServerMaxReconnection: 1,
+    wsServerReconnectionTimeout: 1
+});
+
+ua.start();
+ua.stop();
+
+ua.register();
+ua = ua.register({ extraHeaders: [""] });
+
+ua.unregister()
+ua.unregister({ extraHeaders: [""], all: true });
+
+const isConnected: boolean = ua.isConnected();
+const isRegistered: boolean = ua.isRegistered();
+
+const message: sipjs.Message = ua.message("", "", { contentType: "" });
+
+ua.subscribe("", "", { expires: 1, extraHeaders: [""] });
+const subscription: sipjs.Subscription = ua.subscribe(new sip.URI(), "", { expires: 1, extraHeaders: [""] });
+
+let session = ua.invite("", new HTMLVideoElement());
+
+const inviteOptions: sipjs.InviteOptions = {
+    media: {
+        constraints: { audio: true, video: false },
+        stream: new MediaStream(),
+        render: { remote: new Element(), local: new Element() },
+    },
+    anonymous: true,
+    rel100: "",
+    inviteWithoutSdp: true,
+    RTCConstraints: {}
+}
+
+session = ua.invite("", inviteOptions);
+
+ua.on('connected', (args: sipjs.UA.EventArgs.ConnectedArgs) => { });
+ua.on('disconnected', () => { });
+ua.on('registered', () => { });
+ua.on('unregistered', (args: sipjs.UA.EventArgs.UnregisteredArgs) => { });
+ua.on('registrationFailed', (args: sipjs.UA.EventArgs.RegistrationFailedArgs) => { });
+ua.on('invite', (session: sipjs.Session) => {
+    session.on('progress', (response) => {
+    });
+    session.on('accepted', (response) => {
+    });
+    session.on('rejected', (response) => {
+    });
+
+});
+ua.on('message', (message: sipjs.Message) => { });
diff --git a/sip.js/tsconfig.json b/sip.js/tsconfig.json
new file mode 100644
index 0000000000..b6532e5674
--- /dev/null
+++ b/sip.js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sip.js-tests.ts"
+    ]
+}
diff --git a/sip.js/tslint.json b/sip.js/tslint.json
new file mode 100644
index 0000000000..105f5736e6
--- /dev/null
+++ b/sip.js/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}
diff --git a/steed/index.d.ts b/steed/index.d.ts
new file mode 100644
index 0000000000..ba4b199999
--- /dev/null
+++ b/steed/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for steed 1.1
+// Project: https://github.com/mcollina/steed#readme
+// Definitions by: Paul Isache <https://github.com/Paul-Isache>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace steed {
+    interface Dictionary<T> { [key: string]: T; }
+    interface ErrorCallback<T> { (err?: T): void; }
+
+    interface SteedResultCallback<T, E> { (err: E, result: T): void; }
+    interface SteedResultArrayCallback<T, E> { (err: E, results: T[]): void; }
+    interface SteedResultObjectCallback<T, E> { (err: E, results: Dictionary<T>): void; }
+
+    interface SteedWorker<T, E> { (task: T, callback: ErrorCallback<E>): void; }
+    interface SteedIterator<T, E> { (item: T, callback: ErrorCallback<E>): void; }
+    interface SteedResultIterator<T, R, E> { (item: T, callback: SteedResultCallback<R, E>): void; }
+    interface SteedFunction<T, E> { (callback: (err?: E, result?: T) => void): void; }
+
+    interface SteedQueue<T> {
+        push<E>(task: T | T[], callback?: ErrorCallback<E> | SteedResultCallback<T, E>): void;
+        unshift<E>(task: T | T[], callback?: ErrorCallback<E>): void;
+        pause(): void;
+        resume(): void;
+        idle(): boolean;
+        length(): number;
+        kill(): void;
+        concurrency: number;
+        drain: () => any;
+        empty: () => any;
+        saturated: () => any;
+    }
+
+    interface Steed {
+        parallel<T, E>(tasks: Array<SteedFunction<T, E>>, callback?: SteedResultArrayCallback<T, E>): void;
+        parallel<T, E>(tasks: Dictionary<SteedFunction<T, E>>, callback?: SteedResultObjectCallback<T, E>): void;
+        series<T, E>(tasks: Array<SteedFunction<T, E>>, callback?: SteedResultArrayCallback<T, E>): void;
+        series<T, E>(tasks: Dictionary<SteedFunction<T, E>>, callback?: SteedResultObjectCallback<T, E>): void;
+        waterfall<T, E>(tasks: Function[], callback?: SteedResultCallback<T, E>): void;
+        each<T, E>(arr: T[] | Dictionary<T>, iterator: SteedIterator<T, E>, callback?: ErrorCallback<E>): void;
+        eachSeries: typeof steed.each;
+        map<T, R, E>(arr: T[] | Dictionary<T>, iterator: SteedResultIterator<T, R, E>, callback?: SteedResultArrayCallback<R, E>): void;
+        mapSeries: typeof steed.map;
+        queue<T, E>(worker: SteedWorker<T, E>, concurrency?: number): SteedQueue<T>;
+        queue<T, R, E>(worker: SteedResultIterator<T, R, E>, concurrency?: number): SteedQueue<T>;
+    }
+}
+
+declare const steed: steed.Steed;
+
+export = steed;
diff --git a/steed/steed-tests.ts b/steed/steed-tests.ts
new file mode 100644
index 0000000000..685654cc52
--- /dev/null
+++ b/steed/steed-tests.ts
@@ -0,0 +1,328 @@
+/// <reference types="node" />
+
+import steed = require('steed')
+
+declare var path: {
+    exists: (path: string, callback?: (error: Error, exists: boolean) => any) => void;
+};
+
+function funcStringCbErrBoolean(v: string, cb: (error: Error, res: boolean) => void) { }
+function callback() { }
+
+steed.parallel([
+    function () { },
+    function () { }
+], callback);
+
+steed.series([
+    function () { },
+    function () { }
+]);
+
+var data: any[] = [];
+function steedProcess(item: any, callback: (error: Error, result: any) => void) { }
+steed.map(data, steedProcess, function (error, results) {
+    console.log(results);
+});
+
+var openFiles = ['file1', 'file2'];
+
+var saveFile = function (file: string, cb: (error: Error) => void) { }
+steed.each(openFiles, saveFile, function (error: Error) { });
+steed.eachSeries(openFiles, saveFile, function (error: Error) { });
+
+// Control Flow //
+
+steed.series([
+    function (callback) {
+        callback(undefined, 'one');
+    },
+    function (callback) {
+        callback(undefined, 'two');
+    },
+],
+    function (error, results) { });
+
+steed.series<string, Error>([
+    function (callback) {
+        callback(undefined, 'one');
+    },
+    function (callback) {
+        callback(undefined, 'two');
+    },
+],
+    function (error, results) { });
+
+steed.series({
+    one: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 1);
+        }, 200);
+    },
+    two: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 2);
+        }, 100);
+    },
+},
+    function (error, results) { });
+
+steed.series<number, Error>({
+    one: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 1);
+        }, 200);
+    },
+    two: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 2);
+        }, 100);
+    },
+},
+    function (error, results) { });
+
+steed.parallel([
+    function (callback) {
+        setTimeout(function () {
+            callback(undefined, 'one');
+        }, 200);
+    },
+    function (callback) {
+        setTimeout(function () {
+            callback(undefined, 'two');
+        }, 100);
+    },
+],
+    function (error, results) { });
+
+steed.parallel<string, Error>([
+    function (callback) {
+        setTimeout(function () {
+            callback(undefined, 'one');
+        }, 200);
+    },
+    function (callback) {
+        setTimeout(function () {
+            callback(undefined, 'two');
+        }, 100);
+    },
+],
+    function (error, results) { });
+
+
+steed.parallel({
+    one: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 1);
+        }, 200);
+    },
+    two: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 2);
+        }, 100);
+    },
+},
+    function (error, results) { });
+
+steed.parallel<number, Error>({
+    one: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 1);
+        }, 200);
+    },
+    two: function (callback) {
+        setTimeout(function () {
+            callback(undefined, 2);
+        }, 100);
+    },
+},
+    function (error, results) { });
+
+function whileFn(callback: any) {
+    count++;
+    setTimeout(callback, 1000);
+}
+
+function whileTest() { return count < 5; }
+var count = 0;
+
+steed.waterfall([
+    function (callback: any) {
+        callback(null, 'one', 'two');
+    },
+    function (arg1: any, arg2: any, callback: any) {
+        callback(null, 'three');
+    },
+    function (arg1: any, callback: any) {
+        callback(null, 'done');
+    }
+], function (error, result) { });
+
+
+var q = steed.queue<any, Error>(function (task: any, callback: () => void) {
+    console.log('hello ' + task.name);
+    callback();
+}, 2);
+
+
+q.drain = function () {
+    console.log('all items have been processed');
+}
+
+q.push({ name: 'foo' });
+
+q.push({ name: 'bar' }, function (err) {
+    console.log('finished processing bar');
+});
+
+q.push([{ name: 'baz' }, { name: 'bay' }, { name: 'bax' }], function (error: Error) {
+    console.log('finished processing bar');
+});
+
+q.unshift({ name: 'foo' });
+
+q.unshift({ name: 'bar' }, function (err) {
+    console.log('finished processing bar');
+});
+
+q.unshift([{ name: 'baz' }, { name: 'bay' }, { name: 'bax' }], function (error: Error) {
+    console.log('finished processing bar');
+});
+
+var qLength: number = q.length();
+var qIsIdle: boolean = q.idle();
+
+q.saturated = function () {
+    console.log('queue is saturated.');
+}
+
+q.empty = function () {
+    console.log('queue is empty.');
+}
+
+q.drain = function () {
+    console.log('queue was drained.');
+}
+
+q.pause();
+q.resume();
+q.kill();
+
+// tests for strongly typed tasks
+var q2 = steed.queue<string, Error>(function (task: string, callback: () => void) {
+    console.log('Task: ' + task);
+    callback();
+}, 1);
+
+q2.push('task1');
+
+q2.push('task2', function (error) {
+    console.log('Finished tasks');
+});
+
+q2.push(['task3', 'task4', 'task5'], function (error: Error) {
+    console.log('Finished tasks');
+});
+
+q2.unshift('task1');
+
+q2.unshift('task2', function (error) {
+    console.log('Finished tasks');
+});
+
+q2.unshift(['task3', 'task4', 'task5'], function (error: Error) {
+    console.log('Finished tasks');
+});
+
+steed.parallel([
+    function (callback: (error: Error, val: string) => void) { },
+    function (callback) { }
+],
+    function (error: Error, results: Array<string>) {
+        steed.series([
+            function (callback) { },
+            function email_link(callback) { }
+        ]);
+    });
+
+// each
+
+steed.each<number, Error>({
+    "a": 1,
+    "b": 2
+}, function (val: number, next: steed.ErrorCallback<Error>): void {
+
+    setTimeout(function (): void {
+
+        console.log(`steed.each: ${val}`);
+
+        next();
+
+    }, 500);
+
+}, function (err?: Error): void {
+
+    console.log("steed.each: done.");
+
+});
+
+steed.eachSeries<number, Error>({
+    "a": 1,
+    "b": 2
+}, function (val: number, next: steed.ErrorCallback<Error>): void {
+
+    setTimeout(function (): void {
+
+        console.log(`steed.eachSeries: ${val}`);
+
+        next();
+
+    }, 500);
+
+}, function (err?: Error): void {
+
+    console.log("steed.eachSeries: done.");
+
+});
+
+// map
+
+steed.map<number, string, Error>({
+    "a": 1,
+    "b": 2,
+    "c": 3
+}, function (val: number, next: steed.SteedResultCallback<string, Error>): void {
+
+    setTimeout(function (): void {
+
+        console.log(`steed.map: ${val}`);
+
+        next(undefined as any, val.toString());
+
+    }, 500);
+
+}, function (error: Error, results: string[]): void {
+
+    console.log("steed.map: done with results", results);
+
+});
+
+steed.mapSeries<number, string, Error>({
+    "a": 1,
+    "b": 2,
+    "c": 3
+}, function (val: number, next: steed.SteedResultCallback<string, Error>): void {
+
+    setTimeout(function (): void {
+
+        console.log(`steed.mapSeries: ${val}`);
+
+        next(undefined as any, val.toString());
+
+    }, 500);
+
+}, function (error: Error, results: string[]): void {
+
+    console.log("steed.mapSeries: done with results", results);
+
+});
\ No newline at end of file
diff --git a/steed/tsconfig.json b/steed/tsconfig.json
new file mode 100644
index 0000000000..ec8377c527
--- /dev/null
+++ b/steed/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "steed-tests.ts"
+    ]
+}
diff --git a/stripe/index.d.ts b/stripe/index.d.ts
index a7d887c747..2563af9882 100644
--- a/stripe/index.d.ts
+++ b/stripe/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for stripe 0.0
+// Type definitions for stripe 2.x
 // Project: https://stripe.com/
-// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>, Amrit Kahlon <https://github.com/amritk/>, Adam Cmiel <https://github.com/adamcmiel>
+// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>, Amrit Kahlon <https://github.com/amritk/>, Adam Cmiel <https://github.com/adamcmiel>, Justin Leider <https://github.com/jleider>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare const Stripe: StripeStatic;
@@ -12,13 +12,13 @@ interface StripeStatic {
     validateExpiry(month: string, year: string): boolean;
     validateCVC(cardCVC: string): boolean;
     cardType(cardNumber: string): StripeCardDataBrand;
-    getToken(token: string, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
-    card: StripeCardData;
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
+    getToken(token: string, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
+    card: StripeCard;
+    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
     bankAccount: StripeBankAccount;
 }
 
-interface StripeTokenData {
+interface StripeCardTokenData {
     number: string;
     exp_month?: number;
     exp_year?: number;
@@ -35,7 +35,6 @@ interface StripeTokenData {
 
 interface StripeTokenResponse {
     id: string;
-    card: StripeCardData;
     created: number;
     livemode: boolean;
     object: string;
@@ -44,6 +43,10 @@ interface StripeTokenResponse {
     error?: StripeError;
 }
 
+interface StripeCardTokenResponse extends StripeTokenResponse {
+    card: StripeCard;
+}
+
 interface StripeError {
     type: string;
     code: string;
@@ -53,7 +56,7 @@ interface StripeError {
 
 type StripeCardDataBrand = 'Visa' | 'American Express' | 'MasterCard' | 'Discover' | 'JCB' | 'Diners Club' | 'Unknown';
 
-interface StripeCardData {
+interface StripeCard {
     object: string;
     last4: string;
     exp_month: number;
@@ -67,7 +70,10 @@ interface StripeCardData {
     address_zip?: string;
     address_country?: string;
     brand?: StripeCardDataBrand;
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
+    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
+    validateCardNumber(cardNumber: string): boolean;
+    validateExpiry(month: string, year: string): boolean;
+    validateCVC(cardCVC: string): boolean;
 }
 
 interface StripeBankAccount {
@@ -85,8 +91,7 @@ interface StripeBankTokenParams {
     account_holder_type: string;
 }
 
-interface StripeBankTokenResponse {
-    id: string;
+interface StripeBankTokenResponse extends StripeTokenResponse {
     bank_account: {
         country: string;
         bank_name: string;
@@ -94,12 +99,6 @@ interface StripeBankTokenResponse {
         validated: boolean;
         object: string;
     };
-    created: number;
-    livemode: boolean;
-    type: string;
-    object: string;
-    used: boolean;
-    error?: StripeError;
 }
 
 interface StripeApplePay {
@@ -134,7 +133,7 @@ interface StripeApplePayLineItem {
 }
 
 interface StripeApplePaySessionResult {
-    token: StripeTokenResponse;
+    token: StripeCardTokenResponse;
     shippingContact?: StripeApplePayPaymentContact;
     shippingMethod?: StripeApplePayShippingMethod;
 }
diff --git a/stripe/stripe-tests.ts b/stripe/stripe-tests.ts
index 44aa09d216..56e6343f5c 100644
--- a/stripe/stripe-tests.ts
+++ b/stripe/stripe-tests.ts
@@ -1,4 +1,4 @@
-function success(card: StripeCardData) {
+function success(card: StripeCard) {
     console.log(card.brand && card.brand.toString());
 }
 
@@ -6,7 +6,7 @@ const cardNumber = '4242424242424242';
 
 const isValid = Stripe.validateCardNumber(cardNumber);
 if (isValid) {
-    const tokenData: StripeTokenData = {
+    const tokenData: StripeCardTokenData = {
         number: cardNumber,
         exp_month: 1,
         exp_year: 2100,
diff --git a/validator/index.d.ts b/validator/index.d.ts
index 0eae66c3c9..74bf331ed6 100644
--- a/validator/index.d.ts
+++ b/validator/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for validator.js v5.7.0
+// Type definitions for validator.js v6.2
 // Project: https://github.com/chriso/validator.js
-// Definitions by: tgfjt <https://github.com/tgfjt>, Ilya Mochalov <https://github.com/chrootsu>, Ayman Nedjmeddine <https://github.com/IOAyman>, Louy Alakkad <https://github.com/louy>
+// Definitions by: tgfjt <https://github.com/tgfjt>, Ilya Mochalov <https://github.com/chrootsu>, Ayman Nedjmeddine <https://github.com/IOAyman>, Louy Alakkad <https://github.com/louy>, Kacper Polak <https://github.com/kacepe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
@@ -276,6 +276,9 @@ declare namespace ValidatorJS {
   interface IsIntOptions {
     min?: number;
     max?: number;
+    allow_leading_zeroes?: boolean;
+    lt?: number;
+    gt?: number;
   }
 
   // options for IsLength
diff --git a/vis/index.d.ts b/vis/index.d.ts
index 92b6ea6a08..3ee00ba03a 100644
--- a/vis/index.d.ts
+++ b/vis/index.d.ts
@@ -1497,6 +1497,7 @@ export interface Data {
 }
 
 export interface Node {
+  group?: string;
   id?: IdType;
   label?: string;
   x?: number;
diff --git a/webdriverio/index.d.ts b/webdriverio/index.d.ts
index 8f22d2e5aa..dff87053d7 100644
--- a/webdriverio/index.d.ts
+++ b/webdriverio/index.d.ts
@@ -395,36 +395,22 @@ declare namespace WebdriverIO {
         ): Client<P>;
         getHTML<P>(includeSelectorTag: boolean): Client<P>;
 
-        getLocation(selector?: string): Size;
-        getLocation(selector: string, axis: string): number;
-        getLocation(axis: string): number;
+        getLocation(axis: Axis): number;
+        getLocation<P>(axis: Axis): Client<P>;
+        getLocation(selector?: string): Location;
         getLocation<P>(selector?: string): Client<P>;
-        getLocation<P>(
-            selector: string,
-            axis: string
-        ): Client<P>;
-        getLocation<P>(axis: string): Client<P>;
+        getLocation(selector: string, axis: Axis): number;
+        getLocation<P>(selector: string, axis: Axis): Client<P>;
 
-        getLocationInView(selector: string): Size;
-        getLocationInView(selector: string): Size[];
-        getLocationInView(): Size;
-        getLocationInView(): Size[];
-        getLocationInView(
-            selector: string,
-            axis: string
-        ): number;
-        getLocationInView(
-            selector: string,
-            axis: string
-        ): number[];
-        getLocationInView(axis: string): number;
-        getLocationInView(axis: string): number[];
+        getLocationInView(axis: Axis): number;
+        getLocationInView(axis: Axis): number[];
+        getLocationInView<P>(axis: Axis): Client<P>;
+        getLocationInView(selector?: string): Location;
+        getLocationInView(selector?: string): Location[];
         getLocationInView<P>(selector?: string): Client<P>;
-        getLocationInView<P>(
-            selector: string,
-            axis: string
-        ): Client<P>;
-        getLocationInView<P>(axis: string): Client<P>;
+        getLocationInView(selector: string, axis: Axis): number;
+        getLocationInView(selector: string, axis: Axis): number[];
+        getLocationInView<P>(selector: string, axis: Axis): Client<P>;
 
         getSource(): Client<string>;
         getSource<P>(): Client<P>;
@@ -471,7 +457,7 @@ declare namespace WebdriverIO {
         value: any;
     }
 
-    export interface Location {
+    export interface GeoLocation {
         latitude: number;
         longitude: number;
         altitude: number;
@@ -1027,6 +1013,8 @@ declare namespace WebdriverIO {
         switchTab<P>(windowHandle?: string): Client<P>;
     }
 
+    export type Axis = "x" | "y";
+
     export interface Options {
         protocol: string;
         waitforTimeout: number;