diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7ebdcc514f..44f0d8e9a0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -401,6 +401,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](egg.js/egg.js.d.ts) [Egg.js](https://github.com/mikeflynn/egg.js) by [Markus Peloso](https://github.com/ToastHawaii)
 * [:link:](ejs-locals/ejs-locals.d.ts) [ejs-locals](https://github.com/randometc/ejs-locals) by [jt000](https://github.com/jt000)
 * [:link:](ejs/ejs.d.ts) [ejs.js](http://ejs.co) by [Ben Liddicott](https://github.com/benliddicott/DefinitelyTyped)
+* [:link:](elasticsearch/elasticsearch.d.ts) [elasticsearch](https://www.elastic.co) by [Casper Skydt](https://github.com/CasperSkydt/DefinitelyTyped), [Blake Smith](https://github.com/bfsmith/DefinitelyTyped)
 * [:link:](jquery.elang/jquery.elang.d.ts) [eLang](https://github.com/sumegizoltan/ELang) by [Zoltan Sumegi](https://github.com/sumegizoltan)
 * [:link:](github-electron/github-electron.d.ts) [Electron](http://electron.atom.io) by [jedmao](https://github.com/jedmao), [rhysd](https://rhysd.github.io), [Milan Burda](https://github.com/miniak)
 * [:link:](electron-builder/electron-builder.d.ts) [electron-builder](https://github.com/loopline-systems/electron-builder) by [Maxime LUCE](https://github.com/SomaticIT)
diff --git a/amcharts/AmCharts.d.ts b/amcharts/AmCharts.d.ts
index bbd732bb1c..4f5dbe90f7 100644
--- a/amcharts/AmCharts.d.ts
+++ b/amcharts/AmCharts.d.ts
@@ -27,6 +27,9 @@ declare namespace AmCharts {
     /** Clears all the charts on page, removes listeners and intervals. */
     function clear();
     
+    /** Handle ready event */
+    function ready(Function): void;
+    
     /** Create chart by params. */
     function makeChart(selector: string, params: any, delay?: number): AmChart;
     
diff --git a/angular-es/angular-es.d.ts b/angular-es/angular-es.d.ts
index 10979ae15c..0972b42da0 100644
--- a/angular-es/angular-es.d.ts
+++ b/angular-es/angular-es.d.ts
@@ -45,12 +45,12 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Component: (component: iComponent) => ngESDecorator;
+    function Component(component: iComponent): ngESDecorator;
 
     /**
      * Register config block
      */
-    var Config: () => ngESDecorator;
+    function Config(): ngESDecorator;
 
     /**
      * Register constant
@@ -59,7 +59,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Constant: (name: string) => ngESDecorator;
+    function Constant(name: string): ngESDecorator;
 
     /**
      * Register controller
@@ -68,7 +68,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Controller: (name: string) => ngESDecorator;
+    function Controller(name: string): ngESDecorator;
 
     /**
      * Register decorator
@@ -77,7 +77,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Decorator: (name: string) => ngESDecorator;
+    function Decorator(name: string): ngESDecorator;
 
     /**
      * Register directive
@@ -86,7 +86,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Directive: (name: string) => ngESDecorator;
+    function Directive(name: string): ngESDecorator;
 
     /**
      * Register factory
@@ -95,7 +95,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Factory: (name: string) => ngESDecorator;
+    function Factory(name: string): ngESDecorator;
 
     /**
      * Register filter
@@ -104,7 +104,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Filter: (name: string) => ngESDecorator;
+    function Filter(name: string): ngESDecorator;
 
     /**
      * Add $inject property to target
@@ -113,7 +113,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Inject: (...dependencies: Array<string>) => ngESDecorator;
+    function Inject(...dependencies: Array<string>): ngESDecorator;
 
     /**
      * Inject dependencies as properties to target
@@ -122,7 +122,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var InjectAsProperty: (...dependencies: Array<string>) => ngESDecorator;
+    function InjectAsProperty(...dependencies: Array<string>): ngESDecorator;
 
     /**
      * Attach target to the specified module
@@ -131,7 +131,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Module: (name: string) => ngESDecorator;
+    function Module(name: string): ngESDecorator;
 
     /**
      * Register provider
@@ -140,14 +140,14 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Provider: (name: string) => ngESDecorator;
+    function Provider(name: string): ngESDecorator;
 
     /**
      * Register run block
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Run: () => ngESDecorator;
+    function Run(): ngESDecorator;
 
     /**
      * Register service
@@ -156,7 +156,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Service: (name: string) => ngESDecorator;
+    function Service(name: string): ngESDecorator;
 
     /**
      * Register value
@@ -165,7 +165,7 @@ declare module 'angular-es' {
      *
      * @returns {ngESDecorator} - decorated class
      */
-    var Value: (name: string) => ngESDecorator;
+    function Value(name: string): ngESDecorator;
 
     export {
         Component,
diff --git a/angular-jwt/angular-jwt-tests.ts b/angular-jwt/angular-jwt-tests.ts
index 3a6b7d6bf1..818899e829 100644
--- a/angular-jwt/angular-jwt-tests.ts
+++ b/angular-jwt/angular-jwt-tests.ts
@@ -15,3 +15,18 @@ var $jwtInterceptor: ng.jwt.IJwtInterceptor;
 $jwtInterceptor.tokenGetter = () => {
     return expToken;
 }
+
+
+var authManager: ng.jwt.IAuthManagerServiceProvider;
+
+// Indicate the user is authenticated
+authManager.authenticate();
+
+// Indicate the user is unauthenticated
+authManager.unauthenticate();
+
+// Keep the user authenticated
+authManager.checkAuthOnRefresh();
+
+// Redirect the user on unauthorized requests
+authManager.redirectWhenUnauthenticated();
\ No newline at end of file
diff --git a/angular-jwt/angular-jwt.d.ts b/angular-jwt/angular-jwt.d.ts
index eb02cf24df..d1f9eb085f 100644
--- a/angular-jwt/angular-jwt.d.ts
+++ b/angular-jwt/angular-jwt.d.ts
@@ -27,4 +27,11 @@ declare namespace angular.jwt {
     interface IJwtInterceptor {
         tokenGetter(...params : any[]): string;
     }
+
+    interface IAuthManagerServiceProvider {
+        authenticate(): void;
+        unauthenticate(): void;
+        checkAuthOnRefresh(): void;
+        redirectWhenUnauthenticated(): void;
+    }
 }
diff --git a/angular-material/angular-material-tests.ts b/angular-material/angular-material-tests.ts
index 4464c599e3..c3ebcbaf99 100644
--- a/angular-material/angular-material-tests.ts
+++ b/angular-material/angular-material-tests.ts
@@ -127,15 +127,30 @@ myApp.controller('SidenavController', ($scope: ng.IScope, $mdSidenav: ng.materia
         instance.isOpen();
         instance.isLockedOpen();
     });
+
+    $scope['onClose'] = $mdSidenav(componentId).onClose(() => {});
 });
 
 myApp.controller('ToastController', ($scope: ng.IScope, $mdToast: ng.material.IToastService) => {
     $scope['openToast'] = () => $mdToast.show($mdToast.simple().textContent('Hello!'));
+
+    $scope['customToast'] = () => {
+        var options = {
+            hideDelay: 3000,
+            position: 'top right',
+            controller  : 'ToastCtrl',
+            templateUrl : 'toast-template.html',
+            toastClass: 'my-class'
+        };
+
+        $mdToast.show(options);
+    }
 });
 
 myApp.controller('PanelController', ($scope: ng.IScope, $mdPanel: ng.material.IPanelService) => {
     $scope['createPanel'] = () => {
         var config = {
+            id: 'myPanel',
             template: '<h1>Hello!</h1>',
             hasBackdrop: true,
             disableParentScroll: true,
diff --git a/angular-material/angular-material.d.ts b/angular-material/angular-material.d.ts
index 23da7bceb2..66852586da 100644
--- a/angular-material/angular-material.d.ts
+++ b/angular-material/angular-material.d.ts
@@ -22,7 +22,7 @@ declare namespace angular.material {
         clickOutsideToClose?: boolean;
         disableBackdrop?: boolean;
         escapeToClose?: boolean;
-        resolve?: {[index: string]: angular.IPromise<any>};
+        resolve?: {[index: string]: () => angular.IPromise<any>};
         controllerAs?: string;
         parent?: Function|string|Object; // default: root node
         disableParentScroll?: boolean; // default: true
@@ -53,7 +53,7 @@ declare namespace angular.material {
         controller(controller?: string|Function): T;
         locals(locals?: {[index: string]: any}): T;
         bindToController(bindToController?: boolean): T; // default: false
-        resolve(resolve?: {[index: string]: angular.IPromise<any>}): T;
+        resolve(resolve?: {[index: string]: () => angular.IPromise<any>}): T;
         controllerAs(controllerAs?: string): T;
         parent(parent?: string|Element|JQuery): T; // default: root node
         onComplete(onComplete?: Function): T;
@@ -91,7 +91,7 @@ declare namespace angular.material {
         controller?: string|Function;
         locals?: {[index: string]: any};
         bindToController?: boolean; // default: false
-        resolve?: {[index: string]: angular.IPromise<any>}
+        resolve?: {[index: string]: () => angular.IPromise<any>}
         controllerAs?: string;
         parent?: string|Element|JQuery; // default: root node
         onShowing?: Function;
@@ -132,6 +132,7 @@ declare namespace angular.material {
         close(): angular.IPromise<void>;
         isOpen(): boolean;
         isLockedOpen(): boolean;
+        onClose(onClose: Function): void;
     }
 
     interface ISidenavService {
@@ -162,10 +163,11 @@ declare namespace angular.material {
         preserveScope?: boolean; // default: false
         hideDelay?: number; // default (ms): 3000
         position?: string; // any combination of 'bottom'/'left'/'top'/'right'/'fit'; default: 'bottom left'
+        toastClass?: string;
         controller?: string|Function;
         locals?: {[index: string]: any};
         bindToController?: boolean; // default: false
-        resolve?: {[index: string]: angular.IPromise<any>}
+        resolve?: {[index: string]: () => angular.IPromise<any>}
         controllerAs?: string;
         parent?: string|Element|JQuery; // default: root node
     }
@@ -291,13 +293,14 @@ declare namespace angular.material {
     }
 
     interface IPanelConfig {
+        id?: string;
         template?: string;
         templateUrl?: string;
         controller?: string|Function;
         controllerAs?: string;
         bindToController?: boolean; // default: true
         locals?: {[index: string]: any};
-        resolve?: {[index: string]: angular.IPromise<any>}
+        resolve?: {[index: string]: () => angular.IPromise<any>}
         attachTo?: string|JQuery|Element;
         propagateContainerEvents?: boolean;
         panelClass?: string;
diff --git a/angular-ui-scroll/angular-ui-scroll.d.ts b/angular-ui-scroll/angular-ui-scroll.d.ts
index 168c6ba271..5f24c8ec38 100644
--- a/angular-ui-scroll/angular-ui-scroll.d.ts
+++ b/angular-ui-scroll/angular-ui-scroll.d.ts
@@ -42,9 +42,10 @@ declare namespace angular.ui {
          */
         topVisibleScope: ng.IRepeatScope;
         /**
-         * calling this method reinitializes and reloads the scroller content.
+         * calling this method reinitializes and reloads the scroller content. 
+         * @param startIndex is an integer indicating what item index the scroller will use to start the load process.
          */
-        reload(): void;
+        reload(startIndex?: number): void;
         /**
          * Replaces the item in the buffer at the given index with the new items.
          *
diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts
index 441a7e1d3d..f7e803c1c8 100644
--- a/angularjs/angular-resource.d.ts
+++ b/angularjs/angular-resource.d.ts
@@ -42,15 +42,20 @@ declare namespace angular.resource {
         (url: string, paramDefaults?: any,
             /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
              where deleteDescriptor : IActionDescriptor */
-            actions?: any, options?: IResourceOptions): IResourceClass<IResource<any>>;
+            actions?: IActionHash, options?: IResourceOptions): IResourceClass<IResource<any>>;
         <T, U>(url: string, paramDefaults?: any,
             /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
              where deleteDescriptor : IActionDescriptor */
-            actions?: any, options?: IResourceOptions): U;
+            actions?: IActionHash, options?: IResourceOptions): U;
         <T>(url: string, paramDefaults?: any,
             /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
              where deleteDescriptor : IActionDescriptor */
-            actions?: any, options?: IResourceOptions): IResourceClass<T>;
+            actions?: IActionHash, options?: IResourceOptions): IResourceClass<T>;
+    }
+    
+    // Hash of action descriptors allows custom action names
+    interface IActionHash {
+        [action: string]: IActionDescriptor
     }
 
     // Just a reference to facilitate describing new actions
@@ -186,6 +191,12 @@ declare namespace angular {
         /** creating a resource service factory */
         factory(name: string, resourceServiceFactoryFunction: angular.resource.IResourceServiceFactoryFunction<any>): IModule;
     }
+    
+    namespace auto {
+    	interface IInjectorService {
+    		get(name: '$resource'): ng.resource.IResourceService;
+    	}
+    }
 }
 
 interface Array<T>
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 111ba86cce..1831bc0493 100644
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Angular JS 1.5
 // Project: http://angularjs.org
-// Definitions by: Diego Vilar <http://github.com/diegovilar>
+// Definitions by: Diego Vilar <http://github.com/diegovilar>, Georgii Dolzhykov <http://github.com/thorn0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -125,6 +125,7 @@ declare namespace angular {
         isFunction(value: any): value is Function;
         isNumber(value: any): value is number;
         isObject(value: any): value is Object;
+        isObject<T>(value: any): value is T;
         isString(value: any): value is string;
         isUndefined(value: any): boolean;
         lowercase(str: string): string;
@@ -238,7 +239,6 @@ declare namespace angular {
          * @param directiveFactory An injectable directive factory function.
          */
         directive(name: string, inlineAnnotatedFunction: any[]): IModule;
-        directive(name: string, injectionFunction: Function): IModule;
         directive(object: Object): IModule;
         /**
          * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider.
@@ -1412,6 +1412,16 @@ declare namespace angular {
          * Absolute or relative URL of the resource that is being requested.
          */
         url: string;
+        /**
+         * Event listeners to be bound to the XMLHttpRequest object. 
+         * To bind events to the XMLHttpRequest upload object, use uploadEventHandlers. The handler will be called in the context of a $apply block.
+         */
+        eventHandlers?: { [type: string]: EventListenerOrEventListenerObject };
+        /**
+         * Event listeners to be bound to the XMLHttpRequest upload object. 
+         * To bind events to the XMLHttpRequest object, use eventHandlers. The handler will be called in the context of a $apply block.
+         */
+        uploadEventHandlers?: { [type: string]: EventListenerOrEventListenerObject };
     }
 
     interface IHttpHeadersGetter {
diff --git a/atom/atom.d.ts b/atom/atom.d.ts
index 389d6ef16e..ac899ba5ac 100644
--- a/atom/atom.d.ts
+++ b/atom/atom.d.ts
@@ -946,9 +946,14 @@ declare namespace AtomCore {
 		registry: any;
 		repository: Object;
 		scopeName: string;
+		tokenizeLines: (text: string) => any;
 		// TBD
 
 	}
+	
+	  interface IGrammars {
+    		grammarForScopeName(scope: string): IGrammar;
+  	}
 
 	interface IPane /* extends Theorist.Model */ {
 		itemForURI: (uri:string)=>IEditor;
@@ -1302,6 +1307,7 @@ declare namespace AtomCore {
 		deserializers:IDeserializerManager;
 		config: IConfig;
 		commands: ICommandRegistry;
+		grammars: IGrammars;
 		keymaps: IKeymapManager;
 		keymap: IKeymapManager;
 		packages: IPackageManager;
diff --git a/autobind-decorator/autobind-decorator-tests.ts b/autobind-decorator/autobind-decorator-tests.ts
new file mode 100644
index 0000000000..e428604802
--- /dev/null
+++ b/autobind-decorator/autobind-decorator-tests.ts
@@ -0,0 +1,43 @@
+/// <reference path="autobind-decorator.d.ts" />
+
+import autobind = require('autobind-decorator');
+
+class Test {
+    public static what: string = 'static';
+
+    @autobind
+    public static test(): void {
+        console.log(this.what);
+    }
+
+    public constructor(public what: string) {
+        this.what = what;
+    }
+
+    @autobind
+    public test(): void {
+        console.warn(this.what);
+    }
+}
+
+const tester: Test = new Test('bind');
+const { test } = tester;
+tester.test(); // warns 'bind'.
+test(); // warns 'bind'.
+Test.test(); // logs 'static'.
+
+@autobind
+class Component {
+    public constructor(private someMember: string) {
+        this.someMember = someMember;
+    }
+  
+    public someMethod(): void {
+        console.error(this.someMember);
+    }
+}
+
+const component: Component = new Component('React vs Angular2');
+const { someMethod } = component;
+component.someMethod(); // errors 'React vs Angular2'
+someMethod(); // errors 'React vs Angular2'
diff --git a/autobind-decorator/autobind-decorator.d.ts b/autobind-decorator/autobind-decorator.d.ts
new file mode 100644
index 0000000000..51ba89c9bf
--- /dev/null
+++ b/autobind-decorator/autobind-decorator.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for autobind-decorator v1.3.3
+// Project: https://github.com/andreypopp/autobind-decorator
+// Definitions by: Ivo Stratev <https://github.com/NoHomey/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'autobind-decorator' {
+    function autobind<TFunction extends Function>(target: TFunction): TFunction | void;
+    function autobind<T extends Function>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+    export = autobind;
+}
diff --git a/autobind-decorator/autobind-decorator.ts.tscparams b/autobind-decorator/autobind-decorator.ts.tscparams
new file mode 100644
index 0000000000..1ee3d05cb6
--- /dev/null
+++ b/autobind-decorator/autobind-decorator.ts.tscparams
@@ -0,0 +1 @@
+--experimentalDecorators
diff --git a/aws-lambda/aws-lambda-tests.ts b/aws-lambda/aws-lambda-tests.ts
index 8b9f53a8ab..f562b59d3d 100644
--- a/aws-lambda/aws-lambda-tests.ts
+++ b/aws-lambda/aws-lambda-tests.ts
@@ -4,55 +4,29 @@ import lambda = require('aws-lambda');
 
 var str: string;
 var date: Date;
-var sns: lambda.SNS;
-var kinesis: lambda.Kinesis;
-var recordsList: lambda.Record[];
 var anyObj: any;
 var num: number;
-var identity: lambda.Identity;
+var identity: lambda.CognitoIdentity;
 var error: Error;
-
-/* Records */
-var records: lambda.Records;
-
-recordsList = records.Records;
-
-/* Record */
-var record: lambda.Record;
-
-str = record.EventVersion;
-str = record.EventSubscriptionArn;
-str = record.EnventSource;
-sns = record.Sns;
-kinesis = record.kinesis;
-
-/* SNS */
-str = sns.Type;
-str = sns.MessageId;
-str = sns.TopicArn;
-str = sns.Subject;
-str = sns.Message;
-date = sns.Timestamp;
-
-/* Kinesis */
-var kinesis: lambda.Kinesis;
-
-str = kinesis.data;
+var b: boolean;
+var clientCtx: lambda.ClientContext;
 
 /* Context */
 var context: lambda.Context;
 
-context.log(str, anyObj);
-context.fail(str);
-context.succeed(str);
-context.succeed(anyObj);
-context.succeed(str, anyObj);
+b = context.callbackWaitsForEmptyEventLoop;
+str = context.functionName;
+str = context.functionVersion;
+str = context.invokedFunctionArn;
+num = context.memoryLimitInMB;
 str = context.awsRequestId;
-num = context.getRemainingTimeInMillis();
+str = context.logGroupName;
+str = context.logStreamName;
 identity = context.identity;
+clientCtx = context.clientContext;
 
-/* Identity */
-var identity: lambda.Identity;
+/* CognitoIdentity */
+var identity: lambda.CognitoIdentity;
 
 str = identity.cognitoIdentityId;
 str = identity.cognitoIdentityPoolId;
diff --git a/aws-lambda/aws-lambda.d.ts b/aws-lambda/aws-lambda.d.ts
index 081c6e0e3e..c9a66a3783 100644
--- a/aws-lambda/aws-lambda.d.ts
+++ b/aws-lambda/aws-lambda.d.ts
@@ -1,55 +1,68 @@
 // Type definitions for AWS Lambda
 // Project: http://docs.aws.amazon.com/lambda
-// Definitions by: Michael Skarum <https://github.com/skarum>
+// Definitions by: James Darbyshire <https://github.com/darbio/aws-lambda-typescript>, Michael Skarum <https://github.com/skarum>, Stef Heyenrath <https://github.com/StefH/DefinitelyTyped>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "aws-lambda" {
+    // Context
+    // http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html
+    interface Context {
+        // Properties
+        callbackWaitsForEmptyEventLoop: boolean;
+        functionName: string;
+        functionVersion: string;
+        invokedFunctionArn: string;
+        memoryLimitInMB: number;
+        awsRequestId: string;
+        logGroupName: string;
+        logStreamName: string;
+        identity?: CognitoIdentity;
+        clientContext?: ClientContext;
+        
+        // Functions
+        getRemainingTimeInMillis(): number;
 
-    export interface Records {
-        Records: Record[];
-    }
-    interface Record {
-        EventVersion: string;
-        EventSubscriptionArn: string;
-        EnventSource: string;
-        Sns: SNS;
-        kinesis: Kinesis;
-    }
-    interface SNS {
-        Type: string;
-        MessageId: string;
-        TopicArn: string;
-        Subject: string;
-        Message: string;
-        Timestamp: Date;
-    }
-
-    interface Kinesis {
-        data: string;
-    }
-
-    export interface Context {
+        // Functions for compatibility with earlier Node.js Runtime v0.10.42
         log(message: string, object: any): void;
         fail(message: string): void;
         succeed(message: string): void;
         succeed(object: any): void;
-        succeed(message: string, object: any): void;
-        awsRequestId: string;
-        getRemainingTimeInMillis(): number;
-        /** Information about the Amazon Cognito identity provider when invoked through the AWS Mobile SDK. It can be null. */
-        identity?: Identity;
+        succeed(message: string, object: any): void; 
     }
-
-    interface Identity {
+    
+    interface CognitoIdentity {
         cognitoIdentityId: string;
         cognitoIdentityPoolId: string;
     }
-
+    
+    interface ClientContext {
+        client: ClientContextClient;
+        Custom?: any;
+        env: ClientContextEnv;
+    }
+    
+    interface ClientContextClient {
+        installationId: string;
+        appTitle: string;
+        appVersionName: string;
+        appVersionCode: string;
+        appPackageName: string;
+    }
+    
+    interface ClientContextEnv {
+        platformVersion: string;
+        platform: string;
+        make: string;
+        model: string;
+        locale: string;
+    }
+    
     /**
      * Optional callback parameter.
+     * http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
      *
-     *  @param error – an optional parameter that you can use to provide results of the failed Lambda function execution.
-     *  @param result – an optional parameter that you can use to provide the result of a successful function execution. The result provided must be JSON.stringify compatible.
+     * @param error – an optional parameter that you can use to provide results of the failed Lambda function execution.
+     * @param result – an optional parameter that you can use to provide the result of a successful function execution. The result provided must be JSON.stringify compatible.
      */
     export type Callback = (error?: Error, result?: any) => void;
 }
\ No newline at end of file
diff --git a/aws-sdk/aws-sdk.d.ts b/aws-sdk/aws-sdk.d.ts
index cb35f34e97..09ec2f6267 100644
--- a/aws-sdk/aws-sdk.d.ts
+++ b/aws-sdk/aws-sdk.d.ts
@@ -226,7 +226,7 @@ declare module "aws-sdk" {
     constructor(options?: any);
     endpoint: Endpoint;
 
-    getObject(params: s3.GetObjectRequest, callback: (err: Error, data: any) => void): void;
+    getObject(params: s3.GetObjectRequest, callback?: (err: Error, data: any) => void): any;
     putObject(params: s3.PutObjectRequest, callback: (err: Error, data: any) => void): void;
     deleteObject(params: s3.DeleteObjectRequest, callback: (err: Error, data: any) => void): void;
     headObject(params: s3.HeadObjectRequest, callback: (err: Error, data: any) => void): void;
@@ -235,6 +235,12 @@ declare module "aws-sdk" {
     upload(params?: s3.PutObjectRequest, options?: s3.UploadOptions, callback?: (err: Error, data: any) => void): void;
     listObjects(params: s3.ListObjectRequest, callback: (err: Error, data: s3.ListObjectResponse) => void): void;
     listObjectsV2(params: s3.ListObjectV2Request, callback: (err: Error, data: s3.ListObjectV2Response) => void): void;
+    waitFor(state: string, params: s3.HeadObjectRequest, callback: (err: Error, data: any) => void): void;
+
+    createMultipartUpload(params: any, callback: (err: Error, data: any) => void): void;
+    uploadPart(params: any, callback: (err: Error, data: any) => void): void;
+    listParts(params: any, callback: (err: Error, data: any) => void): void;
+    completeMultipartUpload(params: any, callback: (err: Error, data: any) => void): void;
   }
 
   export class STS {
diff --git a/axe-core/axe-core-tests.ts b/axe-core/axe-core-tests.ts
new file mode 100644
index 0000000000..7decb865c2
--- /dev/null
+++ b/axe-core/axe-core-tests.ts
@@ -0,0 +1,91 @@
+/// <reference path="axe-core.d.ts" />
+
+var context:any = document
+var $fixture:any = {}
+
+// axe.a11yCheck config
+axe.a11yCheck(context, {}, (results) => {
+	// axe's results object
+	console.log(results.passes.length)
+	console.log(results.violations.length)
+});
+// axe.a11yCheck include/exclude
+axe.a11yCheck({include: [['#id1'], ['#id2']]}, {}, (results) => {
+	console.log(results)
+})
+axe.a11yCheck({exclude: [$fixture[0]]}, {}, (results) => {
+	console.log(results)
+})
+var tagConfigRunOnly: axe.RunOnly = {
+	type: 'tag',
+	values: ['wcag2a']
+}
+var tagConfig = {
+	runOnly: tagConfigRunOnly
+}
+axe.a11yCheck(context, tagConfig, (results) => {
+	console.log(results)
+})
+var includeExcludeTagsRunOnly: axe.RunOnly = {
+	type: 'tags',
+	value: {
+		include: ['wcag2a', 'wcag2aa'],
+		exclude: ['experimental']
+	}
+}
+var includeExcludeTagsConfig = {
+	runOnly: includeExcludeTagsRunOnly
+}
+axe.a11yCheck(context, includeExcludeTagsConfig, (results) => {
+	console.log(results)
+})
+var someRulesConfig = {
+	rules: {
+		"color-contrast": {enabled: 'false'},
+		"heading-order": {enabled: 'true'}
+	}
+}
+axe.a11yCheck(context, someRulesConfig, (results) => {
+	console.log(results)
+})
+
+// axe.configure
+var spec: axe.Spec = {
+	branding: {
+		brand: 'foo',
+		application: 'bar'
+	},
+	reporter: 'v1',
+	checks: [{
+		id: 'custom-check',
+		evaluate: function() {
+			return true
+		}
+	}],
+	rules: [{
+		id: 'custom-rule',
+		any: ['custom-check']
+	}]
+}
+axe.configure(spec)
+
+axe.reset()
+
+axe.getRules(['wcag2aa'])
+typeof axe.getRules() === 'object'
+
+// Plugins
+var pluginSrc: axe.AxePlugin = {
+	id: 'doStuff',
+	run: (data:any, callback:Function) => {
+		callback()
+	},
+	commands: [{
+		id: 'run-doStuff',
+		callback: (data:any, callback:Function) => {
+			axe.plugins['doStuff'].run(data, callback)
+		}
+	}]
+}
+axe.registerPlugin(pluginSrc)
+axe.cleanup()
diff --git a/axe-core/axe-core.d.ts b/axe-core/axe-core.d.ts
new file mode 100644
index 0000000000..98818e75cc
--- /dev/null
+++ b/axe-core/axe-core.d.ts
@@ -0,0 +1,159 @@
+// Type definitions for axe-core 2.0.5
+// Project: https://github.com/dequelabs/axe-core
+// Definitions by: Marcy Sutton <https://github.com/marcysutton>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace axe {
+
+	export type ImpactValue = "minor" | "moderate" | "serious" | "critical";
+
+	export type TagValue = "wcag2a" | "wcag2aa" | "section508" | "best-practice";
+
+	export type ReporterVersion = "v1" | "v2";
+
+	export type RunOnlyType = "rule" | "rules" | "tag" | "tags";
+
+	export interface ElementContext {
+		node?: Object,
+		selector?: string,
+		include?: any[],
+		exclude?: any[]
+	}
+	export interface RunOnly {
+		type: RunOnlyType,
+		value?: {
+			include?: string[],
+			exclude?: string[]
+		}
+		values?: TagValue[]
+	}
+	export interface AxeResults {
+		url: string,
+		timestamp: string,
+		passes: Pass[],
+		violations: Violation[]
+	}
+	export interface Pass {
+		description: string,
+		help: string,
+		helpUrl: string,
+		id: string,
+		impact: ImpactValue,
+		tags: TagValue[],
+		nodes: NodeResult[]
+	}
+	export interface Violation {
+		description: string,
+		help: string,
+		helpUrl: string,
+		id: string,
+		impact: ImpactValue,
+		tags: TagValue[],
+		nodes: NodeResult[]
+	}
+	export interface NodeResult {
+		html: string,
+		impact: ImpactValue,
+		target: string[],
+		any: CheckResult[],
+		all: CheckResult[],
+		none: CheckResult[]
+	}
+	export interface CheckResult {
+		id: string,
+		impact: string,
+		message: string,
+		data: any,
+		relatedNodes?: RelatedNode[]
+	}
+	export interface RelatedNode {
+		target: string[],
+		html: string
+	}
+	export interface Spec {
+		branding?: {
+			brand: string,
+			application: string
+		},
+		reporter?: ReporterVersion,
+		checks?: Check[],
+		rules?: Rule[]
+	}
+	export interface Check {
+		id: string,
+		evaluate: Function,
+		after?: Function,
+		options?: any,
+		matches?: string,
+		enabled?: boolean
+	}
+	export interface Rule {
+		id: string,
+		selector?: string,
+		excludeHidden?: boolean,
+		enabled?: boolean,
+		pageLevel?: boolean,
+		any?: string[],
+		all?: string[],
+		none?: string[],
+		tags?: string[],
+		matches?: string
+	}
+	export interface AxePlugin {
+		id: string,
+		run(...args:any[]): any,
+		commands: {
+			id: string,
+			callback(...args:any[]): void
+		}[],
+		cleanup?(callback:Function): void
+	}
+
+	export let plugins: any
+
+	/**
+	 * Starts analysis on the current document and its subframes
+	 *
+	 * @param  {Object}   context  The `Context` specification object @see Context
+	 * @param  {Array}    options  Options passed into rules or checks, temporarily modifyint them.
+	 * @param  {Function} callback The function to invoke when analysis is complete.
+	 * @returns {Object}  results  The aXe results object
+	 */
+	export function a11yCheck(context: ElementContext, options: {runOnly?: RunOnly, rules?: Object}, callback: (results:AxeResults) => void): AxeResults
+
+	/**
+	 * Method for configuring the data format used by aXe. Helpful for adding new
+	 * rules, which must be registered with the library to execute.
+	 * @param  {Spec}       Spec Object with valid `branding`, `reporter`, `checks` and `rules` data
+	 */
+	export function configure(spec: Spec): void
+
+	/**
+	 * Searches and returns rules that contain a tag in the list of tags.
+	 * @param  {Array}  tags  Optional array of tags
+	 * @return {Array}  Array of rules
+	 */
+	export function getRules(tags?: string[]): Object[]
+
+	/**
+	 * Restores the default axe configuration
+	 */
+	export function reset(): void
+
+	/**
+	 * Function to register a plugin configuration in document and its subframes
+	 * @param  {Object}    plugin    A plugin configuration object
+	 */
+	export function registerPlugin(plugin: AxePlugin): void
+
+	/**
+	 * Function to clean up plugin configuration in document and its subframes
+	 */
+	export function cleanup(): void
+
+}
+
+// axe is also available as a module
+declare module "axe-core" {
+    export = axe;
+}
diff --git a/azure-mobile-apps/azure-mobile-apps-tests.ts b/azure-mobile-apps/azure-mobile-apps-tests.ts
index 093932c2fb..302f732889 100644
--- a/azure-mobile-apps/azure-mobile-apps-tests.ts
+++ b/azure-mobile-apps/azure-mobile-apps-tests.ts
@@ -72,6 +72,13 @@ table.read.use([function () {}, function () {}]);
 table.read.use(function () {}, function () {});
 table.use(function () {}).use(function () {}).read(function () {}).use(function () {})
 
+table.access = undefined;
+table.access = 'authenticated';
+table.read.access = 'anonymous';
+table.update.access = 'disabled';
+table.delete.access = 'authenticated';
+table.insert.access = 'authenticated';
+
 // Express.Table, instantiated from the static require('azure-mobile-apps').table()
 // This is going to be interesting if we ever support more than one provider
 var table2 = mobileApps.table();
@@ -84,4 +91,14 @@ mobileApps.logger.debug('a debug message')
 
 // Query
 queries.create('table').where({ x: 10 }).select('col1,col2');
-mobileApps.query.create('table');
\ No newline at end of file
+mobileApps.query.create('table');
+
+// custom sql query
+mobileApp.api.add('query', { authorize: true, get: (req, res, next) => {
+    req.azureMobile.data.execute({
+        sql: "SELECT * FROM TODOITEM WHERE COMPLETE = :complete",
+        parameters: [
+            { name: 'complete', value: 1 }
+        ]
+    }).then(x => {});
+}, delete: function () {} });
diff --git a/azure-mobile-apps/azure-mobile-apps.d.ts b/azure-mobile-apps/azure-mobile-apps.d.ts
index 0a42fa9ecf..a17e41e2d6 100644
--- a/azure-mobile-apps/azure-mobile-apps.d.ts
+++ b/azure-mobile-apps/azure-mobile-apps.d.ts
@@ -47,6 +47,7 @@ declare namespace Azure.MobileApps {
 
             interface Table {
                 authorize?: boolean;
+                access?: AccessType;
                 autoIncrement?: boolean;
                 dynamicSchema?: boolean;
                 name: string;
@@ -66,8 +67,11 @@ declare namespace Azure.MobileApps {
                 (operationHandler: (context: Context) => void): Table;
                 use(...middleware: Middleware[]): Table;
                 use(middleware: Middleware[]): Table;
+                access: AccessType;
             }
 
+            type AccessType = 'anonymous' | 'authenticated' | 'disabled';
+
             interface Tables {
                 configuration: Configuration;
                 add(name: string, definition?: Table | TableDefinition): void;
@@ -215,7 +219,7 @@ declare namespace Azure.MobileApps {
         item: any;
         req: Express.Request;
         res: Express.Response;
-        data: (table: TableDefinition) => Data.Table;
+        data: ContextData;
         tables: (tableName: string) => Data.Table;
         user: User;
         push: typeof nh;
@@ -223,6 +227,21 @@ declare namespace Azure.MobileApps {
         execute(): Thenable<any>;
     }
 
+    interface ContextData {
+        (table: TableDefinition): Data.Table;
+        execute(q: SqlQueryDefinition): Thenable<any>;
+    }
+
+    interface SqlQueryDefinition {
+        sql: string;
+        parameters?: SqlParameterDefinition[];
+    }
+
+    interface SqlParameterDefinition {
+        name: string;
+        value: any;
+    }
+
     interface TableDefinition {
         authorize?: boolean;
         autoIncrement?: boolean;
diff --git a/azure-mobile-services-client/AzureMobileServicesClient.d.ts b/azure-mobile-services-client/AzureMobileServicesClient.d.ts
index afd6014598..6fa0f9c475 100644
--- a/azure-mobile-services-client/AzureMobileServicesClient.d.ts
+++ b/azure-mobile-services-client/AzureMobileServicesClient.d.ts
@@ -17,7 +17,7 @@ declare namespace Microsoft.WindowsAzure {
         login(provider: string, token: string): asyncPromise;
         login(provider: string, callback: (error: any, user: User) => void ): void;
         login(provider: string): asyncPromise;
-        logout(): void;
+        logout(): asyncPromise;
         getTable(tableName: string): MobileServiceTable;
         withFilter(serviceFilter: (request: any, next: (request: any, callback: (error: any, response: any) => void) => void, callback: (error: any, response: any) => void) => void): MobileServiceClient;
         /**
diff --git a/backlog-js/backlog-js-tests.ts b/backlog-js/backlog-js-tests.ts
new file mode 100644
index 0000000000..979eb57ca4
--- /dev/null
+++ b/backlog-js/backlog-js-tests.ts
@@ -0,0 +1,88 @@
+/// <reference path="backlog-js.d.ts" />
+
+import * as backlogjs from 'backlog-js';
+
+const host = 'example.backlog.jp';
+const apiKey = 'apiKey';
+const clientId = 'clientId';
+const clientSecret = 'clientSecret';
+const redirectUri = 'redirectUri';
+const state = 'state';
+const code = 'code';
+const refreshToken = 'refreshToken';
+const configure = { host, apiKey }
+const credentials = { clientId, clientSecret }
+
+const oauth2 = new backlogjs.OAuth2(credentials);
+oauth2.getAuthorizationURL({ host, redirectUri, state });
+oauth2.getAccessToken({ host, code, redirectUri }).then(data => {}).catch(err => {});
+oauth2.refreshAccessToken({ host, refreshToken }).then(data => {}).catch(err => {});
+
+const backlog = new backlogjs.Backlog(configure);
+backlog.getSpace().then(data => { }).catch(err => { });
+backlog.getSpaceActivities({
+  activityTypeId: [
+    backlogjs.Option.ActivityType.IssueCreated,
+    backlogjs.Option.ActivityType.IssueUpdated
+  ],
+  minId: 1,
+  maxId: 2,
+  count: 3,
+  order: "asc"
+}).then(data => { }).catch(err => { });
+backlog.getSpaceDiskUsage().then(data => { }).catch(err => { });
+backlog.getSpaceIcon().then(data => { }).catch(err => { });
+backlog.postSpaceAttachment(new FormData()).then(data => { }).catch(err => { });
+backlog.getUsers().then(data => { }).catch(err => { });
+backlog.getUser(1).then(data => { }).catch(err => { });
+backlog.postUser({
+  userId: 'string',
+  password: 'string',
+  name: 'string',
+  mailAddress: 'string',
+  roleType: backlogjs.Option.User.RoleType.Admin
+}).then(data => { }).catch(err => { });
+backlog.patchUser(1, {
+  password: 'string',
+  name: 'string',
+  mailAddress: 'string',
+  roleType: backlogjs.Option.User.RoleType.Admin
+}).then(data => { }).catch(err => { });
+backlog.deleteUser(1).then(data => { }).catch(err => { });
+backlog.getMyself().then(data => { }).catch(err => { });
+backlog.getUserActivities(1, {
+  activityTypeId: [
+    backlogjs.Option.ActivityType.IssueCreated,
+    backlogjs.Option.ActivityType.IssueUpdated
+  ],
+  minId: 1,
+  maxId: 2,
+  count: 3,
+  order: "asc"
+}).then(data => { }).catch(err => { });
+backlog.getUserStars(1, {
+  minId: 1,
+  maxId: 2,
+  count: 3,
+  order: "asc"
+}).then(data => { }).catch(err => { });
+backlog.getUserStarsCount(1, {
+  since: 'YYYY-MM-DD',
+  until: 'YYYY-MM-DD'
+}).then(data => { }).catch(err => { });
+backlog.getRecentlyViewedIssues({
+  order: 'asc',
+  offset: 1,
+  count: 2
+}).then(data => { }).catch(err => { });
+backlog.getRecentlyViewedProjects({
+  order: 'asc',
+  offset: 1,
+  count: 2
+}).then(data => { }).catch(err => { });
+backlog.getRecentlyViewedWikis({
+  order: 'asc',
+  offset: 1,
+  count: 2
+}).then(data => { }).catch(err => { });
+backlog.getUserIcon(1).then(data => {}).catch(err => {});
diff --git a/backlog-js/backlog-js.d.ts b/backlog-js/backlog-js.d.ts
new file mode 100644
index 0000000000..353e7e90cd
--- /dev/null
+++ b/backlog-js/backlog-js.d.ts
@@ -0,0 +1,695 @@
+// Type definitions for backlog-js 0.9.0
+// Project: https://github.com/nulab/backlog-js
+// Definitions by: Yuichi Watanabe <https://github.com/vvatanabe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../isomorphic-fetch/isomorphic-fetch.d.ts" />
+/// <reference path="../node_modules/typescript/lib/lib.es6.d.ts" />
+
+declare module 'backlog-js' {
+
+  class Request {
+      private configure;
+      constructor(configure: {
+          host: string;
+          apiKey?: string;
+          accessToken?: string;
+          timeout?: number;
+      });
+      get<T>(path: string, params?: any): Promise<T>;
+      post<T>(path: string, params?: any): Promise<T>;
+      put<T>(path: string, params: any): Promise<T>;
+      patch<T>(path: string, params: any): Promise<T>;
+      delete<T>(path: string, params?: any): Promise<T>;
+      request(options: {
+          method: string;
+          path: string;
+          params?: Params | FormData;
+      }): Promise<IResponse>;
+      checkStatus(response: IResponse): Promise<IResponse>;
+      parseJSON<T>(response: IResponse): Promise<T>;
+      private toFormData(params);
+      private toQueryString(params);
+      webAppBaseURL: string;
+      restBaseURL: string;
+  }
+
+  type Params = {
+      [index: string]: number | string | number[] | string[];
+  };
+
+  export class Backlog extends Request {
+    constructor(configure: {
+      host: string;
+      apiKey?: string;
+      accessToken?: string;
+      timeout?: number;
+    });
+    getSpace(): Promise<any>;
+    getSpaceActivities(params: Option.Space.GetActivitiesParams): Promise<any>;
+    getSpaceNotification(): Promise<any>;
+    putSpaceNotification(params: Option.Space.PutSpaceNotificationParams): Promise<any>;
+    getSpaceDiskUsage(): Promise<any>;
+    getSpaceIcon(): Promise<Entity.File.FileData>;
+    postSpaceAttachment(form: FormData): Promise<IResponse>;
+    getUsers(): Promise<any>;
+    getUser(userId: number): Promise<any>;
+    postUser(params: Option.User.PostUserParams): Promise<any>;
+    patchUser(userId: number, params: Option.User.PatchUserParams): Promise<any>;
+    deleteUser(userId: number): Promise<any>;
+    getMyself(): Promise<any>;
+    getUserActivities(userId: number, params: Option.User.GetUserActivitiesParams): Promise<any>;
+    getUserStars(userId: number, params: Option.User.GetUserStarsParams): Promise<any>;
+    getUserStarsCount(userId: number, params: Option.User.GetUserStarsCountParams): Promise<any>;
+    getRecentlyViewedIssues(params: Option.User.GetRecentlyViewedParams): Promise<any>;
+    getRecentlyViewedProjects(params: Option.User.GetRecentlyViewedParams): Promise<any>;
+    getRecentlyViewedWikis(params: Option.User.GetRecentlyViewedParams): Promise<any>;
+    getUserIcon(userId: number): Promise<Entity.File.FileData>;
+    getGroups(params: Option.Group.GetGroupsParams): Promise<any>;
+    postGroups(params: Option.Group.PostGroupsParams): Promise<any>;
+    getGroup(groupId: number): Promise<any>;
+    patchGroup(groupId: number, params: Option.Group.PatchGroupParams): Promise<any>;
+    deleteGroup(groupId: number): Promise<any>;
+    getStatuses(): Promise<any>;
+    getResolutions(): Promise<any>;
+    getPriorities(): Promise<any>;
+    postProject(params: Option.Project.PostProjectParams): Promise<any>;
+    getProjects(params?: Option.Project.GetProjectsParams): Promise<any>;
+    getProject(projectIdOrKey: string): Promise<any>;
+    patchProject(projectIdOrKey: string, params: Option.Project.PatchProjectParams): Promise<any>;
+    deleteProject(projectIdOrKey: string): Promise<any>;
+    getProjectActivities(projectIdOrKey: string, params: Option.Space.GetActivitiesParams): Promise<any>;
+    getProjectUsers(projectIdOrKey: string): Promise<any>;
+    deleteProjectUsers(projectIdOrKey: string, params: Option.Project.DeleteProjectUsersParams): Promise<any>;
+    postProjectAdministrators(projectIdOrKey: string, params: Option.Project.PostProjectAdministrators): Promise<any>;
+    getProjectAdministrators(projectIdOrKey: string): Promise<any>;
+    deleteProjectAdministrators(projectIdOrKey: string, params: Option.Project.DeleteProjectAdministrators): Promise<any>;
+    getIssueTypes(projectIdOrKey: string): Promise<any>;
+    postIssueType(projectIdOrKey: string, params: Option.Project.PostIssueTypeParams): Promise<any>;
+    patchIssueType(projectIdOrKey: string, id: number, params: Option.Project.PatchIssueTypeParams): Promise<any>;
+    deleteIssueType(projectIdOrKey: string, id: number, params: Option.Project.DeleteIssueTypeParams): Promise<any>;
+    getCategories(projectIdOrKey: string): Promise<any>;
+    postCategories(projectIdOrKey: string, params: Option.Project.PostCategoriesParams): Promise<any>;
+    patchCategories(projectIdOrKey: string, id: number, params: Option.Project.PatchCategoriesParams): Promise<any>;
+    deleteCategories(projectIdOrKey: string, id: number): Promise<any>;
+    getVersions(projectIdOrKey: string): Promise<any>;
+    postVersions(projectIdOrKey: string, params: Option.Project.PostVersionsParams): Promise<any>;
+    patchVersions(projectIdOrKey: string, id: number, params: Option.Project.PatchVersionsParams): Promise<any>;
+    deleteVersions(projectIdOrKey: string, id: number): Promise<any>;
+    getCustomFields(projectIdOrKey: string): Promise<any>;
+    postCustomField(projectIdOrKey: string, params: Option.Project.PostCustomFieldParams | Option.Project.PostCustomFieldWithNumericParams | Option.Project.PostCustomFieldWithDateParams | Option.Project.PostCustomFieldWithListParams): Promise<any>;
+    patchCustomField(projectIdOrKey: string, id: number, params: Option.Project.PatchCustomFieldParams | Option.Project.PatchCustomFieldWithNumericParams | Option.Project.PatchCustomFieldWithDateParams | Option.Project.PatchCustomFieldWithListParams): Promise<any>;
+    deleteCustomField(projectIdOrKey: string, id: number): Promise<any>;
+    postCustomFieldItem(projectIdOrKey: string, id: number, params: Option.Project.PostCustomFieldItemParams): Promise<any>;
+    patchCustomFieldItem(projectIdOrKey: string, id: number, itemId: number, params: Option.Project.PatchCustomFieldItemParams): Promise<any>;
+    deleteCustomFieldItem(projectIdOrKey: string, id: number, params: Option.Project.PostCustomFieldItemParams): Promise<any>;
+    getSharedFiles(projectIdOrKey: string, path: string, params: Option.Project.GetSharedFilesParams): Promise<any>;
+    getProjectsDiskUsage(projectIdOrKey: string): Promise<any>;
+    getWebhooks(projectIdOrKey: string): Promise<any>;
+    postWebhook(projectIdOrKey: string, params: Option.Project.PostWebhookParams): Promise<any>;
+    getWebhook(projectIdOrKey: string, webhookId: string): Promise<any>;
+    patchWebhook(projectIdOrKey: string, webhookId: string, params: Option.Project.PatchWebhookParams): Promise<any>;
+    deleteWebhook(projectIdOrKey: string, webhookId: string): Promise<any>;
+    postIssue(params: Option.Issue.PostIssueParams): Promise<any>;
+    patchIssue(issueIdOrKey: string, params: Option.Issue.PatchIssueParams): Promise<any>;
+    getIssues(params?: Option.Issue.GetIssuesParams): Promise<any>;
+    getIssue(issueIdOrKey: string): Promise<any>;
+    getIssuesCount(params?: Option.Issue.GetIssuesParams): Promise<any>;
+    deleteIssuesCount(issueIdOrKey: string): Promise<any>;
+    getIssueComments(issueIdOrKey: string, params: Option.Issue.GetIssueCommentsParams): Promise<any>;
+    postIssueComments(issueIdOrKey: string, params: Option.Issue.PostIssueCommentsParams): Promise<any>;
+    getIssueCommentsCount(issueIdOrKey: string): Promise<any>;
+    getIssueComment(issueIdOrKey: string, commentId: number): Promise<any>;
+    patchIssueComment(issueIdOrKey: string, commentId: number, params: Option.Issue.PatchIssueCommentParams): Promise<any>;
+    getIssueCommentNotifications(issueIdOrKey: string, commentId: number): Promise<any>;
+    postIssueCommentNotifications(issueIdOrKey: string, commentId: number, prams: Option.Issue.IssueCommentNotifications): Promise<any>;
+    getIssueAttachments(issueIdOrKey: string): Promise<any>;
+    deleteIssueAttachment(issueIdOrKey: string, attachmentId: string): Promise<any>;
+    getIssueSharedFiles(issueIdOrKey: string): Promise<any>;
+    linkIssueSharedFiles(issueIdOrKey: string, params: Option.Issue.LinkIssueSharedFilesParams): Promise<any>;
+    unlinkIssueSharedFile(issueIdOrKey: string, id: number): Promise<any>;
+    getWikis(projectIdOrKey: number): Promise<any>;
+    getWikisCount(projectIdOrKey: number): Promise<any>;
+    getWikisTags(projectIdOrKey: number): Promise<any>;
+    postWiki(params: Option.Wiki.PostWikiParams): Promise<any>;
+    getWiki(wikiId: number): Promise<any>;
+    patchWiki(wikiId: number, params: Option.Wiki.PatchWikiParams): Promise<any>;
+    deleteWiki(wikiId: number, mailNotify: boolean): Promise<any>;
+    getWikisAttachments(wikiId: number): Promise<any>;
+    postWikisAttachments(wikiId: number, attachmentId: number[]): Promise<any>;
+    deleteWikisAttachments(wikiId: number, attachmentId: number): Promise<any>;
+    getWikisSharedFiles(wikiId: number): Promise<any>;
+    linkWikisSharedFiles(wikiId: number, fileId: number[]): Promise<any>;
+    unlinkWikisSharedFiles(wikiId: number, id: number): Promise<any>;
+    getWikisHistory(wikiId: number, params: Option.Wiki.GetWikisHistoryParams): Promise<any>;
+    getWikisStars(wikiId: number): Promise<any>;
+    postStar(params: Option.Project.PostStarParams): Promise<any>;
+    getNotifications(params: Option.Notification.GetNotificationsParams): Promise<any>;
+    getNotificationsCount(params: Option.Notification.GetNotificationsCountParams): Promise<any>;
+    resetNotificationsMarkAsRead(): Promise<any>;
+    markAsReadNotification(id: number): Promise<any>;
+    getGitRepositories(projectIdOrKey: string): Promise<any>;
+    getGitRepository(projectIdOrKey: string, repoIdOrName: string): Promise<any>;
+    getPullRequests(projectIdOrKey: string, repoIdOrName: string, params: Option.PullRequest.GetPullRequestsParams): Promise<any>;
+    getPullRequestsCount(projectIdOrKey: string, repoIdOrName: string, params: Option.PullRequest.GetPullRequestsParams): Promise<any>;
+    postPullRequest(projectIdOrKey: string, repoIdOrName: string, params: Option.PullRequest.PostPullRequestParams): Promise<any>;
+    getPullRequest(projectIdOrKey: string, repoIdOrName: string, number: number): Promise<any>;
+    patchPullRequest(projectIdOrKey: string, repoIdOrName: string, number: number, params: Option.PullRequest.PatchPullRequestParams): Promise<any>;
+    getPullRequestComments(projectIdOrKey: string, repoIdOrName: string, number: number, params: Option.PullRequest.GetPullRequestCommentsParams): Promise<any>;
+    postPullRequestComments(projectIdOrKey: string, repoIdOrName: string, number: number, params: Option.PullRequest.PostPullRequestCommentsParams): Promise<any>;
+    getPullRequestCommentsCount(projectIdOrKey: string, repoIdOrName: string, number: number): Promise<any>;
+    patchPullRequestComments(projectIdOrKey: string, repoIdOrName: string, number: number, commentId: number, params: Option.PullRequest.PatchPullRequestCommentsParams): Promise<any>;
+    getPullRequestAttachments(projectIdOrKey: string, repoIdOrName: string, number: number): Promise<any>;
+    deletePullRequestAttachment(projectIdOrKey: string, repoIdOrName: string, number: number, attachmentId: number): Promise<any>;
+    getProjectIcon(projectIdOrKey: string): Promise<Entity.File.FileData>;
+    getSharedFile(projectIdOrKey: string, sharedFileId: number): Promise<Entity.File.FileData>;
+    getIssueAttachment(issueIdOrKey: string, attachmentId: number): Promise<Entity.File.FileData>;
+    getWikiAttachment(wikiId: number, attachmentId: number): Promise<Entity.File.FileData>;
+    getPullRequestAttachment(projectIdOrKey: string, repoIdOrName: string, number: number, attachmentId: number): Promise<Entity.File.FileData>;
+    private download(path);
+    private upload(path, params);
+    private parseFileData(response);
+  }
+
+  export class OAuth2 {
+    private credentials;
+    private timeout;
+    constructor(credentials: Option.OAuth2.Credentials, timeout?: number);
+    getAuthorizationURL(options: {
+      host: string;
+      redirectUri?: string;
+      state?: string;
+    }): string;
+    getAccessToken(options: {
+      host: string;
+      code: string;
+      redirectUri?: string;
+    }): Promise<Entity.OAuth2.AccessToken>;
+    refreshAccessToken(options: {
+      host: string;
+      refreshToken: string;
+    }): Promise<Entity.OAuth2.AccessToken>;
+  }
+
+  import { PassThrough } from 'stream';
+  export namespace Entity {
+    export namespace File {
+      export type FileData = NodeFileData | BrowserFileData;
+      export interface NodeFileData {
+        body: PassThrough;
+        url: string;
+        filename: string;
+      }
+      export interface BrowserFileData {
+        body: any;
+        url: string;
+        blob?: () => Promise<Blob>;
+      }
+    }
+    export namespace OAuth2 {
+      export interface AccessToken {
+        access_token: string;
+        token_type: string;
+        expires_in: number;
+        refresh_token: string;
+      }
+    }
+  }
+
+
+  export namespace Option {
+    export type Order = "asc" | "desc";
+    export enum ActivityType {
+      Undefined = -1,
+      IssueCreated = 1,
+      IssueUpdated = 2,
+      IssueCommented = 3,
+      IssueDeleted = 4,
+      WikiCreated = 5,
+      WikiUpdated = 6,
+      WikiDeleted = 7,
+      FileAdded = 8,
+      FileUpdated = 9,
+      FileDeleted = 10,
+      SvnCommitted = 11,
+      GitPushed = 12,
+      GitRepositoryCreated = 13,
+      IssueMultiUpdated = 14,
+      ProjectUserAdded = 15,
+      ProjectUserRemoved = 16,
+      NotifyAdded = 17,
+      PullRequestAdded = 18,
+      PullRequestUpdated = 19,
+      PullRequestCommented = 20,
+      PullRequestMerged = 21,
+    }
+    export namespace Notification {
+      export interface GetNotificationsParams {
+        minId?: number;
+        maxId?: number;
+        count?: number;
+        order?: Order;
+      }
+      export interface GetNotificationsCountParams {
+        alreadyRead: boolean;
+        resourceAlreadyRead: boolean;
+      }
+    }
+    export namespace Space {
+      export interface GetActivitiesParams {
+        activityTypeId?: ActivityType[];
+        minId?: number;
+        maxId?: number;
+        count?: number;
+        order?: Order;
+      }
+      export interface PutSpaceNotificationParams {
+        content: string;
+      }
+    }
+    export namespace User {
+      export interface PostUserParams {
+        userId: string;
+        password: string;
+        name: string;
+        mailAddress: string;
+        roleType: RoleType;
+      }
+      export interface PatchUserParams {
+        password?: string;
+        name?: string;
+        mailAddress?: string;
+        roleType?: RoleType;
+      }
+      export enum RoleType {
+        Admin = 1,
+        User = 2,
+        Reporter = 3,
+        Viewer = 4,
+        GuestReporter = 5,
+        GuestViewer = 6,
+      }
+      export interface GetUserActivitiesParams {
+        activityTypeId?: ActivityType[];
+        minId?: number;
+        maxId?: number;
+        count?: number;
+        order?: Order;
+      }
+      export interface GetUserStarsParams {
+        minId?: number;
+        maxId?: number;
+        count?: number;
+        order?: Order;
+      }
+      export interface GetUserStarsCountParams {
+        since?: string;
+        until?: string;
+      }
+      export interface GetRecentlyViewedParams {
+        order?: Order;
+        offset?: number;
+        count?: number;
+      }
+    }
+    export namespace Group {
+      export interface GetGroupsParams {
+        order?: Order;
+        offset?: number;
+        count?: number;
+      }
+      export interface PostGroupsParams {
+        name: string;
+        members?: string[];
+      }
+      export interface PatchGroupParams {
+        name?: string;
+        members?: string[];
+      }
+    }
+    export namespace Project {
+      export type TextFormattingRule = "backlog" | "markdown";
+      export interface PostProjectParams {
+        name: string;
+        key: string;
+        chartEnabled: boolean;
+        projectLeaderCanEditProjectLeader?: boolean;
+        subtaskingEnabled: boolean;
+        textFormattingRule: TextFormattingRule;
+      }
+      export interface PatchProjectParams {
+        name?: string;
+        key?: string;
+        chartEnabled?: boolean;
+        subtaskingEnabled?: boolean;
+        projectLeaderCanEditProjectLeader?: boolean;
+        textFormattingRule?: TextFormattingRule;
+        archived?: boolean;
+      }
+      export interface GetProjectsParams {
+        archived?: boolean;
+        all?: boolean;
+      }
+      export interface DeleteProjectUsersParams {
+        userId: number;
+      }
+      export interface PostProjectAdministrators {
+        userId: number;
+      }
+      export interface DeleteProjectAdministrators {
+        userId: number;
+      }
+      export type IssueTypeColor = "#e30000" | "#990000" | "#934981" | "#814fbc" | "#2779ca" | "#007e9a" | "#7ea800" | "#ff9200" | "#ff3265" | "#666665";
+      export interface PostIssueTypeParams {
+        name: string;
+        color: IssueTypeColor;
+      }
+      export interface PatchIssueTypeParams {
+        name?: string;
+        color?: IssueTypeColor;
+      }
+      export interface DeleteIssueTypeParams {
+        substituteIssueTypeId: number;
+      }
+      export interface PostCategoriesParams {
+        name: string;
+      }
+      export interface PatchCategoriesParams {
+        name: string;
+      }
+      export interface PostVersionsParams {
+        name: string;
+        description: string;
+        startDate: string;
+        releaseDueDate: string;
+      }
+      export interface PatchVersionsParams {
+        name: string;
+        description?: string;
+        startDate?: string;
+        releaseDueDate?: string;
+        archived?: boolean;
+      }
+      export interface PostCustomFieldParams {
+        typeId: FieldType;
+        name: string;
+        applicableIssueTypes?: number[];
+        description?: string;
+        required?: boolean;
+      }
+      export interface PostCustomFieldWithNumericParams extends PostCustomFieldParams {
+        min?: number;
+        max?: number;
+        initialValue?: number;
+        unit?: string;
+      }
+      export interface PostCustomFieldWithDateParams extends PostCustomFieldParams {
+        min?: string;
+        max?: string;
+        initialValueType?: number;
+        initialDate?: string;
+        initialShift?: number;
+      }
+      export interface PostCustomFieldWithListParams extends PostCustomFieldParams {
+        items?: string[];
+        allowInput?: boolean;
+        allowAddItem?: boolean;
+      }
+      export interface PatchCustomFieldParams {
+        name?: string;
+        applicableIssueTypes?: number[];
+        description?: string;
+        required?: boolean;
+      }
+      export interface PatchCustomFieldWithNumericParams extends PatchCustomFieldParams {
+        min?: number;
+        max?: number;
+        initialValue?: number;
+        unit?: string;
+      }
+      export interface PatchCustomFieldWithDateParams extends PatchCustomFieldParams {
+        min?: string;
+        max?: string;
+        initialValueType?: number;
+        initialDate?: string;
+        initialShift?: number;
+      }
+      export interface PatchCustomFieldWithListParams extends PatchCustomFieldParams {
+        items?: string[];
+        allowInput?: boolean;
+        allowAddItem?: boolean;
+      }
+      export interface PostCustomFieldItemParams {
+        name: string;
+      }
+      export interface PatchCustomFieldItemParams {
+        name: string;
+      }
+      export interface GetSharedFilesParams {
+        order?: Order;
+        offset?: number;
+        count?: number;
+      }
+      export interface PostWebhookParams {
+        name?: string;
+        description?: string;
+        hookUrl?: string;
+        allEvent?: boolean;
+        activityTypeIds?: number[];
+      }
+      export interface PatchWebhookParams {
+        name?: string;
+        description?: string;
+        hookUrl?: string;
+        allEvent?: boolean;
+        activityTypeIds?: number[];
+      }
+      export enum FieldType {
+        Text = 1,
+        TextArea = 2,
+        Numeric = 3,
+        Date = 4,
+        SingleList = 5,
+        MultipleList = 6,
+        CheckBox = 7,
+        Radio = 8,
+      }
+      export interface PostStarParams {
+        issueId?: number;
+        commentId?: number;
+        wikiId?: number;
+        pullRequestId?: number;
+        pullRequestCommentId?: number;
+      }
+    }
+    export namespace Issue {
+      export interface PostIssueParams {
+        projectId: number;
+        summary: string;
+        priorityId: number;
+        issueTypeId: number;
+        parentIssueId?: number;
+        description?: string;
+        startDate?: string;
+        dueDate?: string;
+        estimatedHours?: number;
+        actualHours?: number;
+        categoryId?: number[];
+        versionId?: number[];
+        milestoneId?: number[];
+        assigneeId?: number;
+        notifiedUserId?: number[];
+        attachmentId?: number[];
+        [customField_: string]: any;
+      }
+      export interface PatchIssueParams {
+        summary?: string;
+        parentIssueId?: number;
+        description?: string;
+        statusId?: number;
+        resolutionId?: number;
+        startDate?: string;
+        dueDate?: string;
+        estimatedHours?: number;
+        actualHours?: number;
+        issueTypeId?: number;
+        categoryId?: number[];
+        versionId?: number[];
+        milestoneId?: number[];
+        priorityId?: number;
+        assigneeId?: number;
+        notifiedUserId?: number[];
+        attachmentId?: number[];
+        comment?: string;
+        [customField_: string]: any;
+      }
+      export interface GetIssuesParams {
+        projectId?: number[];
+        issueTypeId?: number[];
+        categoryId?: number[];
+        versionId?: number[];
+        milestoneId?: number[];
+        statusId?: number[];
+        priorityId?: number[];
+        assigneeId?: number[];
+        createdUserId?: number[];
+        resolutionId?: number[];
+        parentChild?: ParentChildType;
+        attachment?: boolean;
+        sharedFile?: boolean;
+        sort?: SortKey;
+        order?: Order;
+        offset?: number;
+        count?: number;
+        createdSince?: string;
+        createdUntil?: string;
+        updatedSince?: string;
+        updatedUntil?: string;
+        startDateSince?: string;
+        startDateUntil?: string;
+        dueDateSince?: string;
+        dueDateUntil?: string;
+        id?: number[];
+        parentIssueId?: number[];
+        keyword: string;
+        [customField_: string]: any;
+      }
+      export enum ParentChildType {
+        All = 0,
+        NotChild = 1,
+        Child = 2,
+        NotChildNotParent = 3,
+        Parent = 4,
+      }
+      export type SortKey = "issueType" | "category" | "version" | "milestone" | "summary" | "status" | "priority" | "attachment" | "sharedFile" | "created" | "createdUser" | "updated" | "updatedUser" | "assignee" | "startDate" | "dueDate" | "estimatedHours" | "actualHours" | "childIssue";
+      export interface GetIssueCommentsParams {
+        minId?: number;
+        maxId?: number;
+        count?: number;
+        order?: Order;
+      }
+      export interface PostIssueCommentsParams {
+        content: string;
+        notifiedUserId?: number[];
+        attachmentId?: number[];
+      }
+      export interface PatchIssueCommentParams {
+        content: string;
+      }
+      export interface IssueCommentNotifications {
+        notifiedUserId: number[];
+      }
+      export interface LinkIssueSharedFilesParams {
+        fileId: number[];
+      }
+    }
+    export namespace PullRequest {
+      export interface GetPullRequestsParams {
+        statusId?: number[];
+        assigneeId?: number[];
+        issueId?: number[];
+        createdUserId?: number[];
+        offset?: number;
+        count?: number;
+      }
+      export interface PostPullRequestParams {
+        summary: string;
+        description: string;
+        base: string;
+        branch: string;
+        issueId?: number;
+        assigneeId?: number;
+        notifiedUserId?: number[];
+        attachmentId?: number[];
+      }
+      export interface PatchPullRequestParams {
+        summary?: string;
+        description?: string;
+        issueId?: number;
+        assigneeId?: number;
+        notifiedUserId?: number[];
+        comment?: string[];
+      }
+      export interface GetPullRequestCommentsParams {
+        minId?: number;
+        maxId?: number;
+        count?: number;
+        order?: Order;
+      }
+      export interface PostPullRequestCommentsParams {
+        content: string;
+        notifiedUserId?: number[];
+      }
+      export interface PatchPullRequestCommentsParams {
+        content: string;
+      }
+    }
+    export namespace Wiki {
+      export interface PostWikiParams {
+        projectId: number;
+        name: string;
+        content: string;
+        mailNotify?: boolean;
+      }
+      export interface PatchWikiParams {
+        name?: string;
+        content?: string;
+        mailNotify?: boolean;
+      }
+      export interface GetWikisHistoryParams {
+        minId?: number;
+        maxId?: number;
+        count?: number;
+        order?: Order;
+      }
+    }
+    export namespace OAuth2 {
+      export interface Credentials {
+        clientId: string;
+        clientSecret: string;
+      }
+    }
+  }
+
+  export namespace Error {
+    export class BacklogError extends global.Error {
+      private _name;
+      private _url;
+      private _status;
+      private _body;
+      private _response;
+      constructor(name: BacklogErrorNameType, response: IResponse, body?: {
+        errors: BacklogErrorMessage[];
+      });
+      name: BacklogErrorNameType;
+      url: string;
+      status: number;
+      body: {
+        errors: BacklogErrorMessage[];
+      };
+      response: IResponse;
+    }
+    export class BacklogApiError extends BacklogError {
+      constructor(response: IResponse, body?: {
+        errors: BacklogErrorMessage[];
+      });
+    }
+    export class BacklogAuthError extends BacklogError {
+      constructor(response: IResponse, body?: {
+        errors: BacklogErrorMessage[];
+      });
+    }
+    export class UnexpectedError extends BacklogError {
+      constructor(response: IResponse);
+    }
+    export interface BacklogErrorMessage {
+      message: string;
+      code: number;
+      errorInfo: string;
+      moreInfo: string;
+    }
+    export type BacklogErrorNameType = 'BacklogApiError' | 'BacklogAuthError' | 'UnexpectedError';
+  }
+
+}
diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index 59cef89b1a..d7995438c1 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -82,6 +82,7 @@ var voidProm: Promise<void>;
 
 var fooProm: Promise<Foo>;
 var barProm: Promise<Bar>;
+var barOrVoidProm: Promise<Bar | void>;
 var fooOrBarProm: Promise<Foo|Bar>;
 var bazProm: Promise<Baz>;
 
@@ -221,12 +222,12 @@ barProm = fooProm.then((value: Foo) => {
 }, (reason: any) => {
 	return barProm;
 });
-barProm = fooProm.then((value: Foo) => {
+barOrVoidProm = fooProm.then((value: Foo) => {
 	return bar;
 }, (reason: any) => {
 	return;
 });
-barProm = fooProm.then((value: Foo) => {
+barOrVoidProm = fooProm.then((value: Foo) => {
 	return bar;
 }, (reason: any) => {
 	return voidProm;
diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index 042347f096..35b506542a 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -47,8 +47,10 @@ class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R> {
   /**
    * Promises/A+ `.then()`. Returns a new promise chained from this promise. The new promise will be rejected or resolved dedefer on the passed `fulfilledHandler`, `rejectedHandler` and the state of this promise.
    */
-  then<U>(onFulfill: (value: R) => U | Bluebird.Thenable<U>, onReject?: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U>;
-  then<U>(onFulfill: (value: R) => U | Bluebird.Thenable<U>, onReject?: (error: any) => void | Bluebird.Thenable<void>): Bluebird<U>;
+  then<U1, U2>(onFulfill: (value: R) => U1 | Bluebird.Thenable<U1>, onReject: (error: any) => U2 | Bluebird.Thenable<U2>): Bluebird<U1 | U2>;
+  then<U>(onFulfill: (value: R) => U | Bluebird.Thenable<U>, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U>;
+  then<U>(onFulfill: (value: R) => U | Bluebird.Thenable<U>): Bluebird<U>;
+  then(): Bluebird<R>;
 
   /**
    * This is a catch-all exception handler, shortcut for calling `.then(null, handler)` on this promise. Any exception happening in a `.then`-chain will propagate to nearest `.catch` handler.
diff --git a/braintree-web/braintree-web-tests.ts b/braintree-web/braintree-web-tests.ts
new file mode 100644
index 0000000000..40b34df418
--- /dev/null
+++ b/braintree-web/braintree-web-tests.ts
@@ -0,0 +1,432 @@
+/// <reference path="braintree-web.d.ts" />
+
+let version: string = braintree.VERSION;
+
+let clientToken: string = "eyJ2ZXJzaW9uIjoyLCJhdXRob3JpemF0aW9uRmluZ2VycHJpbnQiOiI0YjlhYzVmYmI4ZTNkYzQzMmFkZjJhNzBlNjZlMWNjY2M5ODRkYzE4ZTM4YmY4NjYzZTM5NjM3NWZjYmQzY2U5fGNyZWF0ZWRfYXQ9MjAxNi0wOS0wOFQwNTowMzo0MC4xNjk1NTUwMzUrMDAwMFx1MDAyNm1lcmNoYW50X2lkPTM0OHBrOWNnZjNiZ3l3MmJcdTAwMjZwdWJsaWNfa2V5PTJuMjQ3ZHY4OWJxOXZtcHIiLCJjb25maWdVcmwiOiJodHRwczovL2FwaS5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tOjQ0My9tZXJjaGFudHMvMzQ4cGs5Y2dmM2JneXcyYi9jbGllbnRfYXBpL3YxL2NvbmZpZ3VyYXRpb24iLCJjaGFsbGVuZ2VzIjpbXSwiZW52aXJvbm1lbnQiOiJzYW5kYm94IiwiY2xpZW50QXBpVXJsIjoiaHR0cHM6Ly9hcGkuc2FuZGJveC5icmFpbnRyZWVnYXRld2F5LmNvbTo0NDMvbWVyY2hhbnRzLzM0OHBrOWNnZjNiZ3l3MmIvY2xpZW50X2FwaSIsImFzc2V0c1VybCI6Imh0dHBzOi8vYXNzZXRzLmJyYWludHJlZWdhdGV3YXkuY29tIiwiYXV0aFVybCI6Imh0dHBzOi8vYXV0aC52ZW5tby5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tIiwiYW5hbHl0aWNzIjp7InVybCI6Imh0dHBzOi8vY2xpZW50LWFuYWx5dGljcy5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tLzM0OHBrOWNnZjNiZ3l3MmIifSwidGhyZWVEU2VjdXJlRW5hYmxlZCI6dHJ1ZSwicGF5cGFsRW5hYmxlZCI6dHJ1ZSwicGF5cGFsIjp7ImRpc3BsYXlOYW1lIjoiQWNtZSBXaWRnZXRzLCBMdGQuIChTYW5kYm94KSIsImNsaWVudElkIjpudWxsLCJwcml2YWN5VXJsIjoiaHR0cDovL2V4YW1wbGUuY29tL3BwIiwidXNlckFncmVlbWVudFVybCI6Imh0dHA6Ly9leGFtcGxlLmNvbS90b3MiLCJiYXNlVXJsIjoiaHR0cHM6Ly9hc3NldHMuYnJhaW50cmVlZ2F0ZXdheS5jb20iLCJhc3NldHNVcmwiOiJodHRwczovL2NoZWNrb3V0LnBheXBhbC5jb20iLCJkaXJlY3RCYXNlVXJsIjpudWxsLCJhbGxvd0h0dHAiOnRydWUsImVudmlyb25tZW50Tm9OZXR3b3JrIjp0cnVlLCJlbnZpcm9ubWVudCI6Im9mZmxpbmUiLCJ1bnZldHRlZE1lcmNoYW50IjpmYWxzZSwiYnJhaW50cmVlQ2xpZW50SWQiOiJtYXN0ZXJjbGllbnQzIiwiYmlsbGluZ0FncmVlbWVudHNFbmFibGVkIjp0cnVlLCJtZXJjaGFudEFjY291bnRJZCI6ImFjbWV3aWRnZXRzbHRkc2FuZGJveCIsImN1cnJlbmN5SXNvQ29kZSI6IlVTRCJ9LCJjb2luYmFzZUVuYWJsZWQiOmZhbHNlLCJtZXJjaGFudElkIjoiMzQ4cGs5Y2dmM2JneXcyYiIsInZlbm1vIjoib2ZmIn0=";
+
+braintree.client.create({
+  authorization: clientToken
+}, function (error: BraintreeError, clientInstance: any) {
+
+  var form: HTMLFormElement = document.getElementById('my-form-id') as HTMLFormElement;
+  var data: { creditCard: BraintreeWeb.CreditCardInfo } = {
+    creditCard: {
+      number: form['cc-number'].value,
+      cvv: form['cc-cvv'].value,
+      expirationDate: form['cc-date'].value,
+      billingAddress: {
+        postalCode: form['cc-postal'].value
+      }
+    }
+  };
+
+  clientInstance.request({
+    endpoint: 'payment_methods/credit_cards',
+    method: 'post',
+    data: data
+  }, function (requestErr: BraintreeError, response: { creditCards: any[]; }) {
+    if (requestErr) { throw new Error(requestErr.message); }
+
+    console.log('Got nonce:', response.creditCards[0].nonce);
+  });
+
+  braintree.hostedFields.create({
+    client: clientInstance,
+    styles: {
+      'input': {
+        'font-size': '16pt',
+        'color': '#3A3A3A'
+      },
+
+      '.number': {
+        'font-family': 'monospace'
+      },
+      '.valid': {
+        'color': 'green'
+      }
+    },
+    fields: {
+      number: {
+        selector: '#card-number'
+      },
+      cvv: {
+        selector: '#cvv'
+      },
+      expirationDate: {
+        selector: '#expiration-date'
+      }
+    }
+  }, function (hostedFieldsErr?: BraintreeError, hostedFieldsInstance?: any) {
+
+    if (hostedFieldsErr) {
+      // Handle error in Hosted Fields creation
+      console.log(`Error Code: ${error.code}, Type: ${error.type}, Message: ${error.message}, Details: ${error.details}`);
+      return;
+    }
+
+    let form = new HTMLFormElement();
+
+    form.addEventListener('submit', function (event: Event) {
+      event.preventDefault();
+
+      hostedFieldsInstance.tokenize(function (tokenizeErr: BraintreeError, payload: BraintreeWeb.HostedFieldsTokenizePayload) {
+        if (tokenizeErr) {
+          // Handle error in Hosted Fields tokenization
+          switch (tokenizeErr.code) {
+            case 'HOSTED_FIELDS_FIELDS_EMPTY':
+              console.error('All fields are empty! Please fill out the form.');
+              break;
+            case 'HOSTED_FIELDS_FIELDS_INVALID':
+              console.error('Some fields are invalid:', tokenizeErr.details.invalidFieldKeys);
+              break;
+            case 'HOSTED_FIELDS_FAILED_TOKENIZATION':
+              console.error('Tokenization failed server side. Is the card valid?');
+              break;
+            case 'HOSTED_FIELDS_TOKENIZATION_NETWORK_ERROR':
+              console.error('Network error occurred when tokenizing.');
+              break;
+            default:
+              console.error('Something bad happened!', tokenizeErr);
+          }
+          return;
+        }
+
+        // Put `payload.nonce` into the `payment-method-nonce` input, and then
+        // submit the form. Alternatively, you could send the nonce to your server
+        // with AJAX.
+        (document.querySelector('input[name="payment-method-nonce"]') as HTMLInputElement).value = payload.nonce;
+        form.submit();
+      });
+    }, false);
+
+    hostedFieldsInstance.on('focus', function (event: BraintreeWeb.HostedFieldsStateObject) {
+      console.log(event.emittedBy, 'has been focused');
+    });
+
+    hostedFieldsInstance.teardown(function (teardownErr: BraintreeError) {
+      if (teardownErr) {
+        console.error('Could not tear down Hosted Fields!');
+      } else {
+        console.info('Hosted Fields has been torn down!');
+      }
+    });
+
+    hostedFieldsInstance.tokenize({
+      vault: true
+    }, function (tokenizeErr: BraintreeError, payload: BraintreeWeb.HostedFieldsTokenizePayload) {
+      if (tokenizeErr) {
+        console.error(tokenizeErr);
+      } else {
+        console.log('Got nonce:', payload.nonce);
+      }
+    });
+
+    hostedFieldsInstance.addClass('number', 'custom-class', function (addClassErr: BraintreeError) {
+      if (addClassErr) {
+        console.error(addClassErr);
+      }
+    });
+
+    hostedFieldsInstance.addClass('number', 'custom-class', function (addClassErr: BraintreeError) {
+      if (addClassErr) {
+        console.error(addClassErr);
+        return;
+      }
+
+      // some time later...
+      hostedFieldsInstance.removeClass('number', 'custom-class');
+    });
+
+    hostedFieldsInstance.setPlaceholder('number', '4111 1111 1111 1111', function (placeholderErr: BraintreeError) {
+      if (placeholderErr) {
+        console.error(placeholderErr);
+      }
+    });
+
+    hostedFieldsInstance.on('cardTypeChange', function (event: BraintreeWeb.HostedFieldsStateObject) {
+      // Update the placeholder value if there is only one possible card type
+      if (event.cards.length === 1) {
+        braintree.hostedFields.setPlaceholder('cvv', event.cards[0].code.name, function (placeholderErr: BraintreeError) {
+          if (placeholderErr) {
+            // Handle errors, such as invalid field name
+            console.error(placeholderErr);
+          }
+        });
+      }
+    });
+
+    hostedFieldsInstance.clear('number', function (clearErr: BraintreeError) {
+      if (clearErr) {
+        console.error(clearErr);
+      }
+    });
+
+    hostedFieldsInstance.clear('number');
+    hostedFieldsInstance.clear('cvv');
+    hostedFieldsInstance.clear('expirationDate');
+
+    var state = braintree.hostedFields.getState();
+
+    var formValid = Object.keys(state.fields).every(function (key) {
+      return state.fields[key].isValid;
+    });
+  });
+
+  braintree.applePay.create({ client: clientInstance }, function (createErr?: BraintreeError, applePayInstance?: any) {
+    if (createErr) {
+      // Handle error in client creation
+      console.log(`Error Code: ${error.code}, Type: ${error.type}, Message: ${error.message}, Details: ${error.details}`);
+
+      return;
+    }
+
+    let request = {
+      countryCode: 'US',
+      currencyCode: 'USD',
+      supportedNetworks: ['visa', 'masterCard'],
+      merchantCapabilities: ['supports3DS'],
+      total: { label: 'Your Label', amount: '10.00' },
+    };
+
+    var paymentRequest = braintree.applePay.createPaymentRequest(request);
+
+    console.log(paymentRequest);
+    // { total: { }, countryCode: 'US', currencyCode: 'USD', merchantCapabilities: [ ], supportedNetworks: [ ] }
+  });
+
+  braintree.applePay.create({ client: clientInstance }, function (createErr, applePayInstance) {
+    let request = {
+      countryCode: 'US',
+      currencyCode: 'USD',
+      supportedNetworks: ['visa', 'masterCard'],
+      merchantCapabilities: ['supports3DS'],
+      total: { label: 'Your Label', amount: '10.00' },
+    };
+
+    var session = new ApplePaySession(1, request);
+
+    session.onvalidatemerchant = function (event: { validationURL: string }) {
+      braintree.applePay.performValidation({
+        validationURL: event.validationURL
+      }, function (err, validationData) {
+        if (err) {
+          console.error(err);
+          session.abort();
+          return;
+        }
+        session.completeMerchantValidation(validationData);
+      });
+    };
+  });
+
+  braintree.applePay.create({ client: clientInstance }, function (createErr, applePayInstance) {
+    let request = {
+      countryCode: 'US',
+      currencyCode: 'USD',
+      supportedNetworks: ['visa', 'masterCard'],
+      merchantCapabilities: ['supports3DS'],
+      total: { label: 'Your Label', amount: '10.00' },
+    };
+
+    var session = new ApplePaySession(1, request);
+
+    session.onpaymentauthorized = function (event) {
+      braintree.applePay.tokenize({
+        token: event.payment.token
+      }, function (err, tokenizedPayload) {
+        if (err) {
+          session.completePayment(ApplePayStatusCodes.STATUS_FAILURE);
+          return;
+        }
+        session.completePayment(ApplePayStatusCodes.STATUS_SUCCESS);
+
+        // Send the tokenizedPayload to your server.
+      });
+    };
+  });
+
+  braintree.paypal.create({
+    client: clientInstance
+  }, function (createErr, paypalInstance) {
+    if (createErr) {
+      if (createErr.code === 'PAYPAL_BROWSER_NOT_SUPPORTED') {
+        console.error('This browser is not supported.');
+      } else {
+        console.error('Error!', createErr);
+      }
+    }
+
+    let button = new HTMLButtonElement();
+
+    button.addEventListener('click', function () {
+      // Disable the button so that we don't attempt to open multiple popups.
+      button.setAttribute('disabled', 'disabled');
+
+      // Because PayPal tokenization opens a popup, this must be called
+      // as a result of a user action, such as a button click.
+      paypalInstance.tokenize({
+        flow: 'vault' // Required
+        // Any other tokenization options
+      }, function (tokenizeErr: BraintreeError, payload: BraintreeWeb.PayPalTokenizePayload) {
+        button.removeAttribute('disabled');
+
+        if (tokenizeErr) {
+          // Handle tokenization errors or premature flow closure
+
+          switch (tokenizeErr.code) {
+            case 'PAYPAL_POPUP_CLOSED':
+              console.error('Customer closed PayPal popup.');
+              break;
+            case 'PAYPAL_ACCOUNT_TOKENIZATION_FAILED':
+              console.error('PayPal tokenization failed. See details:', tokenizeErr.details);
+              break;
+            case 'PAYPAL_FLOW_FAILED':
+              console.error('Unable to initialize PayPal flow. Are your options correct?', tokenizeErr.details);
+              break;
+            default:
+              console.error('Error!', tokenizeErr);
+          }
+        } else {
+          // Submit payload.nonce to your server
+        }
+      });
+    });
+  });
+
+  braintree.unionpay.create({ client: clientInstance }, function (createErr, unionpayInstance) {
+    if (createErr) {
+      console.error(createErr);
+      return;
+    }
+
+    unionpayInstance.fetchCapabilities({
+      card: {
+        number: '4111111111111111'
+      }
+    }, function (fetchErr: BraintreeError, cardCapabilities: BraintreeWeb.UnionPayFetchCapabilitiesPayload) {
+      if (fetchErr) {
+        console.error(fetchErr);
+        return;
+      }
+
+      if (cardCapabilities.isUnionPay) {
+        if (cardCapabilities.unionPay && !cardCapabilities.unionPay.isSupported) {
+          // Braintree cannot process this UnionPay card.
+          // Ask the user for a different card.
+          return;
+        }
+
+        if (cardCapabilities.isDebit) {
+          // CVV and expiration date are not required
+        } else {
+          // CVV and expiration date are required
+        }
+
+        // Show mobile phone number field for enrollment
+      }
+    });
+
+    unionpayInstance.enroll({
+      card: {
+        number: '4111111111111111',
+        expirationMonth: '12',
+        expirationYear: '2038'
+      },
+      mobile: {
+        countryCode: '62',
+        number: '111111111111'
+      }
+    }, function (enrollErr: BraintreeError, response: BraintreeWeb.UnionPayEnrollPayload) {
+      if (enrollErr) {
+        console.error(enrollErr);
+        return;
+      }
+
+      if (response.smsCodeRequired) {
+        // If smsCodeRequired, wait for SMS auth code from customer
+        // Then use response.enrollmentId during {@link UnionPay#tokenize}
+      } else {
+        // SMS code is not required from the user.
+        // {@link UnionPay#tokenize} can be called immediately
+      }
+    });
+
+    let enrollResponse: {
+      enrollmentId: string
+    };
+
+    unionpayInstance.tokenize({
+      card: {
+        number: '4111111111111111',
+        expirationMonth: '12',
+        expirationYear: '2038',
+        cvv: '123'
+      },
+      enrollmentId: enrollResponse.enrollmentId, // Returned from enroll
+      smsCode: '11111' // Received by customer's phone, if SMS enrollment was required. Otherwise it should be omitted
+    }, function (tokenizeErr: BraintreeError, response: BraintreeWeb.UnionPayTokenizePayload) {
+      if (tokenizeErr) {
+        console.error(tokenizeErr);
+        return;
+      }
+
+      // Send response.nonce to your server
+    });
+
+    unionpayInstance.teardown(function (teardownErr: BraintreeError) {
+      if (teardownErr) {
+        console.error('Could not tear down UnionPay.');
+      } else {
+        console.log('UnionPay has been torn down.');
+      }
+    });
+  });
+});
+
+let existingNonce = "fake-valid-nonce";
+let submitNonceToServer: (nonce: string) => void;
+
+braintree.threeDSecure.verifyCard({
+  nonce: existingNonce,
+  amount: 123.45,
+  addFrame: function (err, iframe) {
+    // Set up your UI and add the iframe.
+    let my3DSContainer = document.createElement('div');
+    my3DSContainer.appendChild(iframe);
+    document.body.appendChild(my3DSContainer);
+  },
+  removeFrame: function () {
+    let my3DSContainer = document.createElement('div');
+
+    // Remove UI that you added in addFrame.
+    document.body.removeChild(my3DSContainer);
+  }
+}, function (err: BraintreeError, payload: BraintreeWeb.ThreeDSecureVerifyPayload) {
+  if (err) {
+    console.error(err);
+    return;
+  }
+
+  if (payload.liabilityShifted) {
+    // Liablity has shifted
+    submitNonceToServer(payload.nonce);
+  } else if (payload.liabilityShiftPossible) {
+    // Liablity may still be shifted
+    // Decide if you want to submit the nonce
+  } else {
+    // Liablity has not shifted and will not shift
+    // Decide if you want to submit the nonce
+  }
+});
+
+braintree.threeDSecure.cancelVerifyCard(function (err: BraintreeError, verifyPayload: BraintreeWeb.ThreeDSecureVerifyPayload) {
+  if (err) {
+    // Handle error
+    console.log(err.message); // No verification payload available
+    return;
+  }
+
+  verifyPayload.nonce; // The nonce returned from the 3ds lookup call
+  verifyPayload.liabilityShifted; // boolean
+  verifyPayload.liabilityShiftPossible; // boolean
+});
\ No newline at end of file
diff --git a/braintree-web/braintree-web.d.ts b/braintree-web/braintree-web.d.ts
new file mode 100644
index 0000000000..2cf2d89467
--- /dev/null
+++ b/braintree-web/braintree-web.d.ts
@@ -0,0 +1,1738 @@
+// Type definitions for Braintree-web v3.0.2
+// Project: https://github.com/braintree/braintree-web
+// Definitions by: Guy Shahine <https://github.com/chlela>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * @module braintree-web/american-express
+ * @description This module is for use with Amex Express Checkout. To accept American Express cards, use Hosted Fields.
+ */
+declare namespace BraintreeWeb {
+  export interface AmericanExpress {
+    /**
+     * @static
+     * @function create
+     * @param {object} options Creation options:
+     * @param {Client} options.client A {@link Client} instance.
+     * @param {callback} callback The second argument, `data`, is the {@link AmericanExpress} instance.
+     * @returns {void}
+     */
+    create: (options: { client: Client }, callback: callback) => void;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+ * @class
+ * @param {object} options Options
+ * @description <strong>You cannot use this constructor directly. Use {@link module:braintree-web/american-express.create|braintree.american-express.create} instead.</strong>
+ * @classdesc This class allows you use a nonce to interact with American Express Checkout. To accept American Express cards, use Hosted Fields.
+ */
+  export class AmericanExpress {
+    /**
+     * @class
+     * @param {object} options Options
+     * @description <strong>You cannot use this constructor directly. Use {@link module:braintree-web/american-express.create|braintree.american-express.create} instead.</strong>
+     * @classdesc This class allows you use a nonce to interact with American Express Checkout. To accept American Express cards, use Hosted Fields.
+     */
+    constructor(options: any);
+
+    /**
+     * Gets the rewards balance associated with a Braintree nonce.
+     * @public
+     * @param {object} options Request options
+     * @param {string} options.nonce An existing Braintree nonce.
+     * @param {callback} callback The second argument, <code>data</code>, is the returned server data.
+     * @returns {void}
+     * @example
+     * var americanExpress = require('braintree-web/american-express');
+     *
+     * americanExpress.create({client: clientInstance}, function (createErr, americanExpressInstance) {
+     *   var options = {nonce: existingBraintreeNonce};
+     *   americanExpressInstance.getRewardsBalance(options, function (getErr, payload) {
+     *     if (getErr || payload.error) {
+     *       // Handle error
+     *       return;
+     *     }
+     *
+     *     console.log('Rewards amount: ' + payload.rewardsAmount);
+     *   });
+     * });
+     */
+    public getRewardsBalance(options: { nonce: string }, callback: callback): void;
+
+    /**
+     * Gets the Express Checkout nonce profile given a nonce from American Express.
+     * @public
+     * @param {object} options Request options
+     * @param {string} options.nonce An existing nonce from American Express (note that this is <em>not</em> a nonce from Braintree).
+     * @param {callback} callback The second argument, <code>data</code>, is the returned server data.
+     * @returns {void}
+     * @example
+     * var americanExpress = require('braintree-web/american-express');
+     *
+     * americanExpress.create({client: clientInstance}, function (createErr, americanExpressInstance) {
+     *   var options = {nonce: existingAmericanExpressNonce};
+     *   americanExpressInstance.getExpressCheckoutProfile(options, function (getErr, payload) {
+     *     if (getErr) {
+     *       // Handle error
+     *       return;
+     *     }
+     *
+     *     console.log('Number of cards: ' + payload.amexExpressCheckoutCards.length);
+     *   });
+     * });
+     */
+    public getExpressCheckoutProfile(options: { nonce: string }, callback: callback): void;
+  }
+}
+
+
+// more info https://developer.apple.com/reference/applepayjs/1916082-applepay_js_data_types/paymentrequest
+
+//  billingContact
+//  Billing contact information for the user.
+//    countryCode
+//Required.The merchant’s two- letter ISO 3166 country code.
+//    currencyCode
+//  Required.The three- letter ISO 4217 currency code for the payment.
+//    lineItems
+//A set of line items that explain recurring payments and additional charges.
+//    merchantCapabilities
+//  Required.The payment capabilities supported by the merchant.The value must be one or more of supports3DS, supportsEMV, supportsCredit, or supportsDebit.
+//    requiredBillingContactFields
+//  The billing information that is required from the user.The value must be one or more of postalAddress, phone, email, or name.
+//    requiredShippingContactFields
+//  The shipping information that is required from the user.The value must be one or more of postalAddress, phone, email, or name.
+//    shippingContact
+//  Shipping contact information for the user.
+//    shippingMethods
+//A set of available shipping methods.Totals for all shipping methods must be non- negative to pass validation.
+//    shippingType
+//  How the items are to be shipped.This property is optional.If specified, it must be one or more of shipping, delivery, storePickup, or servicePickup.The default value is shipping.
+//    supportedNetworks
+//  Required.The payment networks supported by the merchant.The value must be one or more of amex, discover, interac, masterCard, privateLabel, or visa.
+//    total
+//  Required.The total amount for the payment.The total must be greater than zero and have a label to pass validation.
+interface ApplePayPaymentRequest {
+  total: {
+    label: string;
+    amount: string;
+  };
+  countryCode: string;
+  currencyCode: string;
+  supportedNetworks: string[];
+  merchantCapabilities: string[];
+
+  billingContact?: any;
+  shippingContact?: any;
+  shippingMethods?: any;
+  shippingType?: any;
+  requiredBillingContactFields?: any;
+  requiredShippingContactFields?: any;
+}
+
+declare enum ApplePayStatusCodes {
+  // The requested action succeeded.
+  STATUS_SUCCESS = 1,
+  // The requested action failed.
+  STATUS_FAILURE,
+  // The billing address is not valid.
+  STATUS_INVALID_BILLING_POSTAL_ADDRESS,
+  // The shipping address is not valid.
+  STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+  // The shipping contact information is not valid.
+  STATUS_INVALID_SHIPPING_CONTACT,
+  // The required PIN information was not provided. Cards on the China Union Pay payment network may require a PIN to authenticate the transaction.
+  STATUS_PIN_REQUIRED,
+  // The PIN information is not valid.Cards on the China Union Pay network may require a PIN.
+  STATUS_PIN_INCORRECT,
+  // The maximum number of tries for a PIN has been reached and the user has been locked out. Cards on the China Union Pay network may require a PIN.
+  STATUS_PIN_LOCKOUT,
+}
+
+interface ApplePayPayload {
+  merchantIdentifier: string;
+  domainName: string;
+  displayName: string;
+}
+
+declare class ApplePaySession {
+  constructor(version: number, request: ApplePayPaymentRequest);
+
+  canMakePayments(): boolean;
+
+  canMakePaymentsWithActiveCard(merchantIdentifier: string): boolean;
+
+  completeMerchantValidation(merchantSession: any): void;
+
+  abort(): void;
+
+  begin(): void;
+
+  completePayment(status: ApplePayStatusCodes): void;
+
+  completePaymentMethodSelection(newTotal: any, newLineItems: any): void;
+
+  completeShippingContactSelection(status: ApplePayStatusCodes, newShippingMethods: any, newTotal: any, newLineItems: any): void;
+
+  completeShippingMethodSelection(status: ApplePayStatusCodes, newTotal: any, newLineItems: any): void;
+
+  supportsVersion(version: number): boolean;
+
+  oncancel: (event: any) => void;
+
+  onpaymentauthorized: (event: any) => void;
+
+  onpaymentmethodselected: (event: any) => void;
+
+  onshippingcontactselected: (event: any) => void;
+
+  onshippingmethodselected: (event: any) => void;
+
+  onvalidatemerchant: (event: any) => void;
+}
+
+/**
+ * @module braintree-web/apple-pay
+ * @description Accept Apple Pay on the Web. *This component is currently in beta and is subject to change.*
+ */
+declare namespace BraintreeWeb {
+  export interface ApplePay {
+    /**
+     * @static
+     * @function create
+     * @param {object} options Creation options:
+     * @param {Client} options.client A {@link Client} instance.
+     * @param {callback} callback The second argument, `data`, is the {@link ApplePay} instance.
+     * @returns {void}
+     */
+    create: (options: { client: Client }, callback: callback) => void;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+ * @class
+ * @param {object} options Options
+ * @description <strong>You cannot use this constructor directly. Use {@link module:braintree-web/apple-pay.create|braintree.apple-pay.create} instead.</strong>
+ * @classdesc This class represents an Apple Pay component. Instances of this class have methods for validating the merchant server and tokenizing payments.
+ */
+  export class ApplePay {
+    /**
+     * @class
+     * @param {object} options Options
+     * @description <strong>You cannot use this constructor directly. Use {@link module:braintree-web/apple-pay.create|braintree.apple-pay.create} instead.</strong>
+     * @classdesc This class represents an Apple Pay component. Instances of this class have methods for validating the merchant server and tokenizing payments.
+     */
+    constructor(options: any);
+
+    /**
+     * Merges a payment request with Braintree defaults
+     * The following properties are assigned to `paymentRequest` if not already defined
+     * - countryCode
+     * - currencyCode
+     * - merchantCapabilities
+     * - supportedNetworks
+     * @public
+     * @param {external:ApplePayPaymentRequest} paymentRequest The payment request details to apply on top of those from Braintree.
+     * @returns {external:ApplePayPaymentRequest} The decorated `paymentRequest`.
+     * @example
+     * var applePay = require('braintree-web/apple-pay');
+     *
+     * applePay.create({client: clientInstance}, function (createErr, applePayInstance) {
+     *   // ...
+     *   var paymentRequest = applePay.createPaymentRequest({
+     *    total: {
+     *      label: 'My Company',
+     *      amount: '19.99'
+     *   });
+     *
+     *   console.log(paymentRequest);
+     *   // { total: { }, countryCode: 'US', currencyCode: 'USD', merchantCapabilities: [ ], supportedNetworks: [ ] }
+     *
+     */
+    public createPaymentRequest(paymentRequest: ApplePayPaymentRequest): ApplePayPaymentRequest
+
+    /**
+     * Validates the merchant website, as required by ApplePaySession before payment can be authorized.
+     * @public
+     * @param {object} options Options
+     * @param {string} options.validationURL The validationURL fram an ApplePayValidateMerchantEvent.
+     * @param {string} [options.displayName]
+     * - The canonical name for your store.
+     * - The system may display this name to the user.
+     * - Use a 128-character or less, UTF-8 string.
+     * - Do not localize the name.
+     * @param {string} [options.merchantIdentifier]
+     * Your Apple merchant identifier. This is the Apple Merchant ID created on the Apple Developer Portal.
+     * Defaults to the merchant identifier specified in the Braintree Control Panel.
+     * You can use this field to override the merchant identifier for this transaction.
+     * @param {callback} callback The second argument, <code>data</code>, is the Apple Pay merchant session object.
+     * Pass the merchant session to your Apple Pay session's completeMerchantValidation method.
+     * @returns {void}
+     * @example
+     * var applePay = require('braintree-web/apple-pay');
+     *
+     * applePay.create({client: clientInstance}, function (createErr, applePayInstance) {
+     *   var session = new ApplePaySession(1, {
+     *     // This should be the payment request object that
+     *     // contains the information needed to display the payment sheet.
+     *   });
+     *
+     *   session.onvalidatemerchant = function (event) {
+     *     applePay.performValidation({
+     *       validationURL: event.validationURL
+     *     }, function(err, validationData) {
+     *       if (err) {
+     *         console.error(err);
+     *         session.abort();
+     *         return;
+     *       }
+     *       session.completeMerchantValidation(validationData);
+     *     });
+     *   };
+     * });
+     */
+    public performValidation(options: { validationURL: string, displayName?: string, merchantIdentifier?: string }, callback: callback): void;
+
+    /**
+     * Tokenizes an Apple Pay payment.
+     * @public
+     * @param {object} options Options
+     * @param {object} options.token The `payment.token` property of an {@link external:ApplePayPaymentAuthorizedEvent}
+     * @param {callback} callback The second argument, <code>data</code>, is the tokenized payload.
+     * @returns {void}
+     * @example
+     * var applePay = require('braintree-web/apple-pay');
+     *
+     * applePay.create({client: clientInstance}, function (createErr, applePayInstance) {
+     *   var session = new ApplePaySession(1, { });
+     *
+     *   session.onpaymentauthorized = function (event) {
+     *     applePay.tokenize({
+     *       token: event.payment.token
+     *     }, function (err, tokenizedPayload) {
+     *       if (err) {
+     *         session.completePayment(ApplePaySession.STATUS_FAILURE);
+     *         return;
+     *       }
+     *       session.completePayment(ApplePaySession.STATUS_SUCCESS);
+     *
+     *       // Send the tokenizedPayload to your server.
+     *     });
+     *  };
+     * });
+     */
+    public tokenize(options: { token: any }, callback: callback): void;
+
+  }
+}
+
+/** @module braintree-web/client */
+declare namespace BraintreeWeb {
+  /**
+ * This object is returned by {@link Client#getConfiguration|getConfiguration}. This information is used extensively by other Braintree modules to properly configure themselves.
+ * @typedef {object} Client~configuration
+ * @property {object} client The braintree-web/client parameters.
+ * @property {string} client.authorization A tokenizationKey or clientToken.
+ * @property {object} gatewayConfiguration Gateway-supplied configuration.
+ * @property {object} analyticsMetadata Analytics-specific data.
+ * @property {string} analyticsMetadata.sessionId Uniquely identifies a browsing session.
+ * @property {string} analyticsMetadata.sdkVersion The braintree.js version.
+ * @property {string} analyticsMetadata.merchantAppId Identifies the merchant's web app.
+ */
+  interface ClientAnalyticsMetadata {
+    sessionId: string;
+    sdkVersion: string;
+    merchantAppId: string;
+  }
+
+  interface Configuration {
+    client: Client;
+    gatewayConfiguration: any;
+    analyticsMetadata: ClientAnalyticsMetadata;
+  }
+
+  interface CreditCardInfo {
+    number: string;
+    cvv: string;
+    expirationDate: string;
+    billingAddress: {
+      postalCode?: string;
+    }
+  }
+
+  export interface Client {
+    authorization: string;
+
+    /**
+     * @function
+     * @description This function is the entry point for the <code>braintree.client</code> module. It is used for creating {@link Client} instances that service communication to Braintree servers.
+     * @param {object} options Object containing all {@link Client} options:
+     * @param {string} options.authorization A tokenizationKey or clientToken.
+     * @param {callback} callback The second argument, <code>data</code>, is the {@link Client} instance.
+     * @returns {void}
+     * @example
+     * var createClient = require('braintree-web/client').create;
+     *
+     * createClient({
+     *   authorization: CLIENT_AUTHORIZATION
+     * }, function (createErr, clientInstance) {
+     *   ...
+     * });
+     * @static
+     */
+    create: (options: { authorization: string }, callback: callback) => void;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+ * @class
+ * @param {Client~configuration} configuration Options
+ * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/client.create|braintree.client.create} instead.</strong>
+ * @classdesc This class is required by many other Braintree components. It serves as the base API layer that communicates with our servers. It is also capable of being used to formulate direct calls to our servers, such as direct credit card tokenization. See {@link Client#request}.
+ */
+  export class Client {
+    /**
+     * @class
+     * @param {Client~configuration} configuration Options
+     * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/client.create|braintree.client.create} instead.</strong>
+     * @classdesc This class is required by many other Braintree components. It serves as the base API layer that communicates with our servers. It is also capable of being used to formulate direct calls to our servers, such as direct credit card tokenization. See {@link Client#request}.
+     */
+    constructor(configuration: Configuration);
+
+
+    /**
+     * Returns a copy of the configuration values.
+     * @public
+     * @returns {Client~configuration} configuration
+     */
+    public getConfiguration(): Configuration;
+
+    /**
+     * Used by other modules to formulate all network requests to the Braintree gateway. It is also capable of being used directly from your own form to tokenize credit card information. However, be sure to satisfy PCI compliance if you use direct card tokenization.
+     * @public
+     * @param {object} options Request options:
+     * @param {string} options.method HTTP method. i.e. "get" or "post"
+     * @param {string} options.endpoint Enpoint path. i.e. "payment_methods"
+     * @param {object} options.data Data to send with the request
+     * @param {string} [options.timeout=60000] Timeout limit
+     * @param {callback} callback The second argument, <code>data</code>, is the returned server data.
+     * @example
+     * <caption>Direct Credit Card Tokenization</caption>
+     * var createClient = require('braintree-web/client').create;
+     *
+     * createClient({
+     *   authorization: CLIENT_AUTHORIZATION
+     * }, function (createErr, clientInstance) {
+     *   var form = document.getElementById('my-form-id');
+     *   var data = {
+     *     creditCard: {
+     *       number: form['cc-number'].value,
+     *       cvv: form['cc-cvv'].value,
+     *       expirationDate: form['cc-date'].value,
+     *       billingAddress: {
+     *         postalCode: form['cc-postal'].value
+     *       }
+     *     }
+     *   };
+     *
+     *   // Warning: For a merchant to be eligible for the easiest level of PCI compliance (SAQ A),
+     *   // payment fields cannot be hosted on your checkout page.
+     *   // For an alternative to the following, use Hosted Fields.
+     *   clientInstance.request({
+     *     endpoint: 'payment_methods/credit_cards',
+     *     method: 'post',
+     *     data: data
+     *   }, function (requestErr, response) {
+     *     if (requestErr) { throw new Error(requestErr); }
+     *
+     *     console.log('Got nonce:', response.creditCards[0].nonce);
+     *   });
+     * });
+     * @returns {void}
+     */
+    public request(options: { method: string, endpoint: string, data: any, timeout?: number }, callback: callback): void;
+
+  }
+}
+
+/** @module braintree-web/data-collector */
+declare namespace BraintreeWeb {
+  export interface DataCollector {
+    /**
+     * @static
+     * @function create
+     * @param {object} options Creation options:
+     * @param {Client} options.client A {@link Client} instance.
+     * @param {boolean} [options.kount] If true, Kount fraud data collection is enabled.
+     * @param {boolean} [options.paypal] If true, PayPal fraud data collection is enabled.
+     * @param {callback} callback The second argument, `data`, is the {@link DataCollector} instance.
+     * @returns {void}
+     */
+    create: (options: { client: Client, kount: boolean, paypal: boolean }, callback: callback) => void;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+ * @class
+ * @global
+ * @name DataCollector
+ * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/data-collector.create|braintree-web.data-collector.create} instead.</strong>
+ * @classdesc This class is used for advanced fraud integration with PayPal and Kount. Instances of this class have {@link DataCollector#deviceData|deviceData} which is used to correlate user sessions with server transactions.
+ */
+  export class DataCollector {
+    /**
+     * @class
+     * @global
+     * @name DataCollector
+     * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/data-collector.create|braintree-web.data-collector.create} instead.</strong>
+     * @classdesc This class is used for advanced fraud integration with PayPal and Kount. Instances of this class have {@link DataCollector#deviceData|deviceData} which is used to correlate user sessions with server transactions.
+     */
+    constructor();
+
+    /**
+     * @memberof DataCollector
+     * @name deviceData
+     * @type string
+     * @description JSON string to pass with server transactions.
+     * @instance
+     */
+    deviceData: string;
+
+    /**
+     * @memberof DataCollector
+     * @name teardown
+     * @function
+     * @description Cleanly remove all event handlers and DOM nodes that were added.
+     * @param {callback} [callback] Called once teardown is complete. No data is returned if teardown completes successfully.
+     * @instance
+     * @returns {void}
+     */
+    teardown(callback?: callback): void;
+
+  }
+}
+
+/** @module braintree-web/hosted-fields */
+declare namespace BraintreeWeb {
+  /**
+   * Fields used in {@link module:braintree-web/hosted-fields~fieldOptions fields options}
+   * @typedef {object} field
+   * @property {string} selector A CSS selector to find the container where the hosted field will be inserted.
+   * @property {string} [placeholder] Will be used as the `placeholder` attribute of the input. If `placeholder` is not natively supported by the browser, it will be polyfilled.
+   * @property {boolean} [formatInput=true] - Enable or disable automatic formatting on this field. Note: Input formatting does not work properly on Android and iOS, so input formatting is automatically disabled on those browsers.
+   */
+  interface HostedFieldsField {
+    selector: string;
+    placeholder?: string;
+    formatInput?: boolean;
+  }
+
+  /**
+ * An object that has {@link module:braintree-web/hosted-fields~field field objects} for each field. Used in {@link module:braintree-web/hosted-fields~create create}.
+ * @typedef {object} fieldOptions
+ * @property {field} [number] A field for card number.
+ * @property {field} [expirationDate] A field for expiration date in `MM/YYYY` format. This should not be used with the `expirationMonth` and `expirationYear` properties.
+ * @property {field} [expirationMonth] A field for expiration month in `MM` format. This should be used with the `expirationYear` property.
+ * @property {field} [expirationYear] A field for expiration year in `YYYY` format. This should be used with the `expirationMonth` property.
+ * @property {field} [cvv] A field for 3 or 4 digit CVV or CID.
+ * @property {field} [postalCode] A field for postal or region code.
+ */
+  interface HostedFieldFieldOptions {
+    number: HostedFieldsField;
+    expirationDate?: HostedFieldsField;
+    expirationMonth?: HostedFieldsField;
+    expirationYear?: HostedFieldsField;
+    cvv: HostedFieldsField;
+    postalCode?: HostedFieldsField;
+  }
+
+  /**
+   * @typedef {object} HostedFields~hostedFieldsCard
+   * @description Information about the card type, sent in {@link HostedFields~stateObject|stateObjects}.
+   * @property {string} type The code-friendly representation of the card type. It will be one of the following strings:
+   * - `american-express`
+   * - `diners-club`
+   * - `discover`
+   * - `jcb`
+   * - `maestro`
+   * - `master-card`
+   * - `unionpay`
+   * - `visa`
+   * @property {string} niceType The pretty-printed card type. It will be one of the following strings:
+   * - `American Express`
+   * - `Diners Club`
+   * - `Discover`
+   * - `JCB`
+   * - `Maestro`
+   * - `MasterCard`
+   * - `UnionPay`
+   * - `Visa`
+   * @property {object} code
+   * This object contains data relevant to the security code requirements of the card brand.
+   * For example, on a Visa card there will be a <code>CVV</code> of 3 digits, whereas an
+   * American Express card requires a 4-digit <code>CID</code>.
+   * @property {string} code.name <code>"CVV"</code> <code>"CID"</code> <code>"CVC"</code>
+   * @property {number} code.size The expected length of the security code. Typically, this is 3 or 4.
+   */
+
+  interface HostedFieldsCardCode {
+    name: string;
+    size: number;
+  }
+
+  interface HostedFieldsHostedFieldsCard {
+    type: string;
+    niceType: string;
+    code: HostedFieldsCardCode;
+  }
+
+  /**
+   * @typedef {object} HostedFields~hostedFieldsFieldData
+   * @description Data about Hosted Fields fields, sent in {@link HostedFields~stateObject|stateObjects}.
+   * @property {HTMLElement} container Reference to the container DOM element on your page associated with the current event.
+   * @property {boolean} isFocused Whether or not the input is currently focused.
+   * @property {boolean} isEmpty Whether or not the user has entered a value in the input.
+   * @property {boolean} isPotentiallyValid
+   * A determination based on the future validity of the input value.
+   * This is helpful when a user is entering a card number and types <code>"41"</code>.
+   * While that value is not valid for submission, it is still possible for
+   * it to become a fully qualified entry. However, if the user enters <code>"4x"</code>
+   * it is clear that the card number can never become valid and isPotentiallyValid will
+   * return false.
+   * @property {boolean} isValid Whether or not the value of the associated input is <i>fully</i> qualified for submission.
+   */
+  interface HostedFieldsHostedFieldsFieldData {
+    container: HTMLElement;
+    isFocused: boolean;
+    isEmpty: boolean;
+    isPotentiallyValid: boolean;
+    isValid: boolean;
+  }
+
+  /**
+   * @typedef {object} HostedFields~stateObject
+   * @description The event payload sent from {@link HostedFields#on|on} or {@link HostedFields#getState|getState}.
+   * @property {HostedFields~hostedFieldsCard[]} cards
+   * This will return an array of potential {@link HostedFields~hostedFieldsCard|cards}. If the card type has been determined, the array will contain only one card.
+   * Internally, Hosted Fields uses <a href="https://github.com/braintree/credit-card-type">credit-card-type</a>,
+   * an open-source card detection library.
+   * @property {string} emittedBy
+   * The name of the field associated with an event. This will not be included if returned by {@link HostedFields#getState|getState}. It will be one of the following strings:<br>
+   * - `"number"`
+   * - `"cvv"`
+   * - `"expirationDate"`
+   * - `"expirationMonth"`
+   * - `"expirationYear"`
+   * - `"postalCode"`
+   * @property {object} fields
+   * @property {?HostedFields~hostedFieldsFieldData} fields.number {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the number field, if it is present.
+   * @property {?HostedFields~hostedFieldsFieldData} fields.cvv {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the CVV field, if it is present.
+   * @property {?HostedFields~hostedFieldsFieldData} fields.expirationDate {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the expiration date field, if it is present.
+   * @property {?HostedFields~hostedFieldsFieldData} fields.expirationMonth {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the expiration month field, if it is present.
+   * @property {?HostedFields~hostedFieldsFieldData} fields.expirationYear {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the expiration year field, if it is present.
+   * @property {?HostedFields~hostedFieldsFieldData} fields.postalCode {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the postal code field, if it is present.
+   */
+  interface HostedFieldsFieldDataFields {
+    number: HostedFieldsHostedFieldsFieldData;
+    cvv: HostedFieldsHostedFieldsFieldData;
+    expirationDate: HostedFieldsHostedFieldsFieldData;
+    expirationMonth: HostedFieldsHostedFieldsFieldData;
+    expirationYear: HostedFieldsHostedFieldsFieldData;
+    postalCode: HostedFieldsHostedFieldsFieldData;
+  }
+
+  interface HostedFieldsStateObject {
+    cards: HostedFieldsHostedFieldsCard[];
+    emittedBy: string;
+    fields: HostedFieldsFieldDataFields;
+  }
+
+  /**
+   * @typedef {object} HostedFields~tokenizePayload
+   * @property {string} nonce The payment method nonce.
+   * @property {object} details Additional account details.
+   * @property {string} details.cardType Type of card, ex: Visa, MasterCard.
+   * @property {string} details.lastTwo Last two digits of card number.
+   * @property {string} description A human-readable description.
+   * @property {string} type The payment method type, always `CreditCard`.
+   */
+  interface HostedFieldsAccountDetails {
+    cardType: string;
+    lastTwo: string;
+  }
+
+  interface HostedFieldsTokenizePayload {
+    nonce: string;
+    details: HostedFieldsAccountDetails;
+    type: string;
+    description: string;
+  }
+
+  export interface HostedFields {
+    /**
+     * @static
+     * @function create
+     * @param {object} options Creation options:
+     * @param {Client} options.client A {@link Client} instance.
+     * @param {fieldOptions} options.fields A {@link module:braintree-web/hosted-fields~fieldOptions set of options for each field}.
+     * @param {styleOptions} options.styles {@link module:braintree-web/hosted-fields~styleOptions Styles} applied to each field.
+     * @param {callback} callback The second argument, `data`, is the {@link HostedFields} instance.
+     * @returns {void}
+     * @example
+     * braintree.hostedFields.create({
+     *   client: clientInstance,
+     *   styles: {
+     *     'input': {
+     *       'font-size': '16pt',
+     *       'color': '#3A3A3A'
+     *     },
+     *     '.number': {
+     *       'font-family': 'monospace'
+     *     },
+     *     '.valid': {
+     *       'color': 'green'
+     *     }
+     *   },
+     *   fields: {
+     *     number: {
+     *       selector: '#card-number'
+     *     },
+     *     cvv: {
+     *       selector: '#cvv'
+     *     },
+     *     expirationDate: {
+     *       selector: '#expiration-date'
+     *     }
+     *   }
+     * }, callback);
+     */
+    create: (options: { client: Client, fields: HostedFieldFieldOptions, styles: any }, callback: callback) => void;
+
+
+    /**
+     * An object that represents CSS that will be applied in each hosted field. This object looks similar to CSS. Typically, these styles involve fonts (such as `font-family` or `color`).
+     *
+     * These are the CSS properties that Hosted Fields supports. Any other CSS should be specified on your page and outside of any Braintree configuration. Trying to set unsupported properties will fail and put a warning in the console.
+     *
+     * `color` `font-family` `font-size-adjust` `font-size` `font-stretch` `font-style` `font-variant-alternates` `font-variant-caps` `font-variant-east-asian` `font-variant-ligatures` `font-variant-numeric` `font-variant` `font-weight` `font` `line-height` `opacity` `outline` `text-shadow` `transition` `-moz-osx-font-smoothing` `-moz-tap-highlight-color` `-moz-transition` `-webkit-font-smoothing` `-webkit-tap-highlight-color` `-webkit-transition`
+     * @typedef {object} styleOptions
+     */
+    styleOptions: any;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+ * @class HostedFields
+ * @param {object} options The Hosted Fields {@link module:braintree-web/hosted-fields.create create} options.
+ * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/hosted-fields.create|braintree-web.hosted-fields.create} instead.</strong>
+ * @classdesc This class represents a Hosted Fields component produced by {@link module:braintree-web/hosted-fields.create|braintree-web/hosted-fields.create}. Instances of this class have methods for interacting with the input fields within Hosted Fields' iframes.
+ */
+  export class HostedFields {
+    /**
+     * @class HostedFields
+     * @param {object} options The Hosted Fields {@link module:braintree-web/hosted-fields.create create} options.
+     * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/hosted-fields.create|braintree-web.hosted-fields.create} instead.</strong>
+     * @classdesc This class represents a Hosted Fields component produced by {@link module:braintree-web/hosted-fields.create|braintree-web/hosted-fields.create}. Instances of this class have methods for interacting with the input fields within Hosted Fields' iframes.
+     */
+    constructor(options: any);
+
+    /**
+     * @name HostedFields#on
+     * @function
+     * @param {string} event The name of the event to which you are subscribing.
+     * @param {function} handler A callback to handle the event.
+     * @description Subscribes a handler function to a named event. `event` should be {@link HostedFields#event:blur|blur}, {@link HostedFields#event:focus|focus}, {@link HostedFields#event:empty|empty}, {@link HostedFields#event:notEmpty|notEmpty}, {@link HostedFields#event:cardTypeChange|cardTypeChange}, or {@link HostedFields#event:validityChange|validityChange}. Events will emit a {@link HostedFields~stateObject|stateObject}.
+     * @example
+     * <caption>Listening to a Hosted Field event, in this case 'focus'</caption>
+     * hostedFields.create({ ... }, function (createErr, hostedFieldsInstance) {
+     *   hostedFieldsInstance.on('focus', function (event) {
+     *     console.log(event.emittedBy, 'has been focused');
+     *   });
+     * });
+     * @returns {void}
+     */
+    on(event: string, handler: (() => any)): void;
+
+    /**
+     * Cleanly tear down anything set up by {@link module:braintree-web/hosted-fields.create|create}
+     * @public
+     * @param {callback} [callback] Callback executed on completion, containing an error if one occurred. No data is returned if teardown completes successfully.
+     * @example
+     * hostedFieldsInstance.teardown(function (teardownErr) {
+     *   if (teardownErr) {
+     *     console.error('Could not tear down Hosted Fields!');
+     *   } else {
+     *     console.info('Hosted Fields has been torn down!');
+     *   }
+     * });
+     * @returns {void}
+     */
+    public teardown(callback?: callback): void;
+
+    /**
+     * Tokenizes fields and returns a nonce payload.
+     * @public
+     * @param {object} [options] All tokenization options for the Hosted Fields component.
+     * @param {boolean} [options.vault=false] When true, will vault the tokenized card. Cards will only be vaulted when using a client created with a client token that includes a customer ID.
+     * @param {callback} callback The second argument, <code>data</code>, is a {@link HostedFields~tokenizePayload|tokenizePayload}
+     * @example <caption>Tokenize a card</caption>
+     * hostedFieldsInstance.tokenize(function (tokenizeErr, payload) {
+     *   if (tokenizeErr) {
+     *     switch (tokenizeErr.code) {
+     *       case 'HOSTED_FIELDS_FIELDS_EMPTY':
+     *         console.error('All fields are empty! Please fill out the form.');
+     *         break;
+     *       case 'HOSTED_FIELDS_FIELDS_INVALID':
+     *         console.error('Some fields are invalid:', tokenizeErr.details.invalidFieldKeys);
+     *         break;
+     *       case 'HOSTED_FIELDS_FAILED_TOKENIZATION':
+     *         console.error('Tokenization failed server side. Is the card valid?');
+     *         break;
+     *       case 'HOSTED_FIELDS_TOKENIZATION_NETWORK_ERROR':
+     *         console.error('Network error occurred when tokenizing.');
+     *         break;
+     *       default:
+     *         console.error('Something bad happened!', tokenizeErr);
+     *     }
+     *   } else {
+     *     console.log('Got nonce:', payload.nonce);
+     *   }
+     * });
+     * @example <caption>Tokenize and vault a card</caption>
+     * hostedFieldsInstance.tokenize({
+     *   vault: true
+     * }, function (tokenizeErr, payload) {
+     *   if (tokenizeErr) {
+     *     console.error(tokenizeErr);
+     *   } else {
+     *     console.log('Got nonce:', payload.nonce);
+     *   }
+     * });
+     * @returns {void}
+     */
+    public tokenize(options?: { vault: boolean }, callback?: callback): void;
+
+    /**
+     * Add a class to a {@link module:braintree-web/hosted-fields~field field}. Useful for updating field styles when events occur elsewhere in your checkout.
+     * @public
+     * @param {string} field The field you wish to add a class to. Must be a valid {@link module:braintree-web/hosted-fields~fieldOptions fieldOption}.
+     * @param {string} classname The class to be added.
+     * @param {callback} [callback] Callback executed on completion, containing an error if one occurred. No data is returned if the class is added successfully.
+     *
+     * @example
+     * hostedFieldsInstance.addClass('number', 'custom-class', function (addClassErr) {
+     *   if (addClassErr) {
+     *     console.error(addClassErr);
+     *   }
+     * });
+     * @returns {void}
+     */
+    public addClass(field: string, classname: string, callback?: callback): void;
+
+    /**
+     * Removes a class to a {@link module:braintree-web/hosted-fields~field field}. Useful for updating field styles when events occur elsewhere in your checkout.
+     * @public
+     * @param {string} field The field you wish to remove a class from. Must be a valid {@link module:braintree-web/hosted-fields~fieldOptions fieldOption}.
+     * @param {string} classname The class to be removed.
+     * @param {callback} [callback] Callback executed on completion, containing an error if one occurred. No data is returned if the class is removed successfully.
+     *
+     * @example
+     * hostedFieldsInstance.addClass('number', 'custom-class', function (addClassErr) {
+     *   if (addClassErr) {
+     *     console.error(addClassErr);
+     *     return;
+     *   }
+     *
+     *   // some time later...
+     *   hostedFieldsInstance.removeClass('number', 'custom-class');
+     * });
+     * @returns {void}
+     */
+    public removeClass(field: string, classname: string, callback?: callback): void;
+
+    /**
+     * Sets the placeholder of a {@link module:braintree-web/hosted-fields~field field}.
+     * @public
+     * @param {string} field The field whose placeholder you wish to change. Must be a valid {@link module:braintree-web/hosted-fields~fieldOptions fieldOption}.
+     * @param {string} placeholder Will be used as the `placeholder` attribute of the input.
+     * @param {callback} [callback] Callback executed on completion, containing an error if one occurred. No data is returned if the placeholder updated successfully.
+     *
+     * @example
+     * hostedFieldsInstance.setPlaceholder('number', '4111 1111 1111 1111', function (placeholderErr) {
+     *   if (placeholderErr) {
+     *     console.error(placeholderErr);
+     *   }
+     * });
+     *
+     * @example <caption>Update CVV field on card type change</caption>
+     * hostedFieldsInstance.on('cardTypeChange', function (event) {
+     *   // Update the placeholder value if there is only one possible card type
+     *   if (event.cards.length === 1) {
+     *     hostedFields.setPlaceholder('cvv', event.cards[0].code.name, function (placeholderErr) {
+     *       if (placeholderErr) {
+     *         // Handle errors, such as invalid field name
+     *         console.error(placeholderErr);
+     *       }
+     *     });
+     *   }
+     * });
+     * @returns {void}
+     */
+    public setPlaceholder(field: string, placeholder: string, callback?: callback): void;
+
+    /**
+     * Clear the value of a {@link module:braintree-web/hosted-fields~field field}.
+     * @public
+     * @param {string} field The field whose placeholder you wish to clear. Must be a valid {@link module:braintree-web/hosted-fields~fieldOptions fieldOption}.
+     * @param {callback} [callback] Callback executed on completion, containing an error if one occurred. No data is returned if the field cleared successfully.
+     * @returns {void}
+     * @example
+     * hostedFieldsInstance.clear('number', function (clearErr) {
+     *   if (clearErr) {
+     *     console.error(clearErr);
+     *   }
+     * });
+     *
+     * @example <caption>Clear several fields</caption>
+     * hostedFieldsInstance.clear('number');
+     * hostedFieldsInstance.clear('cvv');
+     * hostedFieldsInstance.clear('expirationDate');
+     */
+    public clear(field: string, callback?: callback): void;
+
+    /**
+     * Returns an {@link HostedFields~stateObject|object} that includes the state of all fields and possible card types.
+     * @public
+     * @returns {object} {@link HostedFields~stateObject|stateObject}
+     * @example <caption>Check if all fields are valid</caption>
+     * var state = hostedFields.getState();
+     *
+     * var formValid = Object.keys(state.fields).every(function (key) {
+     *   return state.fields[key].isValid;
+     * });
+     */
+    public getState(): any;
+  }
+}
+
+/** @module braintree-web/paypal */
+declare namespace BraintreeWeb {
+  /**
+   * @typedef {object} PayPal~tokenizeReturn
+   * @property {Function} close A handle to close the PayPal checkout flow.
+   */
+  interface PayPalTokenizeReturn {
+    close: (() => any);
+  }
+
+  /**
+   * @typedef {object} PayPal~tokenizePayload
+   * @property {string} nonce The payment method nonce.
+   * @property {string} type The payment method type, always `PayPalAccount`.
+   * @property {object} details Additional PayPal account details.
+   * @property {string} details.email User's email address.
+   * @property {string} details.payerId User's payer ID, the unique identifier for each PayPal account.
+   * @property {string} details.firstName User's given name.
+   * @property {string} details.lastName User's surname.
+   * @property {?string} details.countryCode User's 2 character country code.
+   * @property {?string} details.phone User's phone number (e.g. 555-867-5309).
+   * @property {?object} details.shippingAddress User's shipping address details, only available if shipping address is enabled.
+   * @property {string} details.shippingAddress.recipientName Recipient of postage.
+   * @property {string} details.shippingAddress.line1 Street number and name.
+   * @property {string} details.shippingAddress.line2 Extended address.
+   * @property {string} details.shippingAddress.city City or locality.
+   * @property {string} details.shippingAddress.state State or region.
+   * @property {string} details.shippingAddress.postalCode Postal code.
+   * @property {string} details.shippingAddress.countryCode 2 character country code (e.g. US).
+   * @property {?object} details.billingAddress User's billing address details.
+   * You will also need to enable the PayPal Billing Address Request feature in your PayPal account.
+   * To enable this feature, [contact PayPal](https://developers.braintreepayments.com/support/guides/paypal/setup-guide#contacting-paypal-support).
+   * @property {string} details.billingAddress.line1 Street number and name.
+   * @property {string} details.billingAddress.line2 Extended address.
+   * @property {string} details.billingAddress.city City or locality.
+   * @property {string} details.billingAddress.state State or region.
+   * @property {string} details.billingAddress.postalCode Postal code.
+   * @property {string} details.billingAddress.countryCode 2 character country code (e.g. US).
+   */
+  interface PayPalShippingAddress {
+    recipientName: string;
+    line1: string;
+    line2: string;
+    city: string;
+    state: string;
+    postalCode: string;
+    countryCode: string;
+  }
+
+  interface PayPalBillingAddress {
+    line1: string;
+    line2: string;
+    city: string;
+    state: string;
+    postalCode: string;
+    countryCode: string;
+  }
+
+  interface PayPalAccountDetails {
+    email: string;
+    payerId: string;
+    firstName: string;
+    lastName: string;
+    countryCode: string;
+    phone: string;
+    shippingAddress: PayPalShippingAddress;
+    billingAddress: PayPalBillingAddress;
+  }
+
+  interface PayPalTokenizePayload {
+    nonce: string;
+    type: string;
+    details: PayPalAccountDetails;
+  }
+
+  export interface PayPal {
+    /**
+     * @static
+     * @function create
+     * @param {object} options Creation options:
+     * @param {Client} options.client A {@link Client} instance.
+     * @param {callback} callback The second argument, `data`, is the {@link PayPal} instance.
+     * @example
+     * braintree.paypal.create(
+     *   client: clientInstance
+     * }, function (createErr, paypalInstance) {
+     *   if (createErr) {
+     *     if (createErr.code === 'PAYPAL_BROWSER_NOT_SUPPORTED') {
+     *       console.error('This browser is not supported.');
+     *     } else {
+     *       console.error('Error!', createErr);
+     *     }
+     *   }
+     * }
+     * @returns {void}
+     */
+    create: (options: { client: Client }, callback: callback) => void;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+ * @class
+ * @param {object} options see {@link module:braintree-web/paypal.create|paypal.create}
+ * @classdesc This class represents a PayPal component. Instances of this class have methods for launching auth dialogs and other programmatic interactions with the PayPal component.
+ */
+  export class PayPal {
+    /**
+     * @class
+     * @param {object} options see {@link module:braintree-web/paypal.create|paypal.create}
+     * @classdesc This class represents a PayPal component. Instances of this class have methods for launching auth dialogs and other programmatic interactions with the PayPal component.
+     */
+    constructor(options: any);
+
+    /**
+     * Launches the PayPal login flow and returns a nonce payload. Only one PayPal login flow should be active at a time. One way to achieve this is to disable your PayPal button while the flow is open.
+     * @public
+     * @param {object} options All tokenization options for the PayPal component.
+     * @param {string} options.flow Set to 'checkout' for one-time payment flow, or 'vault' for Vault flow. If 'vault' is used with a client token generated with a customer id, the PayPal account will be added to that customer as a saved payment method.
+     * @param {string} [options.intent=authorize]
+     * Checkout flows only.
+     * * `authorize` - Submits the transaction for authorization but not settlement.
+     * * `sale` - Payment will be immediately submitted for settlement upon creating a transaction.
+     * @param {boolean} [options.offerCredit=false] Offers the customer PayPal Credit if they qualify. Checkout flows only.
+     * @param {string} [options.useraction]
+     * Changes the call-to-action in the PayPal flow. By default the final button will show the localized
+     * word for "Continue" and implies that the final amount billed is not yet known.
+     *
+     * Setting this option to `commit` changes the button text to "Pay Now" and page text will convey to
+     * the user that billing will take place immediately.
+     * @param {string|number} [options.amount] The amount of the transaction. Required when using the Checkout flow.
+     * @param {string} [options.currency] The currency code of the amount, such as 'USD'. Required when using the Checkout flow.
+     * @param {string} [options.displayName] The merchant name displayed inside of the PayPal lightbox; defaults to the company name on your Braintree account
+     * @param {string} [options.locale=en_US] Use this option to change the language, links, and terminology used in the PayPal flow to suit the country and language of your customer.
+     * @param {boolean} [options.enableShippingAddress=false] Returns a shipping address object in {@link PayPal#tokenize}.
+     * @param {object} [options.shippingAddressOverride] Allows you to pass a shipping address you have already collected into the PayPal payment flow.
+     * @param {string} options.shippingAddressOverride.line1 Street address.
+     * @param {string} [options.shippingAddressOverride.line2] Street address (extended).
+     * @param {string} options.shippingAddressOverride.city City.
+     * @param {string} options.shippingAddressOverride.state State.
+     * @param {string} options.shippingAddressOverride.postalCode Postal code.
+     * @param {string} options.shippingAddressOverride.countryCode Country.
+     * @param {string} [options.shippingAddressOverride.phone] Phone number.
+     * @param {string} [options.shippingAddressOverride.recipientName] Recipient's name.
+     * @param {boolean} [options.shippingAddressEditable=true] Set to false to disable user editing of the shipping address.
+     * @param {string} [options.billingAgreementDescription] Use this option to set the description of the preapproved payment agreement visible to customers in their PayPal profile during Vault flows. Max 255 characters.
+     * @param {callback} callback The second argument, <code>data</code>, is a {@link PayPal~tokenizePayload|tokenizePayload}.
+     * @example
+     * button.addEventListener('click', function () {
+     *   // Disable the button so that we don't attempt to open multiple popups.
+     *   button.setAttribute('disabled', 'disabled');
+     *
+     *   // Because PayPal tokenization opens a popup, this must be called
+     *   // as a result of a user action, such as a button click.
+     *   paypalInstance.tokenize({
+     *     flow: 'vault' // Required
+     *     // Any other tokenization options
+     *   }, function (tokenizeErr, payload) {
+     *     button.removeAttribute('disabled');
+     *
+     *     if (tokenizeErr) {
+     *       // Handle tokenization errors or premature flow closure
+     *
+     *       switch (tokenizeErr.code) {
+     *         case 'PAYPAL_POPUP_CLOSED':
+     *           console.error('Customer closed PayPal popup.');
+     *           break;
+     *         case 'PAYPAL_ACCOUNT_TOKENIZATION_FAILED':
+     *           console.error('PayPal tokenization failed. See details:', tokenizeErr.details);
+     *           break;
+     *         case 'PAYPAL_FLOW_FAILED':
+     *           console.error('Unable to initialize PayPal flow. Are your options correct?', tokenizeErr.details);
+     *           break;
+     *         default:
+     *           console.error('Error!', tokenizeErr);
+     *       }
+     *     } else {
+     *       // Submit payload.nonce to your server
+     *     }
+     *   });
+     * });
+     * @returns {PayPal~tokenizeReturn} A handle to close the PayPal checkout frame.
+     */
+    public tokenize(options: { flow: string, intent: string, offerCredit: boolean, useraction: string, amount: (string | number), currency: string, displayName: string, locale: string, enableShippingAddress: boolean, shippingAddressOverride: PayPalShippingAddress, shippingAddressEditable: boolean, billingAgreementDescription: string }, callback: callback): PayPalTokenizeReturn;
+
+    /**
+     * Cleanly tear down anything set up by {@link module:braintree-web/paypal.create|create}.
+     * @public
+     * @param {callback} [callback] Called once teardown is complete. No data is returned if teardown completes successfully.
+     * @returns {void}
+     */
+    public teardown(callback?: () => void): void;
+
+  }
+}
+
+/** @module braintree-web/three-d-secure */
+declare namespace BraintreeWeb {
+  /**
+   * @typedef {object} ThreeDSecure~verifyPayload
+   * @property {string} nonce The new payment method nonce produced by the 3D Secure lookup. The original nonce passed into {@link ThreeDSecure#verifyCard|verifyCard} was consumed. This new nonce should be used to transact on your server.
+   * @property {object} details Additional account details.
+   * @property {string} details.cardType Type of card, ex: Visa, MasterCard.
+   * @property {string} details.lastTwo Last two digits of card number.
+   * @property {string} description A human-readable description.
+   * @property {boolean} liabilityShiftPossible Indicates whether the card was eligible for 3D Secure.
+   * @property {boolean} liabilityShifted Indicates whether the liability for fraud has been shifted away from the merchant.
+   */
+  interface ThreeDSecureAccountDetails {
+    cardType: string;
+    lastTwo: string;
+  }
+
+  interface ThreeDSecureVerifyPayload {
+    nonce: string;
+    details: ThreeDSecureAccountDetails;
+    description: string;
+    liabilityShiftPossible: boolean;
+    liabilityShifted: boolean;
+  }
+
+  export interface ThreeDSecure {
+    /**
+     * @static
+     * @function create
+     * @param {object} options Creation options:
+     * @param {Client} options.client A {@link Client} instance.
+     * @param {callback} callback The second argument, `data`, is the {@link ThreeDSecure} instance.
+     * @returns {void}
+     * @example
+     * braintree.threeDSecure.create({
+     *   client: client
+     * }, callback);
+     */
+    create: (options: { client: Client }, callback: callback) => void;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+   * @class
+   * @param {object} options 3D Secure {@link module:braintree-web/three-d-secure.create create} options
+   * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/three-d-secure.create|braintree.threeDSecure.create} instead.</strong>
+   * @classdesc This class represents a ThreeDSecure component produced by {@link module:braintree-web/three-d-secure.create|braintree.threeDSecure.create}. Instances of this class have a method for launching a 3D Secure authentication flow.
+   */
+  export class ThreeDSecure {
+    /**
+     * @class
+     * @param {object} options 3D Secure {@link module:braintree-web/three-d-secure.create create} options
+     * @description <strong>Do not use this constructor directly. Use {@link module:braintree-web/three-d-secure.create|braintree.threeDSecure.create} instead.</strong>
+     * @classdesc This class represents a ThreeDSecure component produced by {@link module:braintree-web/three-d-secure.create|braintree.threeDSecure.create}. Instances of this class have a method for launching a 3D Secure authentication flow.
+     */
+    constructor(options: any);
+
+
+    /**
+     * @callback ThreeDSecure~addFrameCallback
+     * @param {?BraintreeError} [err] `null` or `undefined` if there was no error.
+     * @param {HTMLIFrameElement} iframe An iframe element containing the bank's authentication page that you must put on your page.
+     * @description The callback used for options.addFrame in {@link ThreeDSecure#verifyCard|verifyCard}.
+     * @returns {void}
+     */
+    addFrameCallback: (err?: BraintreeError, iframe?: HTMLIFrameElement) => void;
+
+    /**
+     * @callback ThreeDSecure~removeFrameCallback
+     * @description The callback used for options.removeFrame in {@link ThreeDSecure#verifyCard|verifyCard}.
+     * @returns {void}
+     */
+    removeFrameCallback: () => void;
+
+    /**
+     * Launch the 3D Secure login flow, returning a nonce payload.
+     * @public
+     * @param {object} options Options for card verification.
+     * @param {string} options.nonce A nonce referencing the card to be verified. For example, this can be a nonce that was returned by Hosted Fields.
+     * @param {number} options.amount The amount of the transaction in the current merchant account's currency. For example, if you are running a transaction of $123.45 US dollars, `amount` would be 123.45.
+     * @param {errback} options.addFrame This {@link ThreeDSecure~addFrameCallback|addFrameCallback} will be called when the bank frame needs to be added to your page.
+     * @param {callback} options.removeFrame This {@link ThreeDSecure~removeFrameCallback|removeFrameCallback} will be called when the bank frame needs to be removed from your page.
+     * @param {errback} callback The second argument, <code>data</code>, is a {@link ThreeDSecure~verifyPayload|verifyPayload}
+     * @returns {void}
+     * @example
+     * <caption>Verifying an existing nonce with 3DS</caption>
+     * var my3DSContainer;
+     *
+     * threeDSecure.verifyCard({
+     *   nonce: existingNonce,
+     *   amount: 123.45,
+     *   addFrame: function (err, iframe) {
+     *     // Set up your UI and add the iframe.
+     *     my3DSContainer = document.createElement('div');
+     *     my3DSContainer.appendChild(iframe);
+     *     document.body.appendChild(my3DSContainer);
+     *   },
+     *   removeFrame: function () {
+     *     // Remove UI that you added in addFrame.
+     *     document.body.removeChild(my3DSContainer);
+     *   }
+     * }, function (err, payload) {
+     *   if (err) {
+     *     console.error(err);
+     *     return;
+     *   }
+     *
+     *   if (payload.liabilityShifted) {
+     *     // Liablity has shifted
+     *     submitNonceToServer(payload.nonce);
+     *   } else if (payload.liabilityShiftPossible) {
+     *     // Liablity may still be shifted
+     *     // Decide if you want to submit the nonce
+     *   } else {
+     *     // Liablity has not shifted and will not shift
+     *     // Decide if you want to submit the nonce
+     *   }
+     * });
+     */
+    public verifyCard(options: { nonce: string, amount: number, addFrame: (err?: BraintreeError, iframe?: HTMLIFrameElement) => void, removeFrame: () => void }, callback: callback): void;
+
+    /**
+     * Cancel the 3DS flow and return the verification payload if available.
+     * @public
+     * @param {errback} callback The second argument is a {@link ThreeDSecure~verifyPayload|verifyPayload}. If there is no verifyPayload (the initial lookup did not complete), an error will be returned.
+     * @returns {void}
+     * @example
+     * threeDSecure.cancelVerifyCard(function (err, verifyPayload) {
+     *   if (err) {
+     *     // Handle error
+     *     console.log(err.message); // No verification payload available
+     *     return;
+     *   }
+     *
+     *   verifyPayload.nonce; // The nonce returned from the 3ds lookup call
+     *   verifyPayload.liabilityShifted; // boolean
+     *   verifyPayload.liabilityShiftPossible; // boolean
+     * });
+     */
+    public cancelVerifyCard(callback: callback): void;
+
+    /**
+     * Cleanly tear down anything set up by {@link module:braintree-web/three-d-secure.create|create}
+     * @public
+     * @param {errback} [callback] Called once teardown is complete. No data is returned if teardown completes successfully.
+     * @returns {void}
+     */
+    public teardown(callback?: callback): void;
+  }
+}
+
+/**
+ * @module braintree-web/unionpay
+ * @description This module allows you to accept UnionPay payments. *It is currently in beta and is subject to change.*
+ */
+declare namespace BraintreeWeb {
+  /**
+   * @typedef {object} UnionPay~tokenizePayload
+   * @property {string} nonce The payment method nonce.
+   * @property {string} type Always <code>CreditCard</code>.
+   * @property {object} details Additional account details:
+   * @property {string} details.cardType Type of card, ex: Visa, MasterCard.
+   * @property {string} details.lastTwo Last two digits of card number.
+   * @property {string} description A human-readable description.
+   */
+  interface UnionPayAccountDetails {
+    cardType: string;
+    lastTwo: string;
+    description: string;
+  }
+
+  interface UnionPayTokenizePayload {
+    nonce: string;
+    type: string;
+    details: UnionPayAccountDetails;
+  }
+
+  /**
+ * @typedef {object} UnionPay~enrollPayload
+ * @property {string} enrollmentId UnionPay enrollment ID. This value should be passed to `tokenize`.
+ * @property {boolean} smsCodeRequired UnionPay `smsCodeRequired` flag.
+ * </p><b>true</b> - the user will receive an SMS code that needs to be supplied for tokenization.
+ * </p><b>false</b> - the card can be immediately tokenized.
+ */
+  interface UnionPayEnrollPayload {
+    enrollmentId: string;
+    smsCodeRequired: boolean;
+  }
+
+  /**
+   * @typedef {object} UnionPay~fetchCapabilitiesPayload
+   * @property {boolean} isUnionPay Determines if this card is a UnionPay card.
+   * @property {boolean} isDebit Determines if this card is a debit card. This property is only present if `isUnionPay` is `true`.
+   * @property {object} unionPay UnionPay specific properties. This property is only present if `isUnionPay` is `true`.
+   * @property {boolean} unionPay.supportsTwoStepAuthAndCapture Determines if the card allows for an authorization, but settling the transaction later.
+   * @property {boolean} unionPay.isSupported Determines if Braintree can process this UnionPay card. When false, Braintree cannot process this card and the user should use a different card.
+   */
+
+  interface UnionPayProperties {
+    supportsTwoStepAuthAndCapture: boolean;
+    isSupported: boolean;
+  }
+
+  interface UnionPayFetchCapabilitiesPayload {
+    isUnionPay: boolean;
+    isDebit: boolean;
+    unionPay: UnionPayProperties;
+  }
+
+  export interface UnionPay {
+    /**
+     * @static
+     * @function create
+     * @param {object} options Creation options:
+     * @param {Client} options.client A {@link Client} instance.
+     * @param {callback} callback The second argument, `data`, is the {@link UnionPay} instance.
+     * @returns {void}
+     * @example
+     * braintree.unionpay.create({ client: clientInstance }, function (createErr, unionpayInstance) {
+     *   if (createErr) {
+     *     console.error(createErr);
+     *     return;
+     *   }
+     *   // ...
+     * });
+     */
+    create: (options: { client: Client }, callback: callback) => void;
+
+    /**
+     * @description The current version of the SDK, i.e. `3.0.2`.
+     * @type {string}
+     */
+    VERSION: string;
+  }
+
+  /**
+ * @class
+ * @param {object} options See {@link module:braintree-web/unionpay.create|unionpay.create}.
+ * @description <strong>You cannot use this constructor directly. Use {@link module:braintree-web/unionpay.create|braintree-web.unionpay.create} instead.</strong>
+ * @classdesc This class represents a UnionPay component. Instances of this class have methods for {@link UnionPay#fetchCapabilities fetching capabilities} of UnionPay cards, {@link UnionPay#enroll enrolling} a UnionPay card, and {@link UnionPay#tokenize tokenizing} a UnionPay card.
+ */
+  export class UnionPay {
+    /**
+     * @class
+     * @param {object} options See {@link module:braintree-web/unionpay.create|unionpay.create}.
+     * @description <strong>You cannot use this constructor directly. Use {@link module:braintree-web/unionpay.create|braintree-web.unionpay.create} instead.</strong>
+     * @classdesc This class represents a UnionPay component. Instances of this class have methods for {@link UnionPay#fetchCapabilities fetching capabilities} of UnionPay cards, {@link UnionPay#enroll enrolling} a UnionPay card, and {@link UnionPay#tokenize tokenizing} a UnionPay card.
+     */
+    constructor(options: any);
+
+    /**
+     * Fetches the capabilities of a card, including whether or not the SMS enrollment process is required.
+     * @public
+     * @param {object} options UnionPay {@link UnionPay#fetchCapabilities fetchCapabilities} options
+     * @param {object} [options.card] The card from which to fetch capabilities. Note that this will only have one property, `number`. Required if you are not using the `hostedFields` option.
+     * @param {string} options.card.number Card number.
+     * @param {HostedFields} [options.hostedFields] The Hosted Fields instance used to collect card data. Required if you are not using the `card` option.
+     * @param {callback} callback The second argument, <code>data</code>, is a {@link UnionPay#fetchCapabilitiesPayload fetchCapabilitiesPayload}.
+     * @example <caption>With raw card data</caption>
+     * unionpayInstance.fetchCapabilities({
+     *   card: {
+     *     number: '4111111111111111'
+     *   }
+     * }, function (fetchErr, cardCapabilities) {
+     *   if (fetchErr) {
+     *     console.error(fetchErr);
+     *     return;
+     *   }
+     *
+     *   if (cardCapabilities.isUnionPay) {
+     *     if (cardCapabilities.unionPay && !cardCapabilities.unionPay.isSupported) {
+     *       // Braintree cannot process this UnionPay card.
+     *       // Ask the user for a different card.
+     *       return;
+     *     }
+     *
+     *     if (cardCapabilities.isDebit) {
+     *       // CVV and expiration date are not required
+     *     } else {
+     *       // CVV and expiration date are required
+     *     }
+     *
+     *     // Show mobile phone number field for enrollment
+     *   }
+     * });
+     * @example <caption>With Hosted Fields</caption>
+     * // Fetch capabilities on `blur` inside of the Hosted Fields `create` callback
+     * hostedFieldsInstance.on('blur', function (event) {
+     *   // Only attempt to fetch capabilities when a valid card number has been entered
+     *   if (event.emittedBy === 'number' && event.fields.number.isValid) {
+     *     unionpayInstance.fetchCapabilities({
+     *       hostedFields: hostedFieldsInstance
+     *     }, function (fetchErr, cardCapabilities) {
+     *       if (fetchErr) {
+     *         console.error(fetchErr);
+     *         return;
+     *       }
+     *
+     *       if (cardCapabilities.isUnionPay) {
+     *         if (cardCapabilities.unionPay && !cardCapabilities.unionPay.isSupported) {
+     *           // Braintree cannot process this UnionPay card.
+     *           // Ask the user for a different card.
+     *           return;
+     *         }
+     *         if (cardCapabilities.isDebit) {
+     *           // CVV and expiration date are not required
+     *           // Hide the containers with your `cvv` and `expirationDate` fields
+     *         } else {
+     *           // CVV and expiration date are required
+     *         }
+     *       } else {
+     *         // Not a UnionPay card
+     *         // When form is complete, tokenize using your Hosted Fields instance
+     *       }
+     *
+     *       // Show your own mobile country code and phone number inputs for enrollment
+     *     });
+     *   });
+     * });
+     * @returns {void}
+     */
+    public fetchCapabilities(options: { card: any, hostedFields: HostedFields }, callback: callback): void;
+
+    /**
+     * Enrolls a UnionPay card. Use {@link UnionPay#fetchCapabilities|fetchCapabilities} to determine if the SMS enrollment process is required.
+     * @public
+     * @param {object} options UnionPay enrollment options:
+     * @param {object} [options.card] The card to enroll. Required if you are not using the `hostedFields` option.
+     * @param {string} options.card.number The card number.
+     * @param {string} [options.card.expirationDate] The card's expiration date. May be in the form `MM/YY` or `MM/YYYY`. When defined `expirationMonth` and `expirationYear` are ignored.
+     * @param {string} [options.card.expirationMonth] The card's expiration month. This should be used with the `expirationYear` parameter. When `expirationDate` is defined this parameter is ignored.
+     * @param {string} [options.card.expirationYear] The card's expiration year. This should be used with the `expirationMonth` parameter. When `expirationDate` is defined this parameter is ignored.
+     * @param {HostedFields} [options.hostedFields] The Hosted Fields instance used to collect card data. Required if you are not using the `card` option.
+     * @param {object} options.mobile The mobile information collected from the customer.
+     * @param {string} options.mobile.countryCode The country code of the customer's mobile phone number.
+     * @param {string} options.mobile.number The customer's mobile phone number.
+     * @param {callback} callback The second argument, <code>data</code>, is a {@link UnionPay~enrollPayload|enrollPayload}.
+     * @example <caption>With raw card data</caption>
+     * unionpayInstance.enroll({
+     *   card: {
+     *     number: '4111111111111111',
+     *     expirationMonth: '12',
+     *     expirationYear: '2038'
+     *   },
+     *   mobile: {
+     *     countryCode: '62',
+     *     number: '111111111111'
+     *   }
+     * }, function (enrollErr, response) {
+     *   if (enrollErr) {
+     *      console.error(enrollErr);
+     *      return;
+     *   }
+     *
+     *   if (response.smsCodeRequired) {
+     *     // If smsCodeRequired, wait for SMS auth code from customer
+     *     // Then use response.enrollmentId during {@link UnionPay#tokenize}
+     *   } else {
+     *     // SMS code is not required from the user.
+     *     // {@link UnionPay#tokenize} can be called immediately
+     * });
+     * @example <caption>With Hosted Fields</caption>
+     * unionpayInstance.enroll({
+     *   hostedFields: hostedFields,
+     *   mobile: {
+     *     countryCode: '62',
+     *     number: '111111111111'
+     *   }
+     * }, function (enrollErr, response) {
+     *   if (enrollErr) {
+     *     console.error(enrollErr);
+     *     return;
+     *   }
+     *
+     *   if (response.smsCodeRequired) {
+     *     // If smsCodeRequired, wait for SMS auth code from customer
+     *     // Then use response.enrollmentId during {@link UnionPay#tokenize}
+     *   } else {
+     *     // SMS code is not required from the user.
+     *     // {@link UnionPay#tokenize} can be called immediately
+     *   }
+     * });
+     * @returns {void}
+     */
+    public enroll(options: { card: any, hostedFields: HostedFields, mobile: any }, callback: callback): void;
+
+    /**
+     * Tokenizes a UnionPay card and returns a nonce payload.
+     * @public
+     * @param {object} options UnionPay tokenization options:
+     * @param {object} [options.card] The card to enroll. Required if you are not using the `hostedFields` option.
+     * @param {string} options.card.number The card number.
+     * @param {string} [options.card.expirationDate] The card's expiration date. May be in the form `MM/YY` or `MM/YYYY`. When defined `expirationMonth` and `expirationYear` are ignored.
+     * @param {string} [options.card.expirationMonth] The card's expiration month. This should be used with the `expirationYear` parameter. When `expirationDate` is defined this parameter is ignored.
+     * @param {string} [options.card.expirationYear] The card's expiration year. This should be used with the `expirationMonth` parameter. When `expirationDate` is defined this parameter is ignored.
+     * @param {string} [options.card.cvv] The card's security number.
+     * @param {HostedFields} [options.hostedFields] The Hosted Fields instance used to collect card data. Required if you are not using the `card` option.
+     * @param {string} options.enrollmentId The enrollment ID from {@link UnionPay#enroll}.
+     * @param {string} [options.smsCode] The SMS code received from the user if {@link UnionPay#enroll} payload have `smsCodeRequired`. if `smsCodeRequired` is false, smsCode should not be passed.
+     * @param {callback} callback The second argument, <code>data</code>, is a {@link UnionPay~tokenizePayload|tokenizePayload}.
+     * @example <caption>With raw card data</caption>
+     * unionpayInstance.tokenize({
+     *   card: {
+     *     number: '4111111111111111',
+     *     expirationMonth: '12',
+     *     expirationYear: '2038',
+     *     cvv: '123'
+     *   },
+     *   enrollmentId: enrollResponse.enrollmentId, // Returned from enroll
+     *   smsCode: '11111' // Received by customer's phone, if SMS enrollment was required. Otherwise it should be omitted
+     * }, function (tokenizeErr, response) {
+     *   if (tokenizeErr) {
+     *     console.error(tokenizeErr);
+     *     return;
+     *   }
+     *
+     *   // Send response.nonce to your server
+     * });
+     * @example <caption>With Hosted Fields</caption>
+     * unionpayInstance.tokenize({
+     *   hostedFields: hostedFieldsInstance,
+     *   enrollmentId: enrollResponse.enrollmentId, // Returned from enroll
+     *   smsCode: '11111' // Received by customer's phone, if SMS enrollment was required. Otherwise it should be omitted
+     * }, function (tokenizeErr, response) {
+     *   if (tokenizeErr) {
+     *     console.error(tokenizeErr);
+     *     return;
+     *   }
+     *
+     *   // Send response.nonce to your server
+     * });
+     * @returns {void}
+     */
+    public tokenize(options: { card: any, hostedFields: HostedFields, enrollmentId: string, smsCode: string }, callback: callback): void;
+
+    /**
+     * Cleanly tear down anything set up by {@link module:braintree-web/unionpay.create|create}. This only needs to be called when using UnionPay with Hosted Fields.
+     * @public
+     * @param {callback} [callback] Called once teardown is complete. No data is returned if teardown completes successfully.
+     * @example
+     * unionpayInstance.teardown(function (teardownErr) {
+     *   if (teardownErr) {
+     *     console.error('Could not tear down UnionPay.');
+     *   } else {
+     *     console.log('UnionPay has been torn down.');
+     *   }
+     * });
+     * @returns {void}
+     */
+    public teardown(callback?: callback): void;
+
+  }
+}
+
+declare namespace BraintreeError {
+  /**
+ * Enum for {@link BraintreeError} types.
+ * @name BraintreeError.types
+ * @enum
+ * @readonly
+ * @memberof BraintreeError
+ * @property {string} CUSTOMER An error caused by the customer.
+ * @property {string} MERCHANT An error that is actionable by the merchant.
+ * @property {string} NETWORK An error due to a network problem.
+ * @property {string} INTERNAL An error caused by Braintree code.
+ * @property {string} UNKNOWN An error where the origin is unknown.
+ */
+  export enum Types {
+    CUSTOMER,
+    MERCHANT,
+    NETWORK,
+    INTERNAL,
+    UNKNOWN
+  }
+}
+
+/**
+  * @class
+  * @global
+  * @param {object} options Construction options
+  * @classdesc This class is used to report error conditions, frequently as the first parameter to callbacks throughout the Braintree SDK.
+  * @description <strong>You cannot use this constructor directly. Interact with instances of this class through {@link callback callbacks}.</strong>
+  */
+declare class BraintreeError {
+  /**
+   * @class
+   * @global
+   * @param {object} options Construction options
+   * @classdesc This class is used to report error conditions, frequently as the first parameter to callbacks throughout the Braintree SDK.
+   * @description <strong>You cannot use this constructor directly. Interact with instances of this class through {@link callback callbacks}.</strong>
+   */
+  constructor(options: any);
+
+  /**
+   * @type {string}
+   * @description A code that corresponds to specific errors.
+   */
+  code: string;
+
+  /**
+   * @type {string}
+   * @description A short description of the error.
+   */
+  message: string;
+
+  /**
+   * @type {BraintreeError.types}
+   * @description The type of error.
+   */
+  type: BraintreeError.Types;
+
+  /**
+   * @type {object=}
+   * @description Additional information about the error, such as an underlying network error response.
+   */
+  details: any;
+}
+
+declare namespace BraintreeWeb {
+  /**
+   * @global
+   * @callback callback
+   * @param {?BraintreeError} [err] `null` or `undefined` if there was no error.
+   * @param {?any} [data] The successful result of the asynchronous function call (if data exists).
+   * @description The Node.js-style callback pattern used throughout the SDK.
+   * @returns {void}
+   */
+  type callback = (err?: BraintreeError, data?: any) => void;
+}
+
+/**
+ * @module braintree-web
+ * @description This is the top-level module exported by the Braintree JavaScript SDK. In a browser environment, this will be the global <code>braintree</code> object. In a CommonJS environment (like Browserify or Webpack), it will be the default export of the <code>braintree-web</code> package. In AMD environments (like RequireJS), it can be `require`d like other modules.
+ * @example
+ * <caption>CommonJS</caption>
+ * var braintree = require('braintree-web');
+ *
+ * braintree.client.create(...);
+ * @example
+ * <caption>In the browser</caption>
+ * <script src="https://js.braintreegateway.com/web/3.0.2/js/client.min.js"></script>
+ * <script>
+ *   window.braintree.client.create(...);
+ * </script>
+ * @example
+ * <caption>AMD</caption>
+ * // main.js
+ * require.config({
+ *   paths: {
+ *     braintreeClient: 'https://js.braintreegateway.com/web/3.0.2/js/client.min'
+ *   }
+ * });
+ *
+ * require(['braintreeClient'], function (braintreeClient) {
+ *   braintreeClient.create(...);
+ * });
+ */
+interface BraintreeStatic {
+  /** @type {module:braintree-web/client} */
+  client: BraintreeWeb.Client;
+
+  /** @type {module:braintree-web/paypal} */
+  paypal: BraintreeWeb.PayPal;
+
+  /** @type {module:braintree-web/hosted-fields} */
+  hostedFields: BraintreeWeb.HostedFields;
+
+  /** @type {module:braintree-web/three-d-secure} */
+  threeDSecure: BraintreeWeb.ThreeDSecure;
+
+  /** @type {module:braintree-web/data-collector} */
+  dataCollector: BraintreeWeb.DataCollector;
+
+  /** @type {module:braintree-web/american-express} */
+  americanExpress: BraintreeWeb.AmericanExpress;
+
+  /** @type {module:braintree-web/unionpay} */
+  unionpay: BraintreeWeb.UnionPay;
+
+  /** @type {module:braintree-web/apple-pay} */
+  applePay: BraintreeWeb.ApplePay;
+
+  /**
+   * @description The current version of the SDK, i.e. `3.0.2`.
+   * @type {string}
+   */
+  VERSION: string;
+}
+
+declare var braintree: BraintreeStatic;
\ No newline at end of file
diff --git a/bunnymq/bunnymq-tests.ts b/bunnymq/bunnymq-tests.ts
new file mode 100644
index 0000000000..208eb7e992
--- /dev/null
+++ b/bunnymq/bunnymq-tests.ts
@@ -0,0 +1,36 @@
+/// <reference path="bunnymq.d.ts"/>
+
+import * as bunnymq from "bunnymq";
+
+// Basic usage
+var instance = bunnymq({ host: 'amqp://localhost' });
+
+// Publisher
+instance.producer.produce('queue:name', 'Hello World!');
+// Subscriber
+instance.consumer.consume('queue:name', message => { });
+
+// RPC Support
+instance.producer.produce('queue:name', { message: 'content' }, { rpc: true })
+    .then(function (consumerResponse) {
+        console.log(consumerResponse);
+    });
+
+// Routing keys
+instance.producer.produce('queue:name', { message: 'content' }, { routingKey: 'my-routing-key' });
+
+// Config
+var custom = bunnymq({
+    host: 'amqp://localhost',
+    //number of fetched messages at once on the channel
+    prefetch: 5,
+    //requeue put back message into the broker if consumer crashes/trigger exception
+    requeue: true,
+    //time between two reconnect (ms)
+    timeout: 1000,
+    consumerSuffix: '',
+    //generate a hostname so we can track this connection on the broker (rabbitmq management plugin)
+    hostname: "",
+    //the transport to use to debug. if provided, bunnymq will show some logs
+    transport: new Object()
+});
\ No newline at end of file
diff --git a/bunnymq/bunnymq.d.ts b/bunnymq/bunnymq.d.ts
new file mode 100644
index 0000000000..1167db21ed
--- /dev/null
+++ b/bunnymq/bunnymq.d.ts
@@ -0,0 +1,120 @@
+// Type definitions for node-bunnymq 2.2.1
+// Project: https://github.com/dial-once/node-bunnymq
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "bunnymq" {
+    namespace bunnymq {
+        export type ConsumerCallback = (message: Object) => void;
+
+        /**
+         * Consumer.
+         * @interface
+         */
+        export interface Consumer {
+            /**
+             * Handle messages from a named queue.
+             * @param {string}           queue      A named queue.
+             * @param {ConsumerCallback} callback   A callback.
+             */
+            consume(queue: string, callback: ConsumerCallback): void;
+        }
+
+        /**
+         * bunnymq instance.
+         * @interface
+         */
+        export interface Instance {
+            /**
+             * Consumer.
+             * @type {Consumer}
+             */
+            consumer: Consumer;
+
+            /**
+             * Producer.
+             * @type {Producer}
+             */
+            producer: Producer;
+        }
+
+        /**
+         * Options.
+         * @interface
+         */
+        export interface Options {
+            /**
+             * Consumer suffix.
+             * @type {string}
+             */
+            consumerSuffix?: string;
+
+            /**
+             * Host.
+             * @type {string}
+             */
+            host?: string;
+
+            /**
+             * Hostname.
+             * @type {string}
+             */
+            hostname?: string;
+
+            /**
+             * Number of fetched messages at once on the channel.
+             * @type {number}
+             */
+            prefetch?: number;
+
+            /**
+             * Requeue put back message into the broker if consumer crashes/trigger exception.
+             * @type {boolean}
+             */
+            requeue?: boolean;
+
+            /**
+             * Time between two reconnect (in milliseconds).
+             * @type {number}
+             */
+            timeout?: number;
+
+            /**
+             * Transport.
+             * @type {any}
+             */
+            transport?: any;
+        }
+
+        /**
+         * Producer.
+         * @inteface
+         */
+        export interface Producer {
+            /**
+             * Send messages to a named queue.
+             * @param {string}  queue   A named queue.
+             * @param {Object}  message A message.
+             * @return {Object} The consumer response.
+             */
+            produce(queue: string, message: Object, options?: ProducerOptions): PromiseLike<Object>;
+        }
+
+        /**
+         * Options for producer.
+         * @interface
+         */
+        export interface ProducerOptions {
+            routingKey?: string;
+            rpc?: boolean;
+        }
+    }
+
+    /**
+     * Constructor.
+     * @param {Options} [options] Options.
+     * @return {Instance} A instance of bunnymq.
+     */
+    function bunnymq(options?: bunnymq.Options): bunnymq.Instance;
+    export = bunnymq;
+}
diff --git a/busboy/busboy-tests.ts b/busboy/busboy-tests.ts
new file mode 100644
index 0000000000..058b5c92d3
--- /dev/null
+++ b/busboy/busboy-tests.ts
@@ -0,0 +1,39 @@
+/// <reference path="busboy.d.ts"/>
+/// <reference path="../node/node.d.ts" />
+
+import * as Busboy from 'busboy';
+import * as http from 'http';
+import * as util from 'util';
+
+function serverFn(req: http.ServerRequest, res: http.ServerResponse) {
+  if (req.method === 'POST') {
+    var busboy = new Busboy({ headers: req.headers });
+    busboy.on('file', function(fieldname, file, filename, encoding, mimetype) {
+      console.log('File [' + fieldname + ']: filename: ' + filename + ', encoding: ' + encoding + ', mimetype: ' + mimetype);
+      file.on('data', function(data: Buffer) {
+        console.log('File [' + fieldname + '] got ' + data.length + ' bytes');
+      });
+      file.on('end', function() {
+        console.log('File [' + fieldname + '] Finished');
+      });
+    });
+    busboy.on('field', function(fieldname, val, fieldnameTruncated, valTruncated, encoding, mimetype) {
+      console.log('Field [' + fieldname + ']: value: ' + util.inspect(val));
+    });
+    busboy.on('finish', function() {
+      console.log('Done parsing form!');
+      res.writeHead(303, { Connection: 'close', Location: '/' });
+      res.end();
+    });
+    req.pipe(busboy);
+  } else if (req.method === 'GET') {
+    res.writeHead(200, { Connection: 'close' });
+    res.end('<html><head></head><body>\
+               <form method="POST" enctype="multipart/form-data">\
+                <input type="text" name="textfield"><br />\
+                <input type="file" name="filefield"><br />\
+                <input type="submit">\
+              </form>\
+            </body></html>');
+  }
+}
diff --git a/busboy/busboy.d.ts b/busboy/busboy.d.ts
new file mode 100644
index 0000000000..3b64f3d112
--- /dev/null
+++ b/busboy/busboy.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for busboy v0.2.13
+// Project: https://www.npmjs.com/package/busboy
+// Definitions by: Jacob Baskin <https://github.com/jacobbaskin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference path="../node/node.d.ts" />
+
+declare namespace busboy {
+    interface Options {
+        headers: any;
+    }
+
+    interface BusboyConfig {
+        headers?: any;
+        highWaterMark?: number;
+        fileHwm?: number;
+        defCharset?: string;
+        preservePath?: boolean;
+        limits?: {
+            fieldNameSize?: number;
+            fieldSize?: number;
+            fields?: number;
+            fileSize?: number;
+            files?: number;
+            parts?: number;
+            headerPairs?: number;
+        };
+    }
+
+    interface Busboy extends NodeJS.WritableStream {
+        on(event: 'field',
+           listener: (
+               fieldname: string,
+               val: any,
+               fieldnameTruncated: boolean,
+               valTruncated: boolean,
+               encoding: string,
+               mimetype: string) => void): this;
+        on(event: 'file',
+           listener: (
+               fieldname: string,
+               file: NodeJS.ReadableStream,
+               filename: string,
+               encoding: string,
+               mimetype: string) => void): this;
+        on(event: 'finish', callback: () => void): this;
+        on(event: 'partsLimit', callback: () => void): this;
+        on(event: 'filesLimit', callback: () => void): this;
+        on(event: 'fieldsLimit', callback: () => void): this;
+        on(event: string, listener: Function): this;
+    }
+
+    interface BusboyConstructor {
+        new (options: BusboyConfig): Busboy;
+    }
+}
+
+declare module 'busboy' {
+    const temp: busboy.BusboyConstructor;
+    export = temp;
+}
diff --git a/cache-manager/cache-manager.d.ts b/cache-manager/cache-manager.d.ts
index 9570857f01..de6cf867a7 100644
--- a/cache-manager/cache-manager.d.ts
+++ b/cache-manager/cache-manager.d.ts
@@ -28,7 +28,7 @@ declare module 'cache-manager' {
 
 
     module cacheManager {
-        function caching(ICongig: StoreConfig): Cache;
+        function caching(IConfig: StoreConfig): Cache;
         function multiCaching(Caches: Cache[]): Cache;
     }
 
diff --git a/canvas-gauges/canvas-gauges-tests.ts b/canvas-gauges/canvas-gauges-tests.ts
new file mode 100644
index 0000000000..d0f04e1082
--- /dev/null
+++ b/canvas-gauges/canvas-gauges-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="canvas-gauges.d.ts" />
+
+import {
+    LinearGaugeOptions,
+    RadialGaugeOptions,
+    LinearGauge,
+    RadialGauge
+} from 'canvas-gauges';
+
+let linearOptions: LinearGaugeOptions = {
+    renderTo: document.createElement('canvas')
+};
+let radialOptions: RadialGaugeOptions = {
+    renderTo: 'gauge-id'
+};
+
+new LinearGauge(linearOptions);
+new RadialGauge(radialOptions);
+
+console.log(document.gauges.length);
diff --git a/canvas-gauges/canvas-gauges.d.ts b/canvas-gauges/canvas-gauges.d.ts
new file mode 100644
index 0000000000..53858e566e
--- /dev/null
+++ b/canvas-gauges/canvas-gauges.d.ts
@@ -0,0 +1,263 @@
+// Type definitions for canvas-gauges
+// Project: https://github.com/Mikhus/canvas-gauges
+// Definitions by: Mikhus <https://github.com/Mikhus>
+// Definitions: https://github.com/Mikhus/DefinitelyTyped
+
+declare namespace CanvasGauges {
+    export type RenderTarget = string|HTMLElement;
+
+    export interface AnimationRule {
+        (percent: number): number;
+    }
+
+    export interface Highlight {
+        from: number,
+        to: number,
+        color: string
+    }
+
+    export type MajorTicks = string[]|number[];
+
+    export interface GenericOptions {
+        renderTo: RenderTarget,
+        width?: number,
+        height?: number,
+        minValue?: number,
+        maxValue?: number,
+        value?: number,
+        units?: string|boolean,
+        majorTicks?: MajorTicks,
+        minorTicks?: number,
+        strokeTicks?: boolean,
+        animatedValue?: boolean,
+        title?: string|boolean,
+        borders?: boolean,
+        valueInt?: number,
+        valueDec?: number,
+        majorTicksInt?: number,
+        majorTicksDec?: number,
+        animation?: boolean,
+        animationDuration?: number,
+        animationRule?: string|AnimationRule,
+        colorPlate?: string,
+        colorMajorTicks?: string,
+        colorMinorTicks?: string,
+        colorTitle?: string,
+        colorUnits?: string,
+        colorNumbers?: string,
+        colorNeedle?: string,
+        colorNeedleEnd?: string,
+        colorValueText?: string,
+        colorValueTextShadow?: string,
+        colorBorderShadow?: string,
+        colorBorderOuter?: string,
+        colorBorderOuterEnd?: string,
+        colorBorderMiddle?: string,
+        colorBorderMiddleEnd?: string,
+        colorBorderInner?: string,
+        colorBorderInnerEnd?: string,
+        colorValueBoxRect?: string,
+        colorValueBoxRectEnd?: string,
+        colorValueBoxBackground?: string,
+        colorValueBoxShadow?: string,
+        colorNeedleShadowUp?: string,
+        colorNeedleShadowDown?: string,
+        needle?: boolean,
+        needleShadow?: boolean,
+        needleType?: string,
+        needleStart?: number,
+        needleEnd?: number,
+        needleWidth?: number,
+        borderOuterWidth?: number,
+        borderMiddleWidth?: number,
+        borderInnerWidth?: number,
+        borderShadowWidth?: number,
+        valueBox?: boolean,
+        valueBoxStroke?: number,
+        valueText?: string,
+        valueTextShadow?: boolean,
+        valueBoxBorderRadius?: number,
+        highlights?: Highlight[],
+        fontNumbers?: string,
+        fontTitle?: string,
+        fontUnits?: string,
+        fontValue?: string,
+        fontTitleSize?: number,
+        fontValueSize?: number,
+        fontUnitsSize?: number,
+        fontNumbersSize?: number
+    }
+
+    export interface RadialGaugeOptions extends GenericOptions {
+        ticksAngle?: number,
+        startAngle?: number,
+        colorNeedleCircleOuter?: string,
+        colorNeedleCircleOuterEnd?: string,
+        colorNeedleCircleInner?: string,
+        colorNeedleCircleInnerEnd?: string,
+        needleCircleSize?: number,
+        needleCircleInner?: boolean,
+        needleCircleOuter?: boolean,
+        animationTarget?: string
+    }
+
+    export interface LinearGaugeOptions extends GenericOptions {
+        borderRadius?: number,
+        barBeginCircle?: number,
+        barWidth?: number,
+        barStrokeWidth?: number,
+        barProgress?: boolean,
+        colorBar?: string,
+        colorBarEnd?: string,
+        colorBarStroke?: string,
+        colorBarProgress?: string,
+        colorBarProgressEnd?: string,
+        tickSide?: string,
+        needleSide?: string,
+        numberSide?: string,
+        ticksWidth?: number,
+        ticksWidthMinor?: number,
+        ticksPadding?: number,
+        barLength?: number
+    }
+
+    export interface DrawEventCallback {
+        (percent: number): any;
+    }
+
+    export interface EndEventCallback {
+        (): any;
+    }
+
+    export interface rules {
+        linear: AnimationRule,
+        quad: AnimationRule,
+        dequad: AnimationRule,
+        quint: AnimationRule,
+        dequint: AnimationRule,
+        cycle: AnimationRule,
+        decycle: AnimationRule,
+        bounce: AnimationRule,
+        debounce: AnimationRule,
+        elastic: AnimationRule,
+        delastic: AnimationRule
+    }
+
+    export class Animation {
+        public duration: number;
+        public rule: string|AnimationRule;
+        public draw: DrawEventCallback;
+        public end: EndEventCallback;
+
+        public static rules: rules;
+
+        constructor(rule?: string|AnimationRule, duration?: number,
+                    draw?: DrawEventCallback, end?: EndEventCallback);
+
+        public animate(draw?: DrawEventCallback, end?: EndEventCallback): any;
+        public destroy(): any;
+    }
+
+    export class SmartCanvas {
+        public element: HTMLCanvasElement;
+        public elementClone: HTMLCanvasElement;
+        public context: CanvasRenderingContext2D;
+        public contextClone: CanvasRenderingContext2D;
+        public drawWidth: number;
+        public drawHeight: number;
+        public drawX: number;
+        public drawY: number;
+        public minSide: number;
+        public width: number;
+        public height: number;
+
+        constructor(element: HTMLCanvasElement,
+                    width?: number,
+                    height?: number);
+
+        public init(): any;
+        public onRedraw(): any;
+        public destroy(): any;
+        public commit(): SmartCanvas;
+        public redraw(): SmartCanvas;
+
+        public pixelRatio: number;
+        public static redraw(): any;
+        public static collection: Array<SmartCanvas>;
+    }
+
+    export class DomObserver {
+        public Type: BaseGauge;
+        public mutationsObserved: boolean;
+        public isObservable: boolean;
+        public options: GenericOptions;
+        public element: string;
+        public type: string;
+
+        constructor(options: GenericOptions,
+                    element: string,
+                    type: string);
+
+        public isValidNode(node: Node|HTMLElement): boolean;
+        public traverse(): any;
+        public observe(records: MutationRecord[]): any;
+        public process(node: Node|HTMLElement): BaseGauge;
+
+        public static parse(value: any): any;
+        public static toDashed(camelCase: string): string;
+        public static toAttributeName(str: string): string;
+        static domReady(handler: Function): any;
+    }
+
+    export abstract class BaseGauge {
+        public type: BaseGauge;
+        public options: GenericOptions;
+        public canvas: SmartCanvas;
+        public animation: Animation;
+        public value: number;
+
+        constructor(options: GenericOptions);
+
+        public update(options: GenericOptions): BaseGauge;
+        public destroy(): any;
+        public abstract draw(): BaseGauge;
+
+        public static initialize(type: string, options: GenericOptions): any;
+    }
+
+    export class RadialGauge extends BaseGauge {
+        public type: RadialGauge;
+        public options: RadialGaugeOptions;
+
+        constructor(options: RadialGaugeOptions);
+
+        public draw(): RadialGauge;
+    }
+
+    export class LinearGauge extends BaseGauge {
+        public type: LinearGauge;
+        public options: LinearGaugeOptions;
+
+        constructor(options: LinearGaugeOptions);
+
+        public draw(): LinearGauge;
+    }
+
+    export interface Collection extends Array<BaseGauge> {
+        get: (id: number | string) => BaseGauge;
+    }
+}
+
+declare module 'canvas-gauges' {
+    export = CanvasGauges;
+}
+
+interface Document {
+    gauges: CanvasGauges.Collection;
+}
+
+interface Window {
+    BaseGauge: CanvasGauges.BaseGauge;
+    RadialGauge: CanvasGauges.RadialGauge;
+    LinearGauge: CanvasGauges.LinearGauge;
+}
diff --git a/chai-things/chai-things-tests.ts b/chai-things/chai-things-tests.ts
index de6a4c3ffe..c49ac3b468 100644
--- a/chai-things/chai-things-tests.ts
+++ b/chai-things/chai-things-tests.ts
@@ -18,9 +18,19 @@ function test_somethingSyntax() {
     array.should.include.something.with.property('b', 2);
     array.should.not.include.something.with.property('b', 3);
 
+    chai.expect(array).to.include.something();
+    chai.expect(array).to.include.something.that.deep.equals({ b: 2 });
+    chai.expect(array).to.include.something.that.not.deep.equals({ b: 2 });
+    chai.expect(array).not.to.include.something.that.deep.equals({ c: 3 });
+    chai.expect(array).to.include.something.that.not.deep.equals({ c: 3 });
+    chai.expect(array).to.include.something.with.property('b', 2);
+    chai.expect(array).not.to.include.something.with.property('b', 3);
+
     var array2 = [{ a: 'b' }, { a: 'b' }];
     array2.should.include.something.that.have.property("a");
     array2.should.include.something.that.have.property("a").not.equal("d");
+    chai.expect(array2).to.include.something.that.have.property("a");
+    chai.expect(array2).to.include.something.that.have.property("a").not.equal("d");
 }
 
 function test_somethingVariantsSyntax() {
@@ -35,6 +45,16 @@ function test_somethingVariantsSyntax() {
     array.should.include.one.that.deep.equals({ b: 2 });
     array.should.include.some();
     array.should.include.some.that.deep.equal({ b: 2 });
+
+    chai.expect(array).to.include.a.thing();
+    chai.expect(array).to.include.a.thing.that.deep.equals({ b: 2 });
+    chai.expect(array).to.include.an.item();
+    chai.expect(array).to.include.an.item.that.deep.equals({ b: 2 });
+    chai.expect(array).to.include.one.that.deep.equals({ b: 2 });
+    chai.expect(array).to.include.some();
+    chai.expect(array).to.include.some.that.deep.equal({ b: 2 });
+    chai.expect(array).to.contain.a.thing();
+    chai.expect(array).to.contain.a.thing.with.property('a', 1);
 }
 
 function test_allSyntax() {
diff --git a/chai-things/chai-things.d.ts b/chai-things/chai-things.d.ts
index 2636c9dcea..18c138ff38 100644
--- a/chai-things/chai-things.d.ts
+++ b/chai-things/chai-things.d.ts
@@ -23,6 +23,15 @@ declare namespace Chai {
         any: Anything;
     }
 
+    interface Include {
+        (item: any): any;
+        a: Item;
+        an: Item;
+        one: Something;
+        some: Something;
+        something: Something;
+    }
+
     interface Anything extends Assertion {
         (): any;
         that: Assertion;
diff --git a/chance/chance.d.ts b/chance/chance.d.ts
index 290cde8048..6390b57864 100644
--- a/chance/chance.d.ts
+++ b/chance/chance.d.ts
@@ -114,8 +114,16 @@ declare namespace Chance {
         capitalize(str: string): string;
         mixin(desc: MixinDescriptor): any;
         pad(num: number, width: number, padChar?: string): string;
+        /**
+         * @deprecated Use pickone
+        */
         pick<T>(arr: T[]): T;
+        pickone<T>(arr: T[]): T;
+        /**
+         * @deprecated Use pickset 
+         */
         pick<T>(arr: T[], count: number): T[];
+        pickset<T>(arr: T[], count: number): T[];
         set: Setter;
         shuffle<T>(arr: T[]): T[];
 
diff --git a/chart.js/chart.js.d.ts b/chart.js/chart.js.d.ts
index e05d930d4e..57389ee4ea 100644
--- a/chart.js/chart.js.d.ts
+++ b/chart.js/chart.js.d.ts
@@ -73,7 +73,7 @@ interface ChartOptions {
     onClick?: (any?: any) => any;
     title?: ChartTitleOptions;
     legend?: ChartLegendOptions;
-    tooltip?: ChartTooltipOptions;
+    tooltips?: ChartTooltipOptions;
     hover?: ChartHoverOptions;
     animation?: ChartAnimationOptions;
     elements?: ChartElementsOptions;
diff --git a/colors/colors-tests.ts b/colors/colors-tests.ts
index 15fd5ab4e5..ff838da995 100644
--- a/colors/colors-tests.ts
+++ b/colors/colors-tests.ts
@@ -3,9 +3,17 @@
 
 import colors = require("colors");
 
+colors.enabled = true;
+
 console.log(colors.black.underline('test'));
 console.log(colors.rainbow.black.blue.gray('test'));
 console.log(colors.random.reset.bgWhite.dim('test'));
+console.log(colors.random.reset.bgWhite.strip('test'));
 console.log('test'.black.underline);
 console.log('test'.rainbow.black.blue.gray);
 console.log('test'.random.reset.bgWhite.dim);
+console.log('test'.random.reset.bgWhite.dim.stripColors);
+
+colors.enabled = false;
+
+console.log(colors.black.underline('test'));
diff --git a/colors/colors.d.ts b/colors/colors.d.ts
index 7a78240287..50e960c416 100644
--- a/colors/colors.d.ts
+++ b/colors/colors.d.ts
@@ -7,6 +7,9 @@ declare module "colors" {
     interface Color {
         (text: string): string;
 
+        strip: Color;
+        stripColors: Color;
+
         black: Color;
         red: Color;
         green: Color;
@@ -47,6 +50,11 @@ declare module "colors" {
     namespace e {
         export function setTheme(theme:any): void;
 
+        export var enabled: boolean;
+
+        export var strip: Color;
+        export var stripColors: Color;
+
         export var black: Color;
         export var red: Color;
         export var green: Color;
@@ -88,6 +96,9 @@ declare module "colors" {
 }
 
 interface String {
+    strip: string;
+    stripColors: string;
+
     black: string;
     red: string;
     green: string;
diff --git a/core-js/core-js.d.ts b/core-js/core-js.d.ts
index c633dc4ef6..1ad88ff41a 100644
--- a/core-js/core-js.d.ts
+++ b/core-js/core-js.d.ts
@@ -1889,7 +1889,7 @@ declare module "core-js/fn/number/max-safe-integer" {
     var MAX_SAFE_INTEGER: typeof core.Number.MAX_SAFE_INTEGER;
     export = MAX_SAFE_INTEGER;
 }
-declare module "core-js/fn/number/min-safe-interger" {
+declare module "core-js/fn/number/min-safe-integer" {
     var MIN_SAFE_INTEGER: typeof core.Number.MIN_SAFE_INTEGER;
     export = MIN_SAFE_INTEGER;
 }
@@ -2668,7 +2668,7 @@ declare module "core-js/library/fn/number/max-safe-integer" {
     var MAX_SAFE_INTEGER: typeof core.Number.MAX_SAFE_INTEGER;
     export = MAX_SAFE_INTEGER;
 }
-declare module "core-js/library/fn/number/min-safe-interger" {
+declare module "core-js/library/fn/number/min-safe-integer" {
     var MIN_SAFE_INTEGER: typeof core.Number.MIN_SAFE_INTEGER;
     export = MIN_SAFE_INTEGER;
 }
diff --git a/couchbase/couchbase.d.ts b/couchbase/couchbase.d.ts
index 351c9a806d..2508f0e1d5 100644
--- a/couchbase/couchbase.d.ts
+++ b/couchbase/couchbase.d.ts
@@ -159,6 +159,14 @@ declare module 'couchbase' {
          * Creates a manager allowing the management of a Couchbase cluster.
          */
         manager(): ClusterManager;
+        
+        
+        /**
+         * Creates a manager allowing the management of a Couchbase cluster using credentials.
+         * @param username The username for your cluster.
+         * @param password The password for your cluster.
+         */
+        manager(username: string, password: string): ClusterManager;
 
         /**
          * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
diff --git a/cucumber/cucumber-tests.ts b/cucumber/cucumber-tests.ts
index d6ada278c2..aa17cd331e 100644
--- a/cucumber/cucumber-tests.ts
+++ b/cucumber/cucumber-tests.ts
@@ -1,30 +1,32 @@
 /// <reference path="cucumber.d.ts" />
+/// <reference path="../assert/assert.d.ts" />
 
 function StepSample() {
 	type Callback = cucumber.CallbackStepDefinition;
+  	type Table = cucumber.TableDefinition;
 	var step = <cucumber.StepDefinitions>this;
 	var hook = <cucumber.Hooks>this;
-	
+
 	hook.Before(function(scenario, callback){
 		scenario.isFailed() && callback.pending();
 	})
-	
+
 	hook.Around(function(scenario, runScenario)  {
 		scenario.isFailed() && runScenario(null, function(){
 			console.log('finish tasks');
 		});
 	});
-	
+
 	hook.registerHandler('AfterFeatures', function (event, callback) {
 		callback();
 	});
-	
+
 	step.Given(/^I am on the Cucumber.js GitHub repository$/, function(callback:Callback) {
 		this.visit('https://github.com/cucumber/cucumber-js', callback);
 	});
 
 	step.When(/^I go to the README file$/, function(title:string, callback:Callback) {
-		callback.pending();
+		callback(null, 'pending');
 	});
 
 	step.Then(/^I should see "(.*)" as the page title$/, { timeout:60*1000}, function(title:string, callback:Callback) {
@@ -36,5 +38,43 @@ function StepSample() {
 			callback(new Error("Expected to be on page with title " + title));
 		}
 	});
+  
+	// Type for data_table.js on 
+	// https://github.com/cucumber/cucumber-js/blob/a5fd8251918c278ab2e389226d165cedb44df14a/lib/cucumber/ast/data_table.js
+	
+	step.Given(/^a table step with Table raw$/, function(table:Table){
+		var expected = [
+			['Cucumber', 'Cucumis sativus'],
+			['Burr Gherkin', 'Cucumis anguria']
+		];
+	
+		assert.deepEqual(table.raw(), expected);
+	});
+	
+	step.Given(/^a table step with Table rows$/, function(table: Table){
+		var expected = [
+			['Apricot', '5'],
+			['Brocolli', '2'],
+			['Cucumber', '10']
+		];
+		assert.deepEqual(table.rows(), expected)
+	});
+	
+	step.Given(/^a table step with Table rowHash$/, function(table:Table){
+		var expected = {
+			'Cucumber': 'Cucumis sativus',
+			'Burr Gherkin': 'Cucumis anguria'
+		};
+		assert.deepEqual(table.rowsHash(), expected)
+	});
+	
+	step.Given(/^a table step$/, function(table:Table){
+		var expected = [
+			{'Vegetable': 'Apricot', 'Rating': '5'},
+			{'Vegetable': 'Brocolli', 'Rating': '2'},
+			{'Vegetable': 'Cucumber', 'Rating': '10'}
+		];
+		assert.deepEqual(table.hashes(), expected)
+	});
 }
 
diff --git a/cucumber/cucumber.d.ts b/cucumber/cucumber.d.ts
index 6c4273e4e0..a415a478e2 100644
--- a/cucumber/cucumber.d.ts
+++ b/cucumber/cucumber.d.ts
@@ -7,11 +7,20 @@ declare namespace cucumber {
 
 	export interface CallbackStepDefinition{
 		pending : () => PromiseLike<any>;
-		(errror?:any):void;
+		(errror?:any, pending?: string):void;
 	}
 
+	export interface TableDefinition{
+		raw: () => Array<any>;
+		rows: () => Array<any>;
+		rowsHash: () => {};
+		hashes: () => {};
+	}
+
+	type StepDefinitionParam = string | CallbackStepDefinition | TableDefinition;
+
 	interface StepDefinitionCode {
-		(...stepArgs: Array<string |CallbackStepDefinition>): PromiseLike<any> | any | void;
+		(...stepArgs: Array<StepDefinitionParam>): PromiseLike<any> | any | void;
 	}
 
 	interface StepDefinitionOptions{
diff --git a/d3/d3.d.ts b/d3/d3.d.ts
index 3ad327ffc3..d539b7439d 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -297,7 +297,7 @@ declare namespace d3 {
              * @param value the function to compute data for each node
              */
             datum<NewDatum>(value: (datum: Datum, index: number, outerIndex: number) => NewDatum): Update<NewDatum>;
-            
+
             /**
              * Set the data item for each node in the selection.
              * @param value the constant element to use for each node
@@ -415,7 +415,7 @@ declare namespace d3 {
 
             select(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
             call(func: (selection: Enter<Datum>, ...args: any[]) => any, ...args: any[]): Enter<Datum>;
-            
+
             empty(): boolean;
             size(): number;
         }
@@ -1078,7 +1078,7 @@ declare namespace d3 {
      * Return the min and max simultaneously.
      */
     export function extent<T>(array: T[], accessor: (datum: T, index: number) => string): [string, string];
-    
+
     /**
      * Return the min and max simultaneously.
      */
@@ -2928,6 +2928,8 @@ declare namespace d3 {
 
             start(): Force<Link, Node>;
 
+            tick(): Force<Link, Node>;
+
             alpha(): number;
             alpha(value: number): Force<Link, Node>;
 
diff --git a/date-fns/date-fns-tests.ts b/date-fns/date-fns-tests.ts
new file mode 100644
index 0000000000..4c1dfc2476
--- /dev/null
+++ b/date-fns/date-fns-tests.ts
@@ -0,0 +1,16 @@
+/// <reference path="date-fns.d.ts" />
+
+import {addDays, closestIndexTo, differenceInCalendarWeeks, max, isDate} from 'date-fns';
+import * as addHours from 'date-fns/add_hours';
+
+function test() {
+
+  addDays(new Date(), 5);
+  closestIndexTo(new Date(), [new Date(), new Date()]);
+  addHours(new Date(), 5);
+  differenceInCalendarWeeks(new Date(), new Date());
+  differenceInCalendarWeeks(new Date(), new Date(), {weekStartsOn: 1});
+  max(new Date(), new Date());
+  isDate({});
+
+}
\ No newline at end of file
diff --git a/date-fns/date-fns.d.ts b/date-fns/date-fns.d.ts
new file mode 100644
index 0000000000..d0582c2571
--- /dev/null
+++ b/date-fns/date-fns.d.ts
@@ -0,0 +1,1195 @@
+// Type definitions for date-fns
+// Project: https://date-fns.org/
+// Definitions by: Matt Lewis <https://github.com/mattlewis92>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type DateOrStringOrNumber = Date | string | number;
+
+declare module 'date-fns' {
+
+  function addDays(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addDays {}
+
+  function addHours(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addHours {}
+
+  function addISOYears(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addISOYears {}
+
+  function addMilliseconds(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addMilliseconds {}
+
+  function addMinutes(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addMinutes {}
+
+  function addMonths(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addMonths {}
+
+  function addQuarters(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addQuarters {}
+
+  function addSeconds(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addSeconds {}
+
+  function addWeeks(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addWeeks {}
+
+  function addYears(date: DateOrStringOrNumber, amount: number): Date;
+  namespace addYears {}
+
+  function closestIndexTo(dateToCompare: DateOrStringOrNumber, datesArray: DateOrStringOrNumber[]): number;
+  namespace closestIndexTo {}
+
+  function closestTo(dateToCompare: DateOrStringOrNumber, datesArray: DateOrStringOrNumber[]): Date;
+  namespace closestTo {}
+
+  function compareAsc(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace compareAsc {}
+
+  function compareDesc(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace compareDesc {}
+
+  function differenceInCalendarDays(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInCalendarDays {}
+
+  function differenceInCalendarISOWeeks(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInCalendarISOWeeks {}
+
+  function differenceInCalendarISOYears(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInCalendarISOYears {}
+
+  function differenceInCalendarMonths(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInCalendarMonths {}
+
+  function differenceInCalendarQuarters(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInCalendarQuarters {}
+
+  function differenceInCalendarWeeks(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber, options?: {weekStartsOn: number}): number;
+  namespace differenceInCalendarWeeks {}
+
+  function differenceInCalendarYears(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInCalendarYears {}
+
+  function differenceInDays(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInDays {}
+
+  function differenceInHours(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInHours {}
+
+  function differenceInISOYears(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInISOYears {}
+
+  function differenceInMilliseconds(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInMilliseconds {}
+
+  function differenceInMinutes(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInMinutes {}
+
+  function differenceInMonths(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInMonths {}
+
+  function differenceInQuarters(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInQuarters {}
+
+  function differenceInSeconds(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInSeconds {}
+
+  function differenceInWeeks(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInWeeks {}
+
+  function differenceInYears(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): number;
+  namespace differenceInYears {}
+
+  function distanceInWords(dateFrom: DateOrStringOrNumber, dateTo: DateOrStringOrNumber, options?: {includeSeconds: boolean}): string;
+  namespace distanceInWords {}
+
+  function distanceInWordsToNow(date: DateOrStringOrNumber, options?: {includeSeconds: boolean}): string;
+  namespace distanceInWordsToNow {}
+
+  function eachDay(startDate: DateOrStringOrNumber, endDate: DateOrStringOrNumber): Date[];
+  namespace eachDay {}
+
+  function endOfDay(date: DateOrStringOrNumber): Date;
+  namespace endOfDay {}
+
+  function endOfHour(date: DateOrStringOrNumber): Date;
+  namespace endOfHour {}
+
+  function endOfISOWeek(date: DateOrStringOrNumber): Date;
+  namespace endOfISOWeek {}
+
+  function endOfISOYear(date: DateOrStringOrNumber): Date;
+  namespace endOfISOYear {}
+
+  function endOfMinute(date: DateOrStringOrNumber): Date;
+  namespace endOfMinute {}
+
+  function endOfMonth(date: DateOrStringOrNumber): Date;
+  namespace endOfMonth {}
+
+  function endOfQuarter(date: DateOrStringOrNumber): Date;
+  namespace endOfQuarter {}
+
+  function endOfSecond(date: DateOrStringOrNumber): Date;
+  namespace endOfSecond {}
+
+  function endOfToday(): Date;
+  namespace endOfToday {}
+
+  function endOfTomorrow(): Date;
+  namespace endOfTomorrow {}
+
+  function endOfWeek(date: DateOrStringOrNumber, options?: {weekStartsOn: number}): Date;
+  namespace endOfWeek {}
+
+  function endOfYear(date: DateOrStringOrNumber): Date;
+  namespace endOfYear {}
+
+  function endOfYesterday(): Date;
+  namespace endOfYesterday {}
+
+  function format(date: DateOrStringOrNumber, format?: string): string;
+  namespace format {}
+
+  function getDate(date: DateOrStringOrNumber): number;
+  namespace getDate {}
+
+  function getDay(date: DateOrStringOrNumber): number;
+  namespace getDay {}
+
+  function getDayOfYear(date: DateOrStringOrNumber): number;
+  namespace getDayOfYear {}
+
+  function getDaysInMonth(date: DateOrStringOrNumber): number;
+  namespace getDaysInMonth {}
+
+  function getDaysInYear(date: DateOrStringOrNumber): number;
+  namespace getDaysInYear {}
+
+  function getHours(date: DateOrStringOrNumber): number;
+  namespace getHours {}
+
+  function getISOWeek(date: DateOrStringOrNumber): number;
+  namespace getISOWeek {}
+
+  function getISOWeeksInYear(date: DateOrStringOrNumber): number;
+  namespace getISOWeeksInYear {}
+
+  function getISOYear(date: DateOrStringOrNumber): number;
+  namespace getISOYear {}
+
+  function getMilliseconds(date: DateOrStringOrNumber): number;
+  namespace getMilliseconds {}
+
+  function getMinutes(date: DateOrStringOrNumber): number;
+  namespace getMinutes {}
+
+  function getMonth(date: DateOrStringOrNumber): number;
+  namespace getMonth {}
+
+  function getQuarter(date: DateOrStringOrNumber): number;
+  namespace getQuarter {}
+
+  function getSeconds(date: DateOrStringOrNumber): number;
+  namespace getSeconds {}
+
+  function getYear(date: DateOrStringOrNumber): number;
+  namespace getYear {}
+
+  function isAfter(dateToCompare: DateOrStringOrNumber, date: DateOrStringOrNumber): boolean;
+  namespace isAfter {}
+
+  function isBefore(dateToCompare: DateOrStringOrNumber, date: DateOrStringOrNumber): boolean;
+  namespace isBefore {}
+
+  function isDate(argument: any): boolean;
+  namespace isDate {}
+
+  function isEqual(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isEqual {}
+
+  function isFirstDayOfMonth(date: DateOrStringOrNumber): boolean;
+  namespace isFirstDayOfMonth {}
+
+  function isFriday(date: DateOrStringOrNumber): boolean;
+  namespace isFriday {}
+
+  function isFuture(date: DateOrStringOrNumber): boolean;
+  namespace isFuture {}
+
+  function isLastDayOfMonth(date: DateOrStringOrNumber): boolean;
+  namespace isLastDayOfMonth {}
+
+  function isLeapYear(date: DateOrStringOrNumber): boolean;
+  namespace isLeapYear {}
+
+  function isMonday(date: DateOrStringOrNumber): boolean;
+  namespace isMonday {}
+
+  function isPast(date: DateOrStringOrNumber): boolean;
+  namespace isPast {}
+
+  function isSameDay(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameDay {}
+
+  function isSameHour(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameHour {}
+
+  function isSameISOWeek(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameISOWeek {}
+
+  function isSameISOYear(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameISOYear {}
+
+  function isSameMinute(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameMinute {}
+
+  function isSameMonth(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameMonth {}
+
+  function isSameQuarter(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameQuarter {}
+
+  function isSameSecond(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameSecond {}
+
+  function isSameWeek(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber, options?: {weekStartsOn: number}): boolean;
+  namespace isSameWeek {}
+
+  function isSameYear(dateLeft: DateOrStringOrNumber, dateRight: DateOrStringOrNumber): boolean;
+  namespace isSameYear {}
+
+  function isSaturday(date: DateOrStringOrNumber): boolean;
+  namespace isSaturday {}
+
+  function isSunday(date: DateOrStringOrNumber): boolean;
+  namespace isSunday {}
+
+  function isThisHour(date: DateOrStringOrNumber): boolean;
+  namespace isThisHour {}
+
+  function isThisISOWeek(date: DateOrStringOrNumber): boolean;
+  namespace isThisISOWeek {}
+
+  function isThisISOYear(date: DateOrStringOrNumber): boolean;
+  namespace isThisISOYear {}
+
+  function isThisMinute(date: DateOrStringOrNumber): boolean;
+  namespace isThisMinute {}
+
+  function isThisMonth(date: DateOrStringOrNumber): boolean;
+  namespace isThisMonth {}
+
+  function isThisQuarter(date: DateOrStringOrNumber): boolean;
+  namespace isThisQuarter {}
+
+  function isThisSecond(date: DateOrStringOrNumber): boolean;
+  namespace isThisSecond {}
+
+  function isThisWeek(date: DateOrStringOrNumber, options?: {weekStartsOn: number}): boolean;
+  namespace isThisWeek {}
+
+  function isThisYear(date: DateOrStringOrNumber): boolean;
+  namespace isThisYear {}
+
+  function isThursday(date: DateOrStringOrNumber): boolean;
+  namespace isThursday {}
+
+  function isToday(date: DateOrStringOrNumber): boolean;
+  namespace isToday {}
+
+  function isTomorrow(date: DateOrStringOrNumber): boolean;
+  namespace isTomorrow {}
+
+  function isTuesday(date: DateOrStringOrNumber): boolean;
+  namespace isTuesday {}
+
+  function isValid(date: DateOrStringOrNumber): boolean;
+  namespace isValid {}
+
+  function isWednesday(date: DateOrStringOrNumber): boolean;
+  namespace isWednesday {}
+
+  function isWeekend(date: DateOrStringOrNumber): boolean;
+  namespace isWeekend {}
+
+  function isWithinRange(date: DateOrStringOrNumber, startDate: DateOrStringOrNumber, endDate: DateOrStringOrNumber): boolean;
+  namespace isWithinRange {}
+
+  function isYesterday(date: DateOrStringOrNumber): boolean;
+  namespace isYesterday {}
+
+  function lastDayOfISOWeek(date: DateOrStringOrNumber): Date;
+  namespace lastDayOfISOWeek {}
+
+  function lastDayOfISOYear(date: DateOrStringOrNumber): Date;
+  namespace lastDayOfISOYear {}
+
+  function lastDayOfMonth(date: DateOrStringOrNumber): Date;
+  namespace lastDayOfMonth {}
+
+  function lastDayOfQuarter(date: DateOrStringOrNumber): Date;
+  namespace lastDayOfQuarter {}
+
+  function lastDayOfWeek(date: DateOrStringOrNumber, options?: {weekStartsOn: number}): Date;
+  namespace lastDayOfWeek {}
+
+  function lastDayOfYear(date: DateOrStringOrNumber): Date;
+  namespace lastDayOfYear {}
+
+  function max(...dates: DateOrStringOrNumber[]): Date;
+  namespace max {}
+
+  function min(...dates: DateOrStringOrNumber[]): Date;
+  namespace min {}
+
+  function parse(dateString: string): Date;
+  namespace parse {}
+
+  function setDate(date: DateOrStringOrNumber, dayOfMonth: number): Date;
+  namespace setDate {}
+
+  function setDay(date: DateOrStringOrNumber, day: number, options?: {weekStartsOn: number}): Date;
+  namespace setDay {}
+
+  function setDayOfYear(date: DateOrStringOrNumber, dayOfYear: number): Date;
+  namespace setDayOfYear {}
+
+  function setHours(date: DateOrStringOrNumber, hours: number): Date;
+  namespace setHours {}
+
+  function setISOWeek(date: DateOrStringOrNumber, isoWeek: number): Date;
+  namespace setISOWeek {}
+
+  function setISOYear(date: DateOrStringOrNumber, isoYear: number): Date;
+  namespace setISOYear {}
+
+  function setMilliseconds(date: DateOrStringOrNumber, milliseconds: number): Date;
+  namespace setMilliseconds {}
+
+  function setMinutes(date: DateOrStringOrNumber, minutes: number): Date;
+  namespace setMinutes {}
+
+  function setMonth(date: DateOrStringOrNumber, month: number): Date;
+  namespace setMonth {}
+
+  function setQuarter(date: DateOrStringOrNumber, quarter: number): Date;
+  namespace setQuarter {}
+
+  function setSeconds(date: DateOrStringOrNumber, seconds: number): Date;
+  namespace setSeconds {}
+
+  function setYear(date: DateOrStringOrNumber, year: number): Date;
+  namespace setYear {}
+
+  function startOfDay(date: DateOrStringOrNumber): Date;
+  namespace startOfDay {}
+
+  function startOfHour(date: DateOrStringOrNumber): Date;
+  namespace startOfHour {}
+
+  function startOfISOWeek(date: DateOrStringOrNumber): Date;
+  namespace startOfISOWeek {}
+
+  function startOfISOYear(date: DateOrStringOrNumber): Date;
+  namespace startOfISOYear {}
+
+  function startOfMinute(date: DateOrStringOrNumber): Date;
+  namespace startOfMinute {}
+
+  function startOfMonth(date: DateOrStringOrNumber): Date;
+  namespace startOfMonth {}
+
+  function startOfQuarter(date: DateOrStringOrNumber): Date;
+  namespace startOfQuarter {}
+
+  function startOfSecond(date: DateOrStringOrNumber): Date;
+  namespace startOfSecond {}
+
+  function startOfToday(): Date;
+  namespace startOfToday {}
+
+  function startOfTomorrow(): Date;
+  namespace startOfTomorrow {}
+
+  function startOfWeek(date: DateOrStringOrNumber, options?: {weekStartsOn: number}): Date;
+  namespace startOfWeek {}
+
+  function startOfYear(date: DateOrStringOrNumber): Date;
+  namespace startOfYear {}
+
+  function startOfYesterday(): Date;
+  namespace startOfYesterday {}
+
+  function subDays(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subDays {}
+
+  function subHours(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subHours {}
+
+  function subISOYears(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subISOYears {}
+
+  function subMilliseconds(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subMilliseconds {}
+
+  function subMinutes(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subMinutes {}
+
+  function subMonths(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subMonths {}
+
+  function subQuarters(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subQuarters {}
+
+  function subSeconds(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subSeconds {}
+
+  function subWeeks(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subWeeks {}
+
+  function subYears(date: DateOrStringOrNumber, amount: number): Date;
+  namespace subYears {}
+
+}
+
+declare module 'date-fns/add_days' {
+  import {addDays} from 'date-fns';
+  export = addDays;
+}
+
+declare module 'date-fns/add_hours' {
+  import {addHours} from 'date-fns';
+  export = addHours;
+}
+
+declare module 'date-fns/add_iso_years' {
+  import {addISOYears} from 'date-fns';
+  export = addISOYears;
+}
+
+declare module 'date-fns/add_milliseconds' {
+  import {addMilliseconds} from 'date-fns';
+  export = addMilliseconds;
+}
+
+declare module 'date-fns/add_minutes' {
+  import {addMinutes} from 'date-fns';
+  export = addMinutes;
+}
+
+declare module 'date-fns/add_months' {
+  import {addMonths} from 'date-fns';
+  export = addMonths;
+}
+
+declare module 'date-fns/add_quarters' {
+  import {addQuarters} from 'date-fns';
+  export = addQuarters;
+}
+
+declare module 'date-fns/add_seconds' {
+  import {addSeconds} from 'date-fns';
+  export = addSeconds;
+}
+
+declare module 'date-fns/add_weeks' {
+  import {addWeeks} from 'date-fns';
+  export = addWeeks;
+}
+
+declare module 'date-fns/add_years' {
+  import {addYears} from 'date-fns';
+  export = addYears;
+}
+
+declare module 'date-fns/closest_index_to' {
+  import {closestIndexTo} from 'date-fns';
+  export = closestIndexTo;
+}
+
+declare module 'date-fns/closest_to' {
+  import {closestTo} from 'date-fns';
+  export = closestTo;
+}
+
+declare module 'date-fns/compare_asc' {
+  import {compareAsc} from 'date-fns';
+  export = compareAsc;
+}
+
+declare module 'date-fns/compare_desc' {
+  import {compareDesc} from 'date-fns';
+  export = compareDesc;
+}
+
+declare module 'date-fns/difference_in_calendar_days' {
+  import {differenceInCalendarDays} from 'date-fns';
+  export = differenceInCalendarDays;
+}
+
+declare module 'date-fns/difference_in_calendar_iso_weeks' {
+  import {differenceInCalendarISOWeeks} from 'date-fns';
+  export = differenceInCalendarISOWeeks;
+}
+
+declare module 'date-fns/difference_in_calendar_iso_years' {
+  import {differenceInCalendarISOYears} from 'date-fns';
+  export = differenceInCalendarISOYears;
+}
+
+declare module 'date-fns/difference_in_calendar_months' {
+  import {differenceInCalendarMonths} from 'date-fns';
+  export = differenceInCalendarMonths;
+}
+
+declare module 'date-fns/difference_in_calendar_quarters' {
+  import {differenceInCalendarQuarters} from 'date-fns';
+  export = differenceInCalendarQuarters;
+}
+
+declare module 'date-fns/difference_in_calendar_weeks' {
+  import {differenceInCalendarWeeks} from 'date-fns';
+  export = differenceInCalendarWeeks;
+}
+
+declare module 'date-fns/difference_in_calendar_years' {
+  import {differenceInCalendarYears} from 'date-fns';
+  export = differenceInCalendarYears;
+}
+
+declare module 'date-fns/difference_in_days' {
+  import {differenceInDays} from 'date-fns';
+  export = differenceInDays;
+}
+
+declare module 'date-fns/difference_in_hours' {
+  import {differenceInHours} from 'date-fns';
+  export = differenceInHours;
+}
+
+declare module 'date-fns/difference_in_iso_years' {
+  import {differenceInISOYears} from 'date-fns';
+  export = differenceInISOYears;
+}
+
+declare module 'date-fns/difference_in_milliseconds' {
+  import {differenceInMilliseconds} from 'date-fns';
+  export = differenceInMilliseconds;
+}
+
+declare module 'date-fns/difference_in_minutes' {
+  import {differenceInMinutes} from 'date-fns';
+  export = differenceInMinutes;
+}
+
+declare module 'date-fns/difference_in_months' {
+  import {differenceInMonths} from 'date-fns';
+  export = differenceInMonths;
+}
+
+declare module 'date-fns/difference_in_quarters' {
+  import {differenceInQuarters} from 'date-fns';
+  export = differenceInQuarters;
+}
+
+declare module 'date-fns/difference_in_seconds' {
+  import {differenceInSeconds} from 'date-fns';
+  export = differenceInSeconds;
+}
+
+declare module 'date-fns/difference_in_weeks' {
+  import {differenceInWeeks} from 'date-fns';
+  export = differenceInWeeks;
+}
+
+declare module 'date-fns/difference_in_years' {
+  import {differenceInYears} from 'date-fns';
+  export = differenceInYears;
+}
+
+declare module 'date-fns/distance_in_words' {
+  import {distanceInWords} from 'date-fns';
+  export = distanceInWords;
+}
+
+declare module 'date-fns/distance_in_words_to_now' {
+  import {distanceInWordsToNow} from 'date-fns';
+  export = distanceInWordsToNow;
+}
+
+declare module 'date-fns/each_day' {
+  import {eachDay} from 'date-fns';
+  export = eachDay;
+}
+
+declare module 'date-fns/end_of_day' {
+  import {endOfDay} from 'date-fns';
+  export = endOfDay;
+}
+
+declare module 'date-fns/end_of_hour' {
+  import {endOfHour} from 'date-fns';
+  export = endOfHour;
+}
+
+declare module 'date-fns/end_of_iso_week' {
+  import {endOfISOWeek} from 'date-fns';
+  export = endOfISOWeek;
+}
+
+declare module 'date-fns/end_of_iso_year' {
+  import {endOfISOYear} from 'date-fns';
+  export = endOfISOYear;
+}
+
+declare module 'date-fns/end_of_minute' {
+  import {endOfMinute} from 'date-fns';
+  export = endOfMinute;
+}
+
+declare module 'date-fns/end_of_month' {
+  import {endOfMonth} from 'date-fns';
+  export = endOfMonth;
+}
+
+declare module 'date-fns/end_of_quarter' {
+  import {endOfQuarter} from 'date-fns';
+  export = endOfQuarter;
+}
+
+declare module 'date-fns/end_of_second' {
+  import {endOfSecond} from 'date-fns';
+  export = endOfSecond;
+}
+
+declare module 'date-fns/end_of_today' {
+  import {endOfToday} from 'date-fns';
+  export = endOfToday;
+}
+
+declare module 'date-fns/end_of_tomorrow' {
+  import {endOfTomorrow} from 'date-fns';
+  export = endOfTomorrow;
+}
+
+declare module 'date-fns/end_of_week' {
+  import {endOfWeek} from 'date-fns';
+  export = endOfWeek;
+}
+
+declare module 'date-fns/end_of_year' {
+  import {endOfYear} from 'date-fns';
+  export = endOfYear;
+}
+
+declare module 'date-fns/end_of_yesterday' {
+  import {endOfYesterday} from 'date-fns';
+  export = endOfYesterday;
+}
+
+declare module 'date-fns/format' {
+  import {format} from 'date-fns';
+  export = format;
+}
+
+declare module 'date-fns/get_date' {
+  import {getDate} from 'date-fns';
+  export = getDate;
+}
+
+declare module 'date-fns/get_day' {
+  import {getDay} from 'date-fns';
+  export = getDay;
+}
+
+declare module 'date-fns/get_day_of_year' {
+  import {getDayOfYear} from 'date-fns';
+  export = getDayOfYear;
+}
+
+declare module 'date-fns/get_days_in_month' {
+  import {getDaysInMonth} from 'date-fns';
+  export = getDaysInMonth;
+}
+
+declare module 'date-fns/get_days_in_year' {
+  import {getDaysInYear} from 'date-fns';
+  export = getDaysInYear;
+}
+
+declare module 'date-fns/get_hours' {
+  import {getHours} from 'date-fns';
+  export = getHours;
+}
+
+declare module 'date-fns/get_iso_week' {
+  import {getISOWeek} from 'date-fns';
+  export = getISOWeek;
+}
+
+declare module 'date-fns/get_iso_weeks_in_year' {
+  import {getISOWeeksInYear} from 'date-fns';
+  export = getISOWeeksInYear;
+}
+
+declare module 'date-fns/get_iso_year' {
+  import {getISOYear} from 'date-fns';
+  export = getISOYear;
+}
+
+declare module 'date-fns/get_milliseconds' {
+  import {getMilliseconds} from 'date-fns';
+  export = getMilliseconds;
+}
+
+declare module 'date-fns/get_minutes' {
+  import {getMinutes} from 'date-fns';
+  export = getMinutes;
+}
+
+declare module 'date-fns/get_month' {
+  import {getMonth} from 'date-fns';
+  export = getMonth;
+}
+
+declare module 'date-fns/get_quarter' {
+  import {getQuarter} from 'date-fns';
+  export = getQuarter;
+}
+
+declare module 'date-fns/get_seconds' {
+  import {getSeconds} from 'date-fns';
+  export = getSeconds;
+}
+
+declare module 'date-fns/get_year' {
+  import {getYear} from 'date-fns';
+  export = getYear;
+}
+
+declare module 'date-fns/is_after' {
+  import {isAfter} from 'date-fns';
+  export = isAfter;
+}
+
+declare module 'date-fns/is_before' {
+  import {isBefore} from 'date-fns';
+  export = isBefore;
+}
+
+declare module 'date-fns/is_date' {
+  import {isDate} from 'date-fns';
+  export = isDate;
+}
+
+declare module 'date-fns/is_equal' {
+  import {isEqual} from 'date-fns';
+  export = isEqual;
+}
+
+declare module 'date-fns/is_first_day_of_month' {
+  import {isFirstDayOfMonth} from 'date-fns';
+  export = isFirstDayOfMonth;
+}
+
+declare module 'date-fns/is_friday' {
+  import {isFriday} from 'date-fns';
+  export = isFriday;
+}
+
+declare module 'date-fns/is_future' {
+  import {isFuture} from 'date-fns';
+  export = isFuture;
+}
+
+declare module 'date-fns/is_last_day_of_month' {
+  import {isLastDayOfMonth} from 'date-fns';
+  export = isLastDayOfMonth;
+}
+
+declare module 'date-fns/is_leap_year' {
+  import {isLeapYear} from 'date-fns';
+  export = isLeapYear;
+}
+
+declare module 'date-fns/is_monday' {
+  import {isMonday} from 'date-fns';
+  export = isMonday;
+}
+
+declare module 'date-fns/is_past' {
+  import {isPast} from 'date-fns';
+  export = isPast;
+}
+
+declare module 'date-fns/is_same_day' {
+  import {isSameDay} from 'date-fns';
+  export = isSameDay;
+}
+
+declare module 'date-fns/is_same_hour' {
+  import {isSameHour} from 'date-fns';
+  export = isSameHour;
+}
+
+declare module 'date-fns/is_same_iso_week' {
+  import {isSameISOWeek} from 'date-fns';
+  export = isSameISOWeek;
+}
+
+declare module 'date-fns/is_same_iso_year' {
+  import {isSameISOYear} from 'date-fns';
+  export = isSameISOYear;
+}
+
+declare module 'date-fns/is_same_minute' {
+  import {isSameMinute} from 'date-fns';
+  export = isSameMinute;
+}
+
+declare module 'date-fns/is_same_month' {
+  import {isSameMonth} from 'date-fns';
+  export = isSameMonth;
+}
+
+declare module 'date-fns/is_same_quarter' {
+  import {isSameQuarter} from 'date-fns';
+  export = isSameQuarter;
+}
+
+declare module 'date-fns/is_same_second' {
+  import {isSameSecond} from 'date-fns';
+  export = isSameSecond;
+}
+
+declare module 'date-fns/is_same_week' {
+  import {isSameWeek} from 'date-fns';
+  export = isSameWeek;
+}
+
+declare module 'date-fns/is_same_year' {
+  import {isSameYear} from 'date-fns';
+  export = isSameYear;
+}
+
+declare module 'date-fns/is_saturday' {
+  import {isSaturday} from 'date-fns';
+  export = isSaturday;
+}
+
+declare module 'date-fns/is_sunday' {
+  import {isSunday} from 'date-fns';
+  export = isSunday;
+}
+
+declare module 'date-fns/is_this_hour' {
+  import {isThisHour} from 'date-fns';
+  export = isThisHour;
+}
+
+declare module 'date-fns/is_this_iso_week' {
+  import {isThisISOWeek} from 'date-fns';
+  export = isThisISOWeek;
+}
+
+declare module 'date-fns/is_this_iso_year' {
+  import {isThisISOYear} from 'date-fns';
+  export = isThisISOYear;
+}
+
+declare module 'date-fns/is_this_minute' {
+  import {isThisMinute} from 'date-fns';
+  export = isThisMinute;
+}
+
+declare module 'date-fns/is_this_month' {
+  import {isThisMonth} from 'date-fns';
+  export = isThisMonth;
+}
+
+declare module 'date-fns/is_this_quarter' {
+  import {isThisQuarter} from 'date-fns';
+  export = isThisQuarter;
+}
+
+declare module 'date-fns/is_this_second' {
+  import {isThisSecond} from 'date-fns';
+  export = isThisSecond;
+}
+
+declare module 'date-fns/is_this_week' {
+  import {isThisWeek} from 'date-fns';
+  export = isThisWeek;
+}
+
+declare module 'date-fns/is_this_year' {
+  import {isThisYear} from 'date-fns';
+  export = isThisYear;
+}
+
+declare module 'date-fns/is_thursday' {
+  import {isThursday} from 'date-fns';
+  export = isThursday;
+}
+
+declare module 'date-fns/is_today' {
+  import {isToday} from 'date-fns';
+  export = isToday;
+}
+
+declare module 'date-fns/is_tomorrow' {
+  import {isTomorrow} from 'date-fns';
+  export = isTomorrow;
+}
+
+declare module 'date-fns/is_tuesday' {
+  import {isTuesday} from 'date-fns';
+  export = isTuesday;
+}
+
+declare module 'date-fns/is_valid' {
+  import {isValid} from 'date-fns';
+  export = isValid;
+}
+
+declare module 'date-fns/is_wednesday' {
+  import {isWednesday} from 'date-fns';
+  export = isWednesday;
+}
+
+declare module 'date-fns/is_weekend' {
+  import {isWeekend} from 'date-fns';
+  export = isWeekend;
+}
+
+declare module 'date-fns/is_within_range' {
+  import {isWithinRange} from 'date-fns';
+  export = isWithinRange;
+}
+
+declare module 'date-fns/is_yesterday' {
+  import {isYesterday} from 'date-fns';
+  export = isYesterday;
+}
+
+declare module 'date-fns/last_day_of_iso_week' {
+  import {lastDayOfISOWeek} from 'date-fns';
+  export = lastDayOfISOWeek;
+}
+
+declare module 'date-fns/last_day_of_iso_year' {
+  import {lastDayOfISOYear} from 'date-fns';
+  export = lastDayOfISOYear;
+}
+
+declare module 'date-fns/last_day_of_month' {
+  import {lastDayOfMonth} from 'date-fns';
+  export = lastDayOfMonth;
+}
+
+declare module 'date-fns/last_day_of_quarter' {
+  import {lastDayOfQuarter} from 'date-fns';
+  export = lastDayOfQuarter;
+}
+
+declare module 'date-fns/last_day_of_week' {
+  import {lastDayOfWeek} from 'date-fns';
+  export = lastDayOfWeek;
+}
+
+declare module 'date-fns/last_day_of_year' {
+  import {lastDayOfYear} from 'date-fns';
+  export = lastDayOfYear;
+}
+
+declare module 'date-fns/max' {
+  import {max} from 'date-fns';
+  export = max;
+}
+
+declare module 'date-fns/min' {
+  import {min} from 'date-fns';
+  export = min;
+}
+
+declare module 'date-fns/parse' {
+  import {parse} from 'date-fns';
+  export = parse;
+}
+
+declare module 'date-fns/set_date' {
+  import {setDate} from 'date-fns';
+  export = setDate;
+}
+
+declare module 'date-fns/set_day' {
+  import {setDay} from 'date-fns';
+  export = setDay;
+}
+
+declare module 'date-fns/set_day_of_year' {
+  import {setDayOfYear} from 'date-fns';
+  export = setDayOfYear;
+}
+
+declare module 'date-fns/set_hours' {
+  import {setHours} from 'date-fns';
+  export = setHours;
+}
+
+declare module 'date-fns/set_iso_week' {
+  import {setISOWeek} from 'date-fns';
+  export = setISOWeek;
+}
+
+declare module 'date-fns/set_iso_year' {
+  import {setISOYear} from 'date-fns';
+  export = setISOYear;
+}
+
+declare module 'date-fns/set_milliseconds' {
+  import {setMilliseconds} from 'date-fns';
+  export = setMilliseconds;
+}
+
+declare module 'date-fns/set_minutes' {
+  import {setMinutes} from 'date-fns';
+  export = setMinutes;
+}
+
+declare module 'date-fns/set_month' {
+  import {setMonth} from 'date-fns';
+  export = setMonth;
+}
+
+declare module 'date-fns/set_quarter' {
+  import {setQuarter} from 'date-fns';
+  export = setQuarter;
+}
+
+declare module 'date-fns/set_seconds' {
+  import {setSeconds} from 'date-fns';
+  export = setSeconds;
+}
+
+declare module 'date-fns/set_year' {
+  import {setYear} from 'date-fns';
+  export = setYear;
+}
+
+declare module 'date-fns/start_of_day' {
+  import {startOfDay} from 'date-fns';
+  export = startOfDay;
+}
+
+declare module 'date-fns/start_of_hour' {
+  import {startOfHour} from 'date-fns';
+  export = startOfHour;
+}
+
+declare module 'date-fns/start_of_iso_week' {
+  import {startOfISOWeek} from 'date-fns';
+  export = startOfISOWeek;
+}
+
+declare module 'date-fns/start_of_iso_year' {
+  import {startOfISOYear} from 'date-fns';
+  export = startOfISOYear;
+}
+
+declare module 'date-fns/start_of_minute' {
+  import {startOfMinute} from 'date-fns';
+  export = startOfMinute;
+}
+
+declare module 'date-fns/start_of_month' {
+  import {startOfMonth} from 'date-fns';
+  export = startOfMonth;
+}
+
+declare module 'date-fns/start_of_quarter' {
+  import {startOfQuarter} from 'date-fns';
+  export = startOfQuarter;
+}
+
+declare module 'date-fns/start_of_second' {
+  import {startOfSecond} from 'date-fns';
+  export = startOfSecond;
+}
+
+declare module 'date-fns/start_of_today' {
+  import {startOfToday} from 'date-fns';
+  export = startOfToday;
+}
+
+declare module 'date-fns/start_of_tomorrow' {
+  import {startOfTomorrow} from 'date-fns';
+  export = startOfTomorrow;
+}
+
+declare module 'date-fns/start_of_week' {
+  import {startOfWeek} from 'date-fns';
+  export = startOfWeek;
+}
+
+declare module 'date-fns/start_of_year' {
+  import {startOfYear} from 'date-fns';
+  export = startOfYear;
+}
+
+declare module 'date-fns/start_of_yesterday' {
+  import {startOfYesterday} from 'date-fns';
+  export = startOfYesterday;
+}
+
+declare module 'date-fns/sub_days' {
+  import {subDays} from 'date-fns';
+  export = subDays;
+}
+
+declare module 'date-fns/sub_hours' {
+  import {subHours} from 'date-fns';
+  export = subHours;
+}
+
+declare module 'date-fns/sub_iso_years' {
+  import {subISOYears} from 'date-fns';
+  export = subISOYears;
+}
+
+declare module 'date-fns/sub_milliseconds' {
+  import {subMilliseconds} from 'date-fns';
+  export = subMilliseconds;
+}
+
+declare module 'date-fns/sub_minutes' {
+  import {subMinutes} from 'date-fns';
+  export = subMinutes;
+}
+
+declare module 'date-fns/sub_months' {
+  import {subMonths} from 'date-fns';
+  export = subMonths;
+}
+
+declare module 'date-fns/sub_quarters' {
+  import {subQuarters} from 'date-fns';
+  export = subQuarters;
+}
+
+declare module 'date-fns/sub_seconds' {
+  import {subSeconds} from 'date-fns';
+  export = subSeconds;
+}
+
+declare module 'date-fns/sub_weeks' {
+  import {subWeeks} from 'date-fns';
+  export = subWeeks;
+}
+
+declare module 'date-fns/sub_years' {
+  import {subYears} from 'date-fns';
+  export = subYears;
+}
+
diff --git a/dojo/dojo.d.ts b/dojo/dojo.d.ts
index bca5721240..eaab995a36 100644
--- a/dojo/dojo.d.ts
+++ b/dojo/dojo.d.ts
@@ -5686,7 +5686,23 @@ declare namespace dojo {
              * @param dest The object to which to copy/add all properties contained in source. If dest is falsy, thena new object is manufactured before copying/adding properties begins.
              * @param sources One of more objects from which to draw all properties to copy into dest. sources are processedleft-to-right and if more than one of these objects contain the same property name, the right-mostvalue "wins".
              */
-            mixin(dest: Object, source: Object, sources?: Object[]): Object;
+            mixin<T>(dest: T): T;
+            mixin<T, U>(
+                dest: T,
+                source: U
+            ): T & U;
+            mixin<T, U, V>(
+                dest: T,
+                source1: U,
+                source2: V
+            ): T & U & V;
+            mixin<T, U, V, W>(
+                dest: T,
+                source1: U,
+                source2: V,
+                source3: W
+            ): T & U & V & W;
+            mixin<T>(dest: Object, ...sources: Object[]): T;
             /**
              * similar to hitch() except that the scope object is left to be
              * whatever the execution context eventually becomes.
diff --git a/dva/dva-tests.tsx b/dva/dva-tests.tsx
new file mode 100644
index 0000000000..917ee69e60
--- /dev/null
+++ b/dva/dva-tests.tsx
@@ -0,0 +1,48 @@
+/// <reference path="../react/react.d.ts" />
+/// <reference path="./dva.d.ts" />
+
+import React = __React;
+
+import dva from 'dva';
+import { connect } from 'dva';
+import { Router, Route } from 'dva/router';
+
+// 1. Initialize
+const app = dva();
+
+// 2. Model
+app.model({
+    namespace: 'count',
+    state: 0,
+    reducers: {
+        add(count: number) {
+            return count + 1
+        },
+        minus(count: number) {
+            return count - 1
+        },
+    },
+});
+
+// 3. View
+const App = connect(({ count }) => ({
+    count
+}))(function ({ count, dispatch }) {
+    return (
+        <div>
+            <h2>{ count }</h2>
+            <button key="add" onClick={() => { dispatch({type: 'count/add'})}}>+</button>
+            <button key="minus" onClick={() => { dispatch({type: 'count/minus'})}}>-</button>
+        </div>
+    );
+});
+
+// 4. Router
+app.router(({ history }) =>
+    <Router history={history}>
+        <Route path="/" component={App}/>
+    </Router>
+);
+
+// 5. Start
+const countApp = app.start();
diff --git a/dva/dva.d.ts b/dva/dva.d.ts
new file mode 100644
index 0000000000..0cf7206e63
--- /dev/null
+++ b/dva/dva.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for dva v1.0.0
+// Project: https://github.com/dvajs/dva
+// Definitions by: nikogu <https://github.com/nikogu/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+declare module 'dva' {
+    /** connecting Container Components */
+    export function connect(maps:Object):Function;
+
+    export default function dva(opts?:Object):{
+
+        /** dva plugin */
+        use: (hooks:Object)=>void,
+
+        /** dva bootstrap */
+        start: (selector?:String|HTMLElement)=>void,
+
+        /** dva add model */
+        model: (model:Object)=>void,
+
+        /** dva setting router */
+        router: (router:Object)=>Object|JSX.Element,
+    };
+}
+
+/**
+ * https://github.com/reactjs/react-router
+ */
+declare module 'dva/router' {
+    import React = __React;
+
+    interface RouterProps {
+        history?: Object
+    }
+    export class Router extends React.Component<RouterProps, {}> {
+        render():JSX.Element
+    }
+
+
+    interface RouteProps {
+        path?: string,
+        component?: React.ReactNode
+    }
+    export class Route extends React.Component<RouteProps, {}> {
+        render():JSX.Element
+    }
+
+    /**
+     * https://github.com/reactjs/react-router-redux
+     */
+    export class routerRedux {}
+
+}
+
+/**
+ * https://github.com/fis-components/whatwg-fetch
+ */
+declare module 'dva/fetch' {
+    export default Function;
+}
diff --git a/elastic.js/elastic.js.d.ts b/elastic.js/elastic.js.d.ts
index 850d1ccdfa..9bf5f6a9dc 100644
--- a/elastic.js/elastic.js.d.ts
+++ b/elastic.js/elastic.js.d.ts
@@ -19,7 +19,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -40,7 +40,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -58,7 +58,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -107,7 +107,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -139,7 +139,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -161,7 +161,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -226,7 +226,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets if the Query should be enhanced with a
@@ -278,7 +278,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -298,7 +298,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost factor.
@@ -314,7 +314,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -335,7 +335,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -362,7 +362,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -382,7 +382,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -425,7 +425,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -454,7 +454,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the analyzer name used to analyze the Query object.
@@ -522,7 +522,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -536,7 +536,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets analyzer used to analyze the suggest text.
@@ -593,7 +593,7 @@ declare module elasticjs {
      Retrieves the internal suggest object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets if transpositions should be counted as one or two changes, defaults
@@ -635,7 +635,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -666,7 +666,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -693,7 +693,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -805,7 +805,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -839,7 +839,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enables caching of the facetFilter
@@ -986,7 +986,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Allows you to specify a different value field to aggrerate over.
@@ -1023,7 +1023,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -1086,7 +1086,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1110,7 +1110,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the decay value which defines how documents are scored at the distance
@@ -1165,7 +1165,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1185,7 +1185,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the accuracy.  How similar the suggested terms at least
@@ -1285,7 +1285,7 @@ declare module elasticjs {
      Retrieves the internal generator object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1389,7 +1389,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -1419,7 +1419,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1438,7 +1438,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -1489,7 +1489,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -1521,7 +1521,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1531,7 +1531,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enables caching of the facetFilter
@@ -1573,7 +1573,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1595,7 +1595,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -1616,7 +1616,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1636,7 +1636,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -1662,7 +1662,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1684,7 +1684,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -1734,7 +1734,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1766,7 +1766,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enables caching of the facetFilter
@@ -1813,7 +1813,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1823,7 +1823,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -1864,7 +1864,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -1908,7 +1908,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -1946,7 +1946,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      The analyzer that will be used to analyze the text. Defaults to the
@@ -2000,7 +2000,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -2035,7 +2035,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      The analyzer that will be used to analyze the text. Defaults to the
@@ -2091,7 +2091,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -2116,7 +2116,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value of the Query.
@@ -2179,7 +2179,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Set to false to use classic Levenshtein edit distance.
@@ -2208,7 +2208,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the bottom-right coordinate of the bounding box
@@ -2284,7 +2284,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -2344,7 +2344,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the distance unit.  Valid values are:
@@ -2383,7 +2383,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Adds a new bounded range.
@@ -2479,7 +2479,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the distance unit.  Valid values are "mi" for miles or "km"
@@ -2515,7 +2515,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -2601,7 +2601,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -2728,7 +2728,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -2771,7 +2771,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -2792,7 +2792,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the GeoPoint from an array point.  The array must contain only
@@ -2834,7 +2834,7 @@ declare module elasticjs {
      Retrieves the internal script object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -2853,7 +2853,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -2921,7 +2921,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -3007,7 +3007,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -3059,7 +3059,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -3079,7 +3079,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -3100,7 +3100,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -3119,7 +3119,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -3185,7 +3185,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -3232,7 +3232,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the child document type to search against
@@ -3256,7 +3256,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -3317,7 +3317,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -3360,7 +3360,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -3390,7 +3390,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Set's the boundary characters.  When highlighting a field that is
@@ -3462,7 +3462,7 @@ declare module elasticjs {
      Sets arbitrary options that can be passed to the highlighter
      implementation in use.
      */
-    options(opts: string, oField: Object): Highlight;
+    options(opts: string, oField: string): Highlight;
 
     /*
      Sets the order of highlight fragments.  You can apply the option
@@ -3508,7 +3508,7 @@ declare module elasticjs {
      Retrieves the internal script object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the highligher type.  You can apply the option
@@ -3539,7 +3539,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -3621,7 +3621,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -3655,7 +3655,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enables caching of the facetFilter
@@ -3762,7 +3762,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Allows you to specify a different value field to aggrerate over.
@@ -3793,7 +3793,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -3848,7 +3848,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -3859,7 +3859,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the type as a single type or an array of types.  If type is a
@@ -3896,7 +3896,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the document id of the indexed shape.
@@ -3919,7 +3919,7 @@ declare module elasticjs {
      Retrieves the internal script object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the type which the shape is indexed under.
@@ -3945,7 +3945,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -4006,7 +4006,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -4036,7 +4036,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4057,7 +4057,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -4115,7 +4115,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4133,7 +4133,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -4177,7 +4177,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -4216,7 +4216,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -4227,7 +4227,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4248,7 +4248,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the analyzer name used to analyze the Query object.
@@ -4377,7 +4377,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the type of the MatchQuery.  Valid values are
@@ -4411,7 +4411,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -4443,7 +4443,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4453,7 +4453,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -4485,7 +4485,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4507,7 +4507,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -4539,7 +4539,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4559,7 +4559,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -4585,7 +4585,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4603,7 +4603,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -4657,7 +4657,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      The analyzer that will be used to analyze the text. Defaults to the
@@ -4748,7 +4748,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4767,7 +4767,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      The analyzer that will be used to analyze the text. Defaults to the
@@ -4860,7 +4860,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -4883,7 +4883,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the analyzer name used to analyze the Query object.
@@ -5022,7 +5022,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the type of the MultiMatchQuery.  Valid values are
@@ -5061,7 +5061,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -5087,7 +5087,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -5113,7 +5113,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value of the nested Query.
@@ -5190,7 +5190,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -5227,7 +5227,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -5246,7 +5246,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -5300,7 +5300,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -5388,7 +5388,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -5437,7 +5437,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Compression controls memory usage and approximation error. The compression
@@ -5496,7 +5496,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -5518,7 +5518,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets analyzer used to analyze the suggest text.
@@ -5625,7 +5625,7 @@ declare module elasticjs {
      Retrieves the internal suggest object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the token limit.
@@ -5649,7 +5649,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -5698,7 +5698,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value of the Query.
@@ -5743,7 +5743,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      The prefix value.
@@ -5780,7 +5780,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enables caching of the facetFilter
@@ -5827,7 +5827,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -5853,7 +5853,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -5888,7 +5888,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -5899,7 +5899,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -5922,7 +5922,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets whether or not wildcard characters (* and ?) are allowed as the
@@ -6114,7 +6114,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets whether or not queries against multiple fields should be combined using Lucene's
@@ -6140,7 +6140,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Adds a filter whose matching documents will have the score function applied.
@@ -6156,7 +6156,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -6181,7 +6181,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -6223,7 +6223,7 @@ declare module elasticjs {
     /*
      Adds a range to the list of exsiting range expressions.
      */
-    range(from: string, to: string, key: string): RangeAggregation;
+    range(from: number, to?: number, key?: string): RangeAggregation;
 
     /*
      Allows you generate or modify the terms using a script.
@@ -6239,7 +6239,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -6271,7 +6271,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Adds a new bounded range.
@@ -6356,7 +6356,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Allows you to specify an alternate value field to be used to compute statistical information.
@@ -6385,7 +6385,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -6476,7 +6476,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value of the Query.
@@ -6537,7 +6537,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -6557,7 +6557,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -6630,7 +6630,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value of the Query.
@@ -6698,7 +6698,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      The regexp value.
@@ -6721,7 +6721,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add an aggregation.  This method can be called multiple times
@@ -6769,7 +6769,7 @@ declare module elasticjs {
      by making multiple request. This parameters specifies the starting
      result/document number point. Combine with size() to achieve paging.
      */
-    from(f: any[]): Request;
+    from(f: number): Request;
 
     /*
      Performs highlighting based on the Highlight
@@ -6827,7 +6827,7 @@ declare module elasticjs {
 
      It is recommended to use Sort objects when possible.
      */
-    sort(fieldName: string): Request;
+    sort(fieldName?: string | any[] | Sort, order?: string): Request;
 
     /*
      Allows to control how the _source field is returned with every hit.
@@ -6859,7 +6859,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Enables score computation and tracking during sorting.  Be default,
@@ -6889,7 +6889,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the weight assigned to the original query of the rescoring.
@@ -6921,7 +6921,7 @@ declare module elasticjs {
      Retrieves the internal script object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the window_size parameter of the rescoring.
@@ -6936,7 +6936,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Adds a filter whose matching documents will have the score function applied.
@@ -6947,7 +6947,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -6969,7 +6969,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      If execeptions thrown from the script should be ignored or not.
@@ -6997,7 +6997,7 @@ declare module elasticjs {
      Retrieves the internal script object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7015,7 +7015,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -7071,7 +7071,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Adds a filter whose matching documents will have the score function applied.
@@ -7098,7 +7098,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7119,7 +7119,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the coordinates for the shape definition.  Note, the coordinates
@@ -7137,7 +7137,7 @@ declare module elasticjs {
      Retrieves the internal script object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the shape type.  Can be set to one of:  point, linestring, polygon,
@@ -7163,7 +7163,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -7237,7 +7237,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7258,7 +7258,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the sort order to ascending (asc).  Same as calling
@@ -7393,7 +7393,7 @@ declare module elasticjs {
      Retrieves the internal script object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the script sort type.  Valid values are:
@@ -7433,7 +7433,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -7454,7 +7454,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7474,7 +7474,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -7490,7 +7490,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7509,7 +7509,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -7543,7 +7543,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7562,7 +7562,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -7583,7 +7583,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7602,7 +7602,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -7620,7 +7620,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7640,7 +7640,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -7661,7 +7661,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7693,7 +7693,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enables caching of the facetFilter
@@ -7762,7 +7762,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7786,7 +7786,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -7818,7 +7818,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7854,7 +7854,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the text to get suggestions for.  If not set, the global
@@ -7866,7 +7866,7 @@ declare module elasticjs {
      Retrieves the internal suggest object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7888,7 +7888,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -7920,7 +7920,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -7940,7 +7940,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -7994,7 +7994,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -8015,7 +8015,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -8034,7 +8034,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Add a nested aggregation.  This method can be called multiple times
@@ -8134,7 +8134,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the type of the field value for use in scripts.  Current values are:
@@ -8169,7 +8169,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Allows you to return all terms, even if the frequency count is 0. This should not be
@@ -8301,7 +8301,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -8320,7 +8320,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -8416,7 +8416,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -8451,7 +8451,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -8483,7 +8483,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Allows you to return all terms, even if the frequency count is 0. This should not be
@@ -8579,7 +8579,7 @@ declare module elasticjs {
      Retrieves the internal facet object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the field for which statistical information will be generated.
@@ -8612,7 +8612,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the accuracy.  How similar the suggested terms at least
@@ -8716,7 +8716,7 @@ declare module elasticjs {
      Retrieves the internal suggest object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -8740,7 +8740,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -8787,7 +8787,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the child document type to search against
@@ -8810,7 +8810,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Enable or disable caching of the filter
@@ -8858,7 +8858,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the field to operate on.
@@ -8890,7 +8890,7 @@ declare module elasticjs {
      Retrieves the internal agg object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
   }
 
@@ -8915,7 +8915,7 @@ declare module elasticjs {
     /*
      The type of ejs object.  For internal use only.
      */
-    _type(): String;
+    _type(): string;
 
     /*
      Sets the boost value for documents matching the Query.
@@ -8960,7 +8960,7 @@ declare module elasticjs {
      Retrieves the internal query object. This is typically used by
      internal API functions so use with caution.
      */
-    toJSON(): String;
+    toJSON(): any;
 
     /*
      Sets the wildcard query value.
diff --git a/elasticsearch/elasticsearch-tests.ts b/elasticsearch/elasticsearch-tests.ts
index 14070aa8cc..6d308dc6ed 100644
--- a/elasticsearch/elasticsearch-tests.ts
+++ b/elasticsearch/elasticsearch-tests.ts
@@ -45,4 +45,44 @@ client.create({
   index: 'index',
   type: 'type'
 }, (err, repsonse, status) => {
+});
+
+client.cluster.getSettings({
+  masterTimeout: 100
+}, (err, response) => {
+});
+
+client.cluster.health({
+  masterTimeout: 100
+}, (err, response) => {
+});
+
+client.cluster.pendingTasks({
+  ignore: 1
+}, (err, response) => {
+});
+
+client.cluster.putSettings({
+  ignore: 1
+}, (err, response) => {
+});
+
+client.cluster.putSettings({
+  ignore: 1
+}, (err, response) => {
+});
+
+client.cluster.reroute({
+  ignore: 1
+}, (err, response) => {
+});
+
+client.cluster.state({
+  ignore: 1
+}, (err, response) => {
+});
+
+client.cluster.stats({
+  ignore: 1
+}, (err, response) => {
 });
\ No newline at end of file
diff --git a/elasticsearch/elasticsearch.d.ts b/elasticsearch/elasticsearch.d.ts
index ec67e6a59d..e2079b19d0 100644
--- a/elasticsearch/elasticsearch.d.ts
+++ b/elasticsearch/elasticsearch.d.ts
@@ -1,12 +1,14 @@
 // Type definitions for elasticsearch
 // Project: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html
-// Definitions by: Casper Skydt <https://github.com/CasperSkydt/DefinitelyTyped>
+// Definitions by: Casper Skydt <https://github.com/CasperSkydt/DefinitelyTyped>, Blake Smith <https://github.com/bfsmith/DefinitelyTyped>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module Elasticsearch {
     export class Client {
         constructor(params: ConfigOptions);
         indices: Indices;
+        cluster: Cluster;
+        cat: Cat;
         bulk(params: BulkIndexDocumentsParams): PromiseLike<any>;
         bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
         create(params: CreateDocumentParams): PromiseLike<any>;
@@ -230,6 +232,7 @@ declare module Elasticsearch {
         scroll?: string;
         search_type?: string;
         fields?: string[];
+        from?: number;
         size?: number;
         sort?: string | string[] | boolean;
         _source?: string | string[] | boolean;
@@ -333,6 +336,91 @@ declare module Elasticsearch {
         body: string | any;
         index: string | string[] | boolean;
     }
+
+    export interface Cat {
+        health(params: CatHealthOptions, callback: (error: any, response: any) => void): void;
+        health(params: CatHealthOptions): PromiseLike<any>
+    }
+
+    export interface CatHealthOptions extends GenericParams {
+        local?: boolean;
+        masterTimeout?: number | Date;
+        h?: string | string[] | boolean;
+        help?: boolean;
+        ts?: boolean;
+        v?: boolean;
+    }
+
+    export interface Cluster {
+        getSettings(params: ClusterGetSettingsOptions, callback: (error: any, response: any) => void): void;
+        getSettings(params: ClusterGetSettingsOptions): PromiseLike<any>;
+        health(params: ClusterHealthOptions, callback: (error: any, response: any) => void): void;
+        health(params: ClusterHealthOptions): PromiseLike<any>;
+        pendingTasks(params: ClusterPendingTasksOptions, callback: (error: any, response: any) => void): void;
+        pendingTasks(params: ClusterPendingTasksOptions): PromiseLike<any>;
+        putSettings(params: ClusterPutSettingsOptions, callback: (error: any, response: any) => void): void;
+        putSettings(params: ClusterPutSettingsOptions): PromiseLike<any>;
+        reroute(params: ClusterRerouteOptions, callback: (error: any, response: any) => void): void;
+        reroute(params: ClusterRerouteOptions): PromiseLike<any>;
+        state(params: ClusterStateOptions, callback: (error: any, response: any) => void): void;
+        state(params: ClusterStateOptions): PromiseLike<any>;
+        stats(params: ClusterStatsOptions, callback: (error: any, response: any) => void): void;
+        stats(params: ClusterStatsOptions): PromiseLike<any>;
+    }
+
+    export interface ClusterGetSettingsOptions extends GenericParams {
+        flatSettings?: boolean;
+        masterTimeout?: number | Date;
+        timeout?: number | Date;
+    }
+
+    export interface ClusterHealthOptions extends GenericParams {
+        level?: string; // cluster, indices, shards
+        local?: boolean;
+        masterTimeout?: number | Date;
+        waitForActiveShards?: number;
+        waitForNodes?: string;
+        waitForRelocatingShards?: number;
+        waitForStatus?: string; // green, yellow, red
+        index?: string | string[] | boolean;
+    }
+
+    export interface ClusterPendingTasksOptions extends GenericParams {
+        local?: boolean;
+        masterTimeout?: number | Date;
+    }
+
+    export interface ClusterPutSettingsOptions extends GenericParams {
+        flatSettings?: boolean;
+        masterTimeout?: number | Date;
+        timeout?: number | Date;
+    }
+
+    export interface ClusterRerouteOptions extends GenericParams {
+        dryRun?: boolean;
+        explain?: boolean;
+        metric?: string | string[] | boolean;
+        masterTimeout?: number | Date;
+        timeout?: number | Date;
+    }
+
+    export interface ClusterStateOptions extends GenericParams {
+        local?: boolean;
+        masterTimeout?: number | Date;
+        flatSettings?: boolean;
+        ignoreUnavailable?: boolean;
+        allowNoIndices?: boolean;
+        expandWildcards?: string; // open, closed, none, all (default open)
+        index?: string | string[] | boolean;
+        metric?: string | string[] | boolean;
+    }
+
+    export interface ClusterStatsOptions extends GenericParams {
+        flatSettings?: boolean;
+        human?: boolean;
+        timeout?: number | Date;
+        nodeId?: string | string[] | boolean;
+    }
 }
 
 declare module "elasticsearch" {
diff --git a/fabricjs/fabricjs.d.ts b/fabricjs/fabricjs.d.ts
index 727cb57f23..08fcdb6ec3 100644
--- a/fabricjs/fabricjs.d.ts
+++ b/fabricjs/fabricjs.d.ts
@@ -333,7 +333,6 @@ declare namespace fabric {
     on(eventName: {[key:string] : Function}): T;
     /**
      * Fires event with an optional options object
-     * @deprecated `fire` deprecated since 1.0.7 (use `trigger` instead)
      * @param {String} eventName Event name to fire
      * @param {Object} [options] Options object
      */
@@ -341,7 +340,6 @@ declare namespace fabric {
     /**
      * Stops event observing for a particular event handler. Calling this method
      * without arguments removes all handlers for all events
-     * @deprecated `stopObserving` deprecated since 0.8.34 (use `off` instead)
      * @param eventName Event name (eg. 'after:render') or object with key/value pairs (eg. {'after:render': handler, 'selection:cleared': handler})
      * @param handler Function to be deleted from EventListeners
      */
diff --git a/fs-extra/fs-extra.d.ts b/fs-extra/fs-extra.d.ts
index 39656ce685..7061f08746 100644
--- a/fs-extra/fs-extra.d.ts
+++ b/fs-extra/fs-extra.d.ts
@@ -79,8 +79,9 @@ declare module "fs-extra" {
 	export interface CopyOptions {
 		clobber?: boolean
 		preserveTimestamps?: boolean
-        dereference?: boolean
+        	dereference?: boolean
 		filter?: CopyFilter
+        	recursive?: boolean
 	}
 
 	export interface OpenOptions {
diff --git a/fullCalendar/fullCalendar.d.ts b/fullCalendar/fullCalendar.d.ts
index fd43e51c5f..81ce91d119 100644
--- a/fullCalendar/fullCalendar.d.ts
+++ b/fullCalendar/fullCalendar.d.ts
@@ -25,15 +25,17 @@ declare namespace FullCalendar {
         end: moment.Moment;
     }
 
+    export interface Header {
+        left: string;
+        center: string;
+        right: string;
+    }
+
     export interface Options extends AgendaOptions, EventDraggingResizingOptions, DroppingExternalElementsOptions, SelectionOptions {
         // General display - http://fullcalendar.io/docs/display/
 
-        header?: {
-            left: string;
-            center: string;
-            right: string;
-        }
-        theme?: boolean
+        header?: boolean | Header;
+        theme?: boolean;
         buttonIcons?: {
             prev: string;
             next: string;
@@ -50,7 +52,7 @@ declare namespace FullCalendar {
         contentHeight?: number;
         aspectRatio?: number;
         handleWindowResize?: boolean;
-		views?: ViewSpecificOptions;
+        views?: ViewSpecificOptions;
         viewRender?: (view: ViewObject, element: JQuery) => void;
         viewDestroy?: (view: ViewObject, element: JQuery) => void;
         dayRender?: (date: Date, cell: HTMLTableDataCellElement) => void;
diff --git a/geojson2osm/geojson2osm-tests.ts b/geojson2osm/geojson2osm-tests.ts
new file mode 100644
index 0000000000..c7bfc05b85
--- /dev/null
+++ b/geojson2osm/geojson2osm-tests.ts
@@ -0,0 +1,47 @@
+/// <reference path="geojson2osm.d.ts" />
+/// <reference path="../geojson/geojson.d.ts" />
+
+import { geojson2osm } from 'geojson2osm'
+
+const features: GeoJSON.FeatureCollection<any> = {
+    type: 'FeatureCollection',
+    features: [{
+          type: 'Feature',
+          properties: {
+            'building:colour': '#9F8169',
+            'building:levels': 21,
+            building: 'yes',
+            height: 57,
+            },
+      geometry: {
+        type: 'Polygon',
+        coordinates: [
+          [
+            [
+              -434.2249470949173,
+              -13.15996269397843,
+            ],
+            [
+              -434.2249470949173,
+              -13.159751140560356,
+            ],
+            [
+              -434.2242631316185,
+              -13.159751140560356,
+            ],
+            [
+              -434.2242631316185,
+              -13.15996269397843,
+            ],
+            [
+              -434.2249470949173,
+              -13.15996269397843,
+            ],
+          ],
+        ],
+      },
+    },
+  ],
+}
+
+geojson2osm(features)
diff --git a/geojson2osm/geojson2osm.d.ts b/geojson2osm/geojson2osm.d.ts
new file mode 100644
index 0000000000..58393411f1
--- /dev/null
+++ b/geojson2osm/geojson2osm.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for geojson2osm 0.0.5
+// Project: https://github.com/Rub21/geojson2osm
+// Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../geojson/geojson.d.ts" />
+
+declare module 'geojson2osm' {
+    /**
+     * Converts GeoJSON features to OpenStreetMap XML.
+     * @param features Input features
+     * @returns OpenStreetMap XML
+     */
+    export function geojson2osm(features: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): any
+}
diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index bebf0b99c8..966465ed3a 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -240,6 +240,63 @@ app.setUserTasks([
 	}
 ]);
 app.setUserTasks([]);
+
+app.setJumpList([
+	{
+		type: 'custom',
+		name: 'Recent Projects',
+		items: [
+			{ type: 'file', path: 'C:\\Projects\\project1.proj' },
+			{ type: 'file', path: 'C:\\Projects\\project2.proj' }
+		]
+	},
+	{ // has a name so type is assumed to be "custom"
+		name: 'Tools',
+		items: [
+		{
+			type: 'task',
+			title: 'Tool A',
+			program: process.execPath,
+			args: '--run-tool-a',
+			iconPath: process.execPath,
+			iconIndex: 0,
+			description: 'Runs Tool A'
+		},
+		{
+			type: 'task',
+			title: 'Tool B',
+			program: process.execPath,
+			args: '--run-tool-b',
+			iconPath: process.execPath,
+			iconIndex: 0,
+			description: 'Runs Tool B'
+		}]
+	},
+	{
+		type: 'frequent'
+	},
+	{ // has no name and no type so type is assumed to be "tasks"
+		items: [
+		{
+			type: 'task',
+			title: 'New Project',
+			program: process.execPath,
+			args: '--new-project',
+			description: 'Create a new project.'
+		},
+		{
+			type: 'separator'
+		},
+		{
+			type: 'task',
+			title: 'Recover Project',
+			program: process.execPath,
+			args: '--recover-project',
+			description: 'Recover Project'
+		}]
+	}
+]);
+
 if (app.isUnityRunning()) {
 }
 if (app.isAccessibilitySupportEnabled()) {
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index 7d10fce465..3dc72d7075 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron v1.3.4
+// Type definitions for Electron v1.3.5
 // Project: http://electron.atom.io/
 // Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -199,7 +199,7 @@ declare namespace Electron {
 		 * All windows will be closed immediately without asking user
 		 * and the before-quit and will-quit events will not be emitted.
 		 */
-		exit(exitCode: number): void;
+		exit(exitCode?: number): void;
 		/**
 		 * Relaunches the app when current instance exits.
 		 *
@@ -333,6 +333,19 @@ declare namespace Electron {
 		 * Note: This API is only available on Windows.
 		 */
 		setUserTasks(tasks: Task[]): boolean;
+		/**
+		 * Note: This API is only available on Windows.
+		 */
+		getJumpListSettings(): JumpListSettings;
+		/**
+		 * Sets or removes a custom Jump List for the application.
+		 *
+		 * If categories is null the previously set custom Jump List (if any) will be replaced
+		 * by the standard Jump List for the app (managed by Windows).
+		 *
+		 * Note: This API is only available on Windows.
+		 */
+		setJumpList(categories: JumpListCategory[]): SetJumpListResult;
 		/**
 		 * This method makes your application a Single Instance Application instead of allowing
 		 * multiple instances of your app to run, this will ensure that only a single instance
@@ -560,6 +573,89 @@ declare namespace Electron {
 		iconIndex?: number;
 	}
 
+	/**
+	 * ok - Nothing went wrong.
+	 * error - One or more errors occured, enable runtime logging to figure out the likely cause.
+	 * invalidSeparatorError - An attempt was made to add a separator to a custom category in the Jump List.
+	 *                         Separators are only allowed in the standard Tasks category.
+	 * fileTypeRegistrationError - An attempt was made to add a file link to the Jump List
+	 *                             for a file type the app isn't registered to handle.
+	 * customCategoryAccessDeniedError - Custom categories can't be added to the Jump List
+	 *                                   due to user privacy or group policy settings.
+	 */
+	type SetJumpListResult = 'ok' | 'error' | 'invalidSeparatorError' | 'fileTypeRegistrationError' | 'customCategoryAccessDeniedError';
+
+	interface JumpListSettings {
+		/**
+		 * The minimum number of items that will be shown in the Jump List.
+		 */
+		minItems: number;
+		/**
+		 * Items that the user has explicitly removed from custom categories in the Jump List.
+		 */
+		removedItems: JumpListItem[];
+	}
+
+	interface JumpListCategory {
+		/**
+		 * tasks - Items in this category will be placed into the standard Tasks category.
+		 * frequent - Displays a list of files frequently opened by the app, the name of the category and its items are set by Windows.
+		 * recent - Displays a list of files recently opened by the app, the name of the category and its items are set by Windows.
+		 * custom - Displays tasks or file links, name must be set by the app.
+		 */
+		type?: 'tasks' | 'frequent' | 'recent' | 'custom';
+		/**
+		 * Must be set if type is custom, otherwise it should be omitted.
+		 */
+		name?: string;
+		/**
+		 * Array of JumpListItem objects if type is tasks or custom, otherwise it should be omitted.
+		 */
+		items?: JumpListItem[];
+	}
+
+	interface JumpListItem {
+		/**
+		 * task - A task will launch an app with specific arguments.
+		 * separator - Can be used to separate items in the standard Tasks category.
+		 * file - A file link will open a file using the app that created the Jump List.
+		 */
+		type: 'task' | 'separator' | 'file';
+		/**
+		 * Path of the file to open, should only be set if type is file.
+		 */
+		path?: string;
+		/**
+		 * Path of the program to execute, usually you should specify process.execPath which opens the current program.
+		 * Should only be set if type is task.
+		 */
+		program?: string;
+		/**
+		 * The command line arguments when program is executed. Should only be set if type is task.
+		 */
+		args?: string;
+		/**
+		 * The text to be displayed for the item in the Jump List. Should only be set if type is task.
+		 */
+		title?: string;
+		/**
+		 * Description of the task (displayed in a tooltip). Should only be set if type is task.
+		 */
+		description?: string;
+		/**
+		 * The absolute path to an icon to be displayed in a Jump List, which can be an arbitrary
+		 * resource file that contains an icon (e.g. .ico, .exe, .dll).
+		 * You can usually specify process.execPath to show the program icon.
+		 */
+		iconPath?: string;
+		/**
+		 * The index of the icon in the resource file. If a resource file contains multiple icons
+		 * this value can be used to specify the zero-based index of the icon that should be displayed
+		 * for this task. If a resource file contains only one icon, this property should be set to zero.
+		 */
+		iconIndex?: number;
+	}
+
 	interface LoginItemSettings {
 		/**
 		 * True if the app is set to open at login.
@@ -3595,7 +3691,7 @@ declare namespace Electron {
 
 	interface WebContentsStatic {
 		/**
-		 * @returns An array of all web contents. This will contain web contents for all windows,
+		 * @returns An array of all WebContents instances. This will contain web contents for all windows,
 		 * webviews, opened devtools, and devtools extension background pages.
 		 */
 		getAllWebContents(): WebContents[];
@@ -3603,6 +3699,10 @@ declare namespace Electron {
 		 * @returns The web contents that is focused in this application, otherwise returns null.
 		 */
 		getFocusedWebContents(): WebContents;
+		/**
+		 * Find a WebContents instance according to its ID.
+		 */
+		fromId(id: number): WebContents;
 	}
 
 	/**
@@ -4971,6 +5071,17 @@ declare namespace Electron {
 		 * See webContents.sendInputEvent for detailed description of event object.
 		 */
 		sendInputEvent(event: SendInputEvent): void
+		/**
+		 * Changes the zoom factor to the specified factor.
+		 * Zoom factor is zoom percent divided by 100, so 300% = 3.0.
+		 */
+		setZoomFactor(factor: number): void;
+		/**
+		 * Changes the zoom level to the specified level.
+		 * The original size is 0 and each increment above or below represents
+		 * zooming 20% larger or smaller to default limits of 300% and 50% of original size, respectively.
+		 */
+		setZoomLevel(level: number): void;
 		/**
 		 * Shows pop-up dictionary that searches the selected word on the page.
 		 * Note: This API is available only on macOS.
diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
index 97d29bbf04..0aef3b74a6 100644
--- a/googlemaps/google.maps.d.ts
+++ b/googlemaps/google.maps.d.ts
@@ -61,6 +61,7 @@ declare namespace google.maps {
         backgroundColor?: string;
         center?: LatLng|LatLngLiteral;
         disableDefaultUI?: boolean;
+        clickableIcons?: boolean;
         disableDoubleClickZoom?: boolean;
         draggable?: boolean;
         draggableCursor?: string;
@@ -755,7 +756,7 @@ declare namespace google.maps {
         zIndex?: number;
     }
 
-    export interface PolyMouseEvent {
+    export interface PolyMouseEvent extends MouseEvent {
         edge?: number;
         path?: number;
         vertex?: number;
diff --git a/gulp/gulp.d.ts b/gulp/gulp.d.ts
index 74968ddcc5..f4314bd2f2 100644
--- a/gulp/gulp.d.ts
+++ b/gulp/gulp.d.ts
@@ -5,9 +5,11 @@
 
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../orchestrator/orchestrator.d.ts" />
+/// <reference path="../vinyl/vinyl.d.ts" />
 
 declare module "gulp" {
     import Orchestrator = require("orchestrator");
+    import VinylFile = require("vinyl");
 
     namespace gulp {
         interface Gulp extends Orchestrator {
@@ -92,7 +94,7 @@ declare module "gulp" {
              * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
              * @param opt
              */
-            (outFolder: string|((file: string) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
+            (outFolder: string|((file: VinylFile) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
         }
 
         interface SrcMethod {
@@ -149,7 +151,7 @@ declare module "gulp" {
              * Note that an explicit dot in a portion of the pattern will always match dot files.
              */
             dot?: boolean;
-            
+
             /**
              * Set to match only fles, not directories. Set this flag to prevent copying empty directories
              */
diff --git a/heremaps/heremaps.d.ts b/heremaps/heremaps.d.ts
index fe79e55ecf..8d730f3ae5 100644
--- a/heremaps/heremaps.d.ts
+++ b/heremaps/heremaps.d.ts
@@ -1073,6 +1073,125 @@ declare namespace H {
              */
             resizeToCenter(center: H.geo.IPoint, opt_out?: H.geo.Rect): H.geo.Rect;
         }
+
+        /**
+         * A strip is a flat list of latitude, longitude, altitude tuples in a fixed order.
+         */
+        export class Strip {
+          /**
+           * Constructor
+           * @param opt_latLngAlts {Array<number>=} - An optional array of latitude, longitude and altitude triples to initialize the strip with.
+           * @param opt_ctx {H.geo.AltitudeContext=} - An optional altitude context for all altitudes contained in this strip.
+           */
+          constructor(opt_latLngAlts?: Array<number>, opt_ctx?: H.geo.AltitudeContext);
+
+          /**
+           * This method pushes a lat, lng, alt to the end of this strip.
+           * @param lat {H.geo.Latitude}
+           * @param lng {H.geo.Longitude}
+           * @param alt {H.geo.Altitude}
+           */
+          pushLatLngAlt(lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude): void;
+
+          /**
+           * This method splices the strip at the provided index, removing the specified number of items at that index and inserting the lat, lng, alt array.
+           * @param index {number} - The index at which to splice
+           * @param opt_nRemove {number=} - The number of lat, lng, alt values to remove
+           * @param opt_latLngAlts {Array<number>=} - The lat, lng, alt values to add
+           * @returns {Array<number>} - an array of removed elements
+           */
+          spliceLatLngAlts(index: number, opt_nRemove?: number, opt_latLngAlts?: Array<number>): Array<number>;
+
+          /**
+           * This method inserts one set of lat, lng, alt values into the strip at the specified index.
+           * @param index {number} - the index at which to add the element
+           * @param lat {H.geo.Latitude} - the latitude to insert
+           * @param lng {H.geo.Longitude} - the longitude to insert
+           * @param alt {H.geo.Altitude} - the altitude to insert
+           */
+          insertLatLngAlt(index: number, lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude): void;
+
+          /**
+           * This method removes one set of lat, lng, alt values from the strip at the specified index.
+           * @param index {number}
+           */
+          removeLatLngAlt(index: number): void;
+
+          /**
+           * This method pushes the lat, lng, alt values of a H.geo.Point to the end of this strip.
+           * @param geoPoint {H.geo.IPoint}
+           */
+          pushPoint(geoPoint: H.geo.IPoint): void;
+
+          /**
+           * This method inserts the lat, lng, alt values of a H.geo.Point into the list at the specified index.
+           * @param pointIndex {number}
+           * @param geoPoint {H.geo.IPoint}
+           */
+          insertPoint(pointIndex: number, geoPoint: H.geo.IPoint): void;
+
+          /**
+           * This method removes one set of lat, lng, alt values from this strip at the virtual point index specified.
+           * @param pointIndex {number} - the virtual point index
+           */
+          removePoint(pointIndex: number): void;
+
+          /**
+           * This method extracts a H.geo.Point from this strip at the virtual point index. If the extracted point has an alt value, the strip's altitude context will be supplied to the point.
+           * @param pointIndex {number} - the virtual point index in the strip
+           * @param opt_out {H.geo.Point=} - an optional point object to store the lat, lng, alt values
+           * @returns {H.geo.Point} - returns either the 'opt_out' point object or a new point object.
+           */
+          extractPoint(pointIndex: number, opt_out?: H.geo.Point): H.geo.Point;
+
+          /**
+           * This method is a utility method that iterates over the lat, lng, alt array and calls the provided function for each 3 elements passing lat, lng and alt and the virtual point index as arguments.
+           * @param eachFn {function(H.geo.Latitude, H.geo.Longitude, H.geo.Altitude, number)} - the function to be called for each 3 elements
+           * @param opt_start {number=} - an optional start index to iterate from
+           * @param opt_end {number=} - an optional end index to iterate to
+           */
+          eachLatLngAlt(eachFn: (lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude, n: number) => void, opt_start?: number, opt_end?: number): void;
+
+          /**
+           * This method returns the number of times that legs in this strip cross the date border.
+           * @param opt_closed {boolean=} - indicates whether the strip is closed (i.e. whether the strip's last and first coordinates form the closing leg of a polygon)
+           * @returns {number} - the amount of times this strip crosses the date border.
+           */
+          getDBCs(opt_closed?: boolean): number;
+
+          /**
+           * This method return the number of points stored in this strip.
+           * @returns {number} - the number of points in this strip
+           */
+          getPointCount(): number;
+
+          /**
+           * This method returns the internal array keeping the lat, lng, alt values. Modifying this array directly can destroy the integrity of this strip. Use it only for read access.
+           * @returns {Array<number>} - returns the raw lat, lng, alt values of this strip
+           */
+          getLatLngAltArray(): Array<number>;
+
+          /**
+           * This method returns the bounding box of this strip.
+           * @returns {?H.geo.Rect} - this strip's bounding rectangle
+           */
+          getBounds(): H.geo.Rect;
+
+          /**
+           * This method checks whether two longitudes form a leg which crosses the date border.
+           * @param lng1 {H.geo.Longitude} - the start longitude of the leg
+           * @param lng2 {H.geo.Longitude} - the end longitude of the leg
+           * @returns {boolean} - true if the leg crosses the date border, otherwise false
+           */
+          static isDBC(lng1: H.geo.Longitude, lng2: H.geo.Longitude): boolean;
+
+          /**
+           * This method initializes a new strip with an array of lat, lng values. Arrays are expected to have an even length with the format [lat, lng, lat, lng, ...].
+           * @param latLngs {Array<number>} - the array of lat, lng value.
+           * @returns {H.geo.Strip} - the strip containing the lat, lng values
+           */
+          static fromLatLngArray(latLngs: Array<number>): H.geo.Strip;
+        }
     }
 
     /***** lang *****/
@@ -1173,6 +1292,78 @@ declare namespace H {
             }
         }
 
+        /**
+         * A Polygon with a circular shape.
+         */
+        export class Circle extends H.map.Polygon {
+          /**
+           * Constructor
+           * @param center {H.geo.IPoint} - The geographical coordinates of the circle's center
+           * @param radius {number} - The radius of the circle in meters
+           * @param opt_options {H.map.Circle.Options=} - An object that specifies circle options and their initial values (among these, precision has a significant impact on the shape of the circle - please see
+           */
+          constructor(center: H.geo.IPoint, radius: number, opt_options?: H.map.Circle.Options);
+
+          /**
+           * To set the geographical center point of this circle. If the specified center is an instance of H.geo.Point you must not modify this Point instance without calling setCenter immediately afterwards.
+           * @param center {H.geo.IPoint}
+           */
+          setCenter(center: H.geo.IPoint): void;
+
+          /**
+           * To get the center point of this circle You must not modify the returned Point instance without calling setCenter immediately afterwards.
+           * @returns {H.geo.Point}
+           */
+          getCenter(): H.geo.Point;
+
+          /**
+           * To set the length of the radius of the circle in meters. The value is clamped to the of {@code[0 ... 20015089.27787877]} (half WGS84 mean circumference)
+           * @param radius {number}
+           */
+          setRadius(radius: number): void;
+
+          /**
+           * To get the length of the radius of the circle in meters.
+           * @returns {number}
+           */
+          getRadius(): number;
+
+          /**
+           * To set the precision of this circle {@see H.map.Circle.Options#precision}
+           * @param precision {number}
+           */
+          setPrecision(precision: number): void;
+
+          /**
+           * To get the precision value of this circle
+           * @returns {number}
+           */
+          getPrecision(): number;
+        }
+
+        export module Circle {
+          /**
+           * @property style {H.map.SpatialStyle=} - the style to be used when tracing the polyline
+           * @property visibility {boolean=} - An optional boolean value indicating whether this map object is visible, default is true
+           * @property precision {number=} - The precision of a circle as a number of segments to be used when rendering the circle. The value is clamped to the range between [4 ... 360], where 60 is the default. Note that the lower the value the more angular and the less circle-like the shape appears and, conversely, the higher the value the smoother and more rounded the result. Thus, starting at the extreme low end of the possible values, 4 produces a square, 6 a hexagon, while 30 results in a circle-like shape, although it appears increasingly angular as the zoom level increases (as you zoom in), and finally 360 produces a smooth circle.
+           * @property zIndex {number=} - The z-index value of the circle, default is 0
+           * @property min {number=} - The minimum zoom level for which the circle is visible, default is -Infinity
+           * @property max {number=} - The maximum zoom level for which the circle is visible, default is Infinity
+           * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+           * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData
+           */
+          export interface Options {
+            style?: H.map.SpatialStyle | H.map.SpatialStyle.Options;
+            visibility?: boolean;
+            precision?: number;
+            zIndex?: number;
+            min?: number;
+            max?: number;
+            provider?: H.map.provider.Provider;
+            data?: any;
+          }
+        }
+
         /**
          * The class represents data model of the map. It holds list of layers that are rendered by map's RenderEngine. The class listens to 'update' events from layers and dispatches them to the RenderEngine.
          */
@@ -1242,6 +1433,38 @@ declare namespace H {
             }
         }
 
+        /**
+         * This class represents a spatial shape in geographic space. It is defined by a path containing the vertices of the shape (lat, lng, alt values).
+         */
+        export class GeoShape extends H.map.Spatial {
+          /**
+           * Constructor
+           * @param isClosed {boolean} - Indicates whether this geographical shape is closed (a polygon)
+           * @param strip {H.geo.Strip} - The strip describing the shape of the spatial object
+           * @param options {H.map.Spatial.Options} - The options to apply
+           */
+          constructor(isClosed: boolean, strip: H.geo.Strip, options: H.map.Spatial.Options);
+
+          /**
+           * This method returns the strip which represents the shape of the spatial object.
+           * @returns {H.geo.Strip} - the strip
+           */
+          getStrip(): H.geo.Strip;
+
+          /**
+           * This method sets the geo-information for the spatial object
+           * @param strip {?H.geo.Strip} - The strip which represents the shape of the spatial object.
+           * @returns {H.map.GeoShape} - the Spatial instance itself
+           */
+          setStrip(strip: H.geo.Strip): H.map.GeoShape;
+
+          /**
+           * This method returns the bounding rectangle for this object. The rectangle is the smallest rectangle which encloses all points of the spatial object.
+           * @returns {H.geo.Rect}
+           */
+          getBounds(): H.geo.Rect;
+        }
+
         /**
          * This class represents a map object which can contain other map objects. It's visibility, zIndex and object-order influences the contained map objects
          */
@@ -1855,6 +2078,92 @@ declare namespace H {
             }
         }
 
+        /**
+         * This class represents a polygon in geo-space. It is defined by a strip containing the vertices of a geo shape object (lat, lng, alt values) and a pen to use when rendering the polyline. Polygon represents a closed plane defined by the list of verticies, projected on the map display. List of vericies which define the polygon are is a list of geo coordinates encapsulated by the strip object H.geo.Strip
+         */
+        export class Polygon extends H.map.GeoShape {
+          /**
+           * Constructor
+           * @param strip {H.geo.Strip} - the strip describing this polygon's vertices
+           * @param opt_options {H.map.Spatial.Options=} - optional initialization parameters
+           */
+          constructor(strip: H.geo.Strip, opt_options?: H.map.Spatial.Options);
+
+          /**
+           * To set the indicator whether this polygon covers the north pole. It's needed for Polygons whose strip is defined as lines arround the world on longitude axis (for example a circle whose center is one of the poles). In this case a additional information is needed to know if the southern or northern part of the world should be covered by the poygon.
+           * @param flag {boolean} - A value of true means it covers the north pole, false means south pole
+           * @returns {H.map.Polygon} - the Polygon instance itself
+           */
+          setNorthPoleCovering(flag: boolean): H.map.Polygon;
+
+          /**
+           * See H.map.Polygon#setNorthPoleCovering
+           * @returns {boolean}
+           */
+          getNorthPoleCovering(): boolean;
+        }
+
+        /**
+         * This class represents a polyline in geo-space. It is defined by a path containing the vertices of a polyline (lat, lng, alt values) and a pen to use when tracing the path on the map.
+         */
+        export class Polyline extends H.map.GeoShape {
+          /**
+           * Constructor
+           * @param strip {H.geo.Strip} - the strip describing this polygon's vertices
+           * @param opt_options {H.map.Polyline.Options=} - optional initialization parameters
+           */
+          constructor(strip: H.geo.Strip, opt_options?: H.map.Polyline.Options);
+
+          /**
+           * This method clips this polyline against a rectangular area and returns the intersecting sub-lines.
+           * @param geoRect {H.geo.Rect}
+           * @returns {Array<Array<number>>}
+           */
+          clip(geoRect: H.geo.Rect): Array<Array<number>>;
+        }
+
+        export module Polyline {
+          /**
+           * Options which are used to initialize a polyline
+           * @property style {(H.map.SpatialStyle | H.map.SpatialStyle.Options)=} - the style to be used when tracing the polyline
+           * @property arrows {(H.map.ArrowStyle | H.map.ArrowStyle.Options)=} - The arrows style to be used when rendering the polyline.
+           * @property visibility {boolean=} - An optional boolean value indicating whether this map object is visible, default is true
+           * @property zIndex {number=} - The z-index value of the map object, default is 0
+           * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
+           * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
+           * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+           * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData
+           */
+          export interface Options {
+            style?: (H.map.SpatialStyle | H.map.SpatialStyle.Options);
+            arrows?: (H.map.ArrowStyle | H.map.ArrowStyle.Options);
+            visibility?: boolean;
+            zIndex?: number;
+            min?: number;
+            max?: number;
+            provider?: H.map.provider.Provider;
+            data?: any;
+          }
+        }
+
+        /**
+         * A Polygon with a rectangular shape.
+         */
+        export class Rect extends H.map.Polygon {
+          /**
+           * Constructor
+           * @param bounds {H.geo.Rect} - The geographical bounding box for this rectangle
+           * @param opt_options {H.map.Spatial.Options=}
+           */
+          constructor(bounds: H.geo.Rect, opt_options?: H.map.Spatial.Options);
+
+          /**
+           * To set the bounds of this rectangle.
+           * @param bounds {H.geo.Rect}
+           */
+          setBounds(bounds: H.geo.Rect): void;
+        }
+
         /**
          * This class represents a spatial map object which provides its projected geometry.
          */
@@ -1985,8 +2294,8 @@ declare namespace H {
             miterLimit: number;
             lineDash: Array<number>;
             lineDashOffset: number;
-            MAX_LINE_WIDTH: number;
-            DEFAULT_STYLE: H.map.SpatialStyle;
+            static MAX_LINE_WIDTH: number;
+            static DEFAULT_STYLE: H.map.SpatialStyle;
         }
 
         export module SpatialStyle {
@@ -2018,7 +2327,7 @@ declare namespace H {
                 lineCap?: H.map.SpatialStyle.LineCap;
                 lineJoin?: H.map.SpatialStyle.LineJoin;
                 miterLimit?: number;
-                lineDash: Array<number>;
+                lineDash?: Array<number>;
                 lineDashOffset?: number;
             }
         }
diff --git a/humps/humps-tests.ts b/humps/humps-tests.ts
new file mode 100644
index 0000000000..66017b065c
--- /dev/null
+++ b/humps/humps-tests.ts
@@ -0,0 +1,71 @@
+/// <reference path="humps.d.ts" />
+
+// Tests evaluated from:
+// https://github.com/domchristie/humps/blob/master/README.md
+
+import * as humps from "humps";
+
+let someObject = { attr_one: 'foo', attr_two: 'bar' };
+let someArray = [{ attr_one: 'foo' }, { attr_one: 'bar' }]
+
+let someOptions: humps.HumpsOptions = {
+	separator: '-'
+};
+let someOptions2: humps.HumpsOptions = {
+	split: /^[A-Z0-9_]+$/
+};
+let someOptions3: humps.HumpsOptions = {
+	separator: '-',
+	process: function (key: string, convert: humps.HumpsProcessorParameter, options: humps.HumpsOptions) {
+		return /^[A-Z0-9_]+$/.test(key) ? key : convert(key, options);
+	}
+};
+
+
+humps.camelize('hello_world')
+
+humps.decamelize('fooBar')
+humps.decamelize('fooBarBaz', someOptions)
+
+humps.camelizeKeys(someObject);
+
+humps.camelizeKeys(someArray);
+
+humps.camelizeKeys(someObject, function (key, convert) {
+  return /^[A-Z0-9_]+$/.test(key) ? key : convert(key);
+});
+
+humps.decamelizeKeys(someObject, function (key, convert, options) {
+  return /^[A-Z0-9_]+$/.test(key) ? key : convert(key, options);
+});
+
+
+humps.camelize('hello_world-foo bar');
+
+humps.pascalize('hello_world-foo bar');
+
+humps.decamelize('helloWorldFooBar');
+humps.decamelize('helloWorldFooBar', someOptions);
+humps.decamelize('helloWorld1', { split: /(?=[A-Z0-9])/ })
+
+humps.depascalize('helloWorldFooBar');
+
+humps.camelizeKeys(someObject);
+humps.pascalizeKeys(someObject);
+humps.decamelizeKeys(someObject);
+humps.depascalizeKeys(someObject);
+
+humps.camelizeKeys(someObject, someOptions);
+humps.pascalizeKeys(someObject, someOptions);
+humps.decamelizeKeys(someObject, someOptions);
+humps.depascalizeKeys(someObject, someOptions);
+
+humps.camelizeKeys(someObject, someOptions2);
+humps.pascalizeKeys(someObject, someOptions2);
+humps.decamelizeKeys(someObject, someOptions2);
+humps.depascalizeKeys(someObject, someOptions2);
+
+humps.camelizeKeys(someObject, someOptions3);
+humps.pascalizeKeys(someObject, someOptions3);
+humps.decamelizeKeys(someObject, someOptions3);
+humps.depascalizeKeys(someObject, someOptions3);
diff --git a/humps/humps.d.ts b/humps/humps.d.ts
new file mode 100644
index 0000000000..87f3bbd991
--- /dev/null
+++ b/humps/humps.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for humps v1.1.0
+// Project: https://github.com/domchristie/humps
+// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace humps {
+
+	function camelize(value: string): string;
+	function pascalize(value: string): string;
+	function decamelize(value: string, optionsOrProcessor?: OptionOrProcessor): string;
+	function depascalize(value: string, optionsOrProcessor?: OptionOrProcessor): string;
+
+	function camelizeKeys(str: Object, optionsOrProcessor?: OptionOrProcessor): Object;
+	function pascalizeKeys(str: Object, optionsOrProcessor?: OptionOrProcessor): Object;
+	function decamelizeKeys(str: Object, optionsOrProcessor?: OptionOrProcessor): Object;
+	function depascalizeKeys(str: Object, optionsOrProcessor?: OptionOrProcessor): Object;
+
+	function camelizeKeys(str: Object[], optionsOrProcessor?: OptionOrProcessor): Object[];
+	function pascalizeKeys(str: Object[], optionsOrProcessor?: OptionOrProcessor): Object[];
+	function decamelizeKeys(str: Object[], optionsOrProcessor?: OptionOrProcessor): Object[];
+	function depascalizeKeys(str: Object[], optionsOrProcessor?: OptionOrProcessor): Object[];
+
+	interface HumpsOptions {
+		separator?: string;
+		split?: RegExp;
+		process?: HumpsProcessor;
+	}
+	interface HumpsProcessor {
+		(key: string, convert: HumpsProcessorParameter, options?: HumpsOptions): string;
+	}
+	interface HumpsProcessorParameter {
+		(key: string, options?: HumpsOptions): string;
+	}
+	type OptionOrProcessor = HumpsOptions | HumpsProcessor;
+}
+
+declare module "humps" {
+	export = humps;
+}
diff --git a/incremental-dom/incremental-dom.d.ts b/incremental-dom/incremental-dom.d.ts
index 56fd84542f..5a80e82d70 100644
--- a/incremental-dom/incremental-dom.d.ts
+++ b/incremental-dom/incremental-dom.d.ts
@@ -27,7 +27,7 @@ declare module "incremental-dom" {
      * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
      *     for the Element.
      */
-    export var elementOpen: (tag: string, key?: string, statics?: any[], ...var_args: any[]) => void;
+    export var elementOpen: (tag: string, key?: string, statics?: any[], ...var_args: any[]) => HTMLElement;
     /**
      * Declares a virtual Element at the current location in the document. This
      * corresponds to an opening tag and a elementClose tag is required. This is
@@ -54,11 +54,11 @@ declare module "incremental-dom" {
     /**
      * Closes an open tag started with elementOpenStart.
      */
-    export var elementOpenEnd: () => void;
+    export var elementOpenEnd: () => HTMLElement;
     /**
      * Closes an open virtual Element.
      */
-    export var elementClose: (tag: string) => void;
+    export var elementClose: (tag: string) => HTMLElement;
     /**
      * Declares a virtual Element at the current location in the document that has
      * no children.
@@ -72,11 +72,11 @@ declare module "incremental-dom" {
      * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
      *     for the Element.
      */
-    export var elementVoid: (tag: string, key?: string, statics?: any, ...var_args: any[]) => void;
+    export var elementVoid: (tag: string, key?: string, statics?: any, ...var_args: any[]) => HTMLElement;
     /**
      * Declares a virtual Text at this point in the document.
      *
      * @param {string} value The text of the Text.
      */
-    export var text: (value: string) => void;
+    export var text: (value: string) => Text;
 }
diff --git a/ionic/ionic-tests.ts b/ionic/ionic-tests.ts
index d8c98ae25f..140d102a8c 100644
--- a/ionic/ionic-tests.ts
+++ b/ionic/ionic-tests.ts
@@ -176,6 +176,7 @@ class IonicTestController {
         var currentStateName: string = this.$ionicHistory.currentStateName();
 
         this.$ionicHistory.goBack(5);
+        this.$ionicHistory.removeBackView();
         this.$ionicHistory.clearHistory();
         this.$ionicHistory.clearCache().then(() => console.log("done clearing cache!"));
         this.$ionicHistory.nextViewOptions({
diff --git a/ionic/ionic.d.ts b/ionic/ionic.d.ts
index fae9cdbf63..1df593037b 100644
--- a/ionic/ionic.d.ts
+++ b/ionic/ionic.d.ts
@@ -213,6 +213,7 @@ declare namespace ionic {
             currentStateName(): string;
 
             goBack(backCount?: number): void;
+            removeBackView(): void;
             clearHistory(): void;
             clearCache(): angular.IPromise<any>;
             nextViewOptions(options: IonicHistoryNextViewOptions): void;
diff --git a/ioredis/ioredis.d.ts b/ioredis/ioredis.d.ts
index 983ed39f10..60eccd0272 100644
--- a/ioredis/ioredis.d.ts
+++ b/ioredis/ioredis.d.ts
@@ -197,6 +197,8 @@ declare module IORedis {
         hmget(...args: any[]): any;
         hincrby(args: any[], callback?: ResCallbackT<any>): any;
         hincrby(...args: any[]): any;
+        hincrbyfloat(args: any[], callback?: ResCallbackT<any>): any;
+        hincrbyfloat(...args: any[]): any;
         hdel(args: any[], callback?: ResCallbackT<any>): any;
         hdel(...args: any[]): any;
         hlen(args: any[], callback?: ResCallbackT<any>): any;
@@ -478,6 +480,8 @@ declare module IORedis {
         hmget(...args: any[]): Pipeline;
         hincrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
         hincrby(...args: any[]): Pipeline;
+        hincrbyfloat(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hincrbyfloat(...args: any[]): Pipeline;
         hdel(args: any[], callback?: ResCallbackT<any>): Pipeline;
         hdel(...args: any[]): Pipeline;
         hlen(args: any[], callback?: ResCallbackT<any>): Pipeline;
diff --git a/is-plain-object/is-plain-object-tests.ts b/is-plain-object/is-plain-object-tests.ts
new file mode 100644
index 0000000000..eb57b12434
--- /dev/null
+++ b/is-plain-object/is-plain-object-tests.ts
@@ -0,0 +1,25 @@
+/// <reference path="is-plain-object.d.ts" />
+
+import * as isPlainObject from 'is-plain-object';
+
+isPlainObject(Object.create({}));
+//=> true
+isPlainObject(Object.create(Object.prototype));
+//=> true
+isPlainObject({foo: 'bar'});
+//=> true
+isPlainObject({});
+
+isPlainObject(1);
+//=> false
+isPlainObject(['foo', 'bar']);
+//=> false
+isPlainObject([]);
+//=> false
+class Foo {}
+isPlainObject(new Foo);
+//=> false
+isPlainObject(null);
+//=> false
+isPlainObject(Object.create(null));
+//=> false
\ No newline at end of file
diff --git a/is-plain-object/is-plain-object.d.ts b/is-plain-object/is-plain-object.d.ts
new file mode 100644
index 0000000000..47d277f186
--- /dev/null
+++ b/is-plain-object/is-plain-object.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for is-plain-object
+// Project: https://github.com/jonschlinkert/is-plain-object
+// Definitions by: Kevin Zeng <https://github.com/zengfenfei/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "is-plain-object" {
+    namespace isPlainObject {}
+    function isPlainObject(obj: any): boolean;
+    export = isPlainObject;
+}
\ No newline at end of file
diff --git a/jest/jest.d.ts b/jest/jest.d.ts
index 10949a6691..b2484dfcc5 100644
--- a/jest/jest.d.ts
+++ b/jest/jest.d.ts
@@ -44,6 +44,7 @@ declare namespace jest {
     interface Matchers {
         not: Matchers;
         toThrow(expected?: any): boolean;
+        toThrowError(expected?: any): boolean;
         toBe(expected: any): boolean;
         toEqual(expected: any): boolean;
         toBeFalsy(): boolean;
diff --git a/joi/joi-tests.ts b/joi/joi-tests.ts
index 37848203df..c75309b45e 100644
--- a/joi/joi-tests.ts
+++ b/joi/joi-tests.ts
@@ -752,6 +752,10 @@ schema = Joi.alternatives(schema, anySchema, boolSchema);
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
+schema = Joi.lazy(() => schema)
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
 Joi.validate(value, obj);
 Joi.validate(value, schema);
 Joi.validate(value, schema, validOpts);
diff --git a/joi/joi.d.ts b/joi/joi.d.ts
index 3ba51d7383..b827903f9b 100644
--- a/joi/joi.d.ts
+++ b/joi/joi.d.ts
@@ -816,6 +816,13 @@ declare module 'joi' {
 	export function alternatives(): AlternativesSchema;
 	export function alternatives(types: Schema[]): AlternativesSchema;
 	export function alternatives(type1: Schema, type2: Schema, ...types: Schema[]): AlternativesSchema;
+	
+	/**
+	 * Generates a placeholder schema for a schema that you would provide with the fn.
+	 * Supports the same methods of the any() type.
+	 * This is mostly useful for recursive schemas
+	 */
+	export function lazy(cb: () => Schema): Schema;
 
 	/**
 	 * Validates a value using the given schema and options.
diff --git a/jquery-mockjax/jquery-mockjax-tests.ts b/jquery-mockjax/jquery-mockjax-tests.ts
index 6fae52eb07..36ebd7e64c 100644
--- a/jquery-mockjax/jquery-mockjax-tests.ts
+++ b/jquery-mockjax/jquery-mockjax-tests.ts
@@ -9,7 +9,7 @@ class Tests {
     run(): void {
         const self = this;
 
-        var t = QUnit.test;
+        let t = QUnit.test;
 
         QUnit.begin(() => {
 
@@ -36,7 +36,7 @@ class Tests {
                 responseText: 'Hello Word'
             });
 
-            var xhr = $.ajax({
+            let xhr = $.ajax({
                 url: '/xmlhttprequest',
                 complete: () => { }
             });
@@ -67,7 +67,7 @@ class Tests {
         });
 
         t('Intercept asynchronized proxy calls', (assert) => {
-            var done = assert.async();
+            let done = assert.async();
             $.mockjax({
                 url: '/proxy',
                 proxy: 'test_proxy.json'
@@ -85,7 +85,7 @@ class Tests {
         });
 
         t('Intercept and proxy (sub-ajax request)', (assert) => {
-            var done = assert.async();
+            let done = assert.async();
 
             $.mockjax({
                 url: '/proxy',
@@ -104,7 +104,7 @@ class Tests {
         });
 
         t('Proxy type specification', (assert) => {
-            var done = assert.async();
+            let done = assert.async();
 
             $.mockjax({
                 url: '/proxy',
@@ -124,7 +124,7 @@ class Tests {
         });
 
         t('Support 1.5 $.ajax(url, settings) signature.', (assert) => {
-            var done = assert.async();
+            let done = assert.async();
 
             $.mockjax({
                 url: '/resource',
@@ -141,9 +141,9 @@ class Tests {
         });
 
         t('Dynamic response callback', (assert) => {
-            var done = assert.async();
+            let done = assert.async();
 
-            var settings: MockJaxSettings = {
+            let settings: MockJaxSettings = {
                 url: '/response-callback',
                 response: (settings) => {
                     settings.responseText = settings.data.response + ' 2';
@@ -165,8 +165,36 @@ class Tests {
                 }
             });
         });
+
+        t('Asyncronous response callback', (assert) => {
+            let done = assert.async();
+
+            let settings: MockJaxSettings = {
+                url: '/async-response-callback',
+                response: (settings, completed) => {
+                    setTimeout(() => {
+                        settings.responseText = settings.data.response + ' 3';
+                        completed();
+                    }, 10);
+                }
+            };
+
+            $.mockjax(settings);
+
+            $.ajax({
+                url: '/async-response-callback',
+                dataType: 'text',
+                data: {
+                    response: 'Hello world'
+                },
+                error: self._noErrorCallbackExpected,
+                complete: (xhr) => {
+                    assert.equal(xhr.responseText, 'Hello world 3', 'Response Text matches');
+                    done();
+                }
+            });
+        });
     }
 }
 
-var tests = new Tests();
-tests.run();
+new Tests().run();
diff --git a/jquery-mockjax/jquery-mockjax.d.ts b/jquery-mockjax/jquery-mockjax.d.ts
index 7505a30e6f..c054f33317 100644
--- a/jquery-mockjax/jquery-mockjax.d.ts
+++ b/jquery-mockjax/jquery-mockjax.d.ts
@@ -22,7 +22,7 @@ interface MockJaxSettings {
     isTimeout?: boolean;
     dataType?: string;
     contentType?: string;
-    response?: (settings: any) => void;
+    response?: (settings: any, done?: Function) => void;
     responseText?: string | Object;
     responseXml?: string;
     proxy?: string;
diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index 0f72c709cf..b08598cc53 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -2780,8 +2780,9 @@ interface JQuery {
 
     /**
      * Retrieve all the elements contained in the jQuery set, as an array.
+     * @name toArray
      */
-    toArray(): any[];
+    toArray(): HTMLElement[];
 
     /**
      * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
@@ -2837,8 +2838,9 @@ interface JQuery {
     get(index: number): HTMLElement;
     /**
      * Retrieve the elements matched by the jQuery object.
+     * @alias toArray
      */
-    get(): any[];
+    get(): HTMLElement[];
 
     /**
      * Search for a given element from among the matched elements.
diff --git a/js-data-http/js-data-http-tests.ts b/js-data-http/js-data-http-tests.ts
index 390e20aa9e..9f0c4c3169 100644
--- a/js-data-http/js-data-http-tests.ts
+++ b/js-data-http/js-data-http-tests.ts
@@ -1,9 +1,15 @@
+/// <reference path="./../axios/axios.d.ts" />
 /// <reference path="js-data-http.d.ts" />
 
+import * as axios from 'axios';
+
 var adapter = new DSHttpAdapter();
 var store = new JSData.DS();
 store.registerAdapter('http', adapter, { default: true });
 
+adapter.defaults.basePath = '/api';
+adapter.http = axios;
+
 var ADocument:JSData.DSResourceDefinition<any> = store.defineResource<any>('document');
 
 ADocument.inject({ id: 5, author: 'John' });
diff --git a/js-data-http/js-data-http.d.ts b/js-data-http/js-data-http.d.ts
index cde3b4a2e1..04d07f5a38 100644
--- a/js-data-http/js-data-http.d.ts
+++ b/js-data-http/js-data-http.d.ts
@@ -15,6 +15,8 @@ declare namespace JSData {
         forceTrailingSlash?: boolean;
         log?: boolean | ((message?:any, ...optionalParams:any[])=> void);
         error?: boolean | ((message?:any, ...optionalParams:any[])=> void);
+        basePath?: string;
+        verbsUseBasePath?: string;
     }
 
     interface DSHttpAdapterPromiseResolveType {
@@ -28,6 +30,9 @@ declare namespace JSData {
 
         new(options?:DSHttpAdapterOptions):DSHttpAdapter;
 
+        defaults: DSHttpAdapterOptions;
+        http: any;
+
         // DSHttpAdapter uses axios so options are axios config objects.
         HTTP(options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
         DEL(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
diff --git a/js-data/js-data-tests.ts b/js-data/js-data-tests.ts
index 7c66952162..9bbbfdfd64 100644
--- a/js-data/js-data-tests.ts
+++ b/js-data/js-data-tests.ts
@@ -600,3 +600,5 @@ customActionResource.emit("DS.change", customActionResource, customActionResourc
 customActionResourceInstance.on("DS.change", myEvtHandler);
 customActionResourceInstance.off("DS.change", myEvtHandler);
 customActionResourceInstance.emit("DS.change", customActionResource, customActionResourceInstance);
+
+JSData.DSUtils.Promise = Promise;
\ No newline at end of file
diff --git a/js-data/js-data.d.ts b/js-data/js-data.d.ts
index f7fc785c82..58bef671b1 100644
--- a/js-data/js-data.d.ts
+++ b/js-data/js-data.d.ts
@@ -342,6 +342,7 @@ declare namespace JSData {
 declare var JSData:{
     DS: JSData.DS;
     DSErrors: JSData.DSErrors;
+    DSUtils: any;
 };
 
 //Support node require
diff --git a/jsdom/jsdom.d.ts b/jsdom/jsdom.d.ts
index c6ebde2ce3..2efebc059f 100644
--- a/jsdom/jsdom.d.ts
+++ b/jsdom/jsdom.d.ts
@@ -68,6 +68,7 @@ declare module "jsdom" {
 	export function createCookieJar(): CookieJar;
 	export function nodeLocation(node: Node): any;
 	export function reconfigureWindow(window: Window, newProps: WindowProperties): void;
+	export function changeURL(window: Window, url: string): void;
 	
 	export function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
 	
diff --git a/jsts/jsts-tests.ts b/jsts/jsts-tests.ts
index 3b37d0f185..e9c00fd52a 100644
--- a/jsts/jsts-tests.ts
+++ b/jsts/jsts-tests.ts
@@ -1,4 +1,7 @@
 /// <reference path="jsts.d.ts" />
+
+import * as jsts from 'jsts';
+
 var str: string;
 var n: number;
 var bool: boolean;
@@ -142,4 +145,4 @@ obj = gjw.write(g);
 
 var wr: jsts.io.WKTReader = new jsts.io.WKTReader();
 g = wr.read(str);
-wr.reducePrecision(g);
\ No newline at end of file
+wr.reducePrecision(g);
diff --git a/jsts/jsts.d.ts b/jsts/jsts.d.ts
index 909dbbf7a1..f06b5c7f51 100644
--- a/jsts/jsts.d.ts
+++ b/jsts/jsts.d.ts
@@ -1664,3 +1664,7 @@ declare namespace jsts {
         }
     }
 }
+
+declare module "jsts" {
+    export = jsts;
+}
diff --git a/knockout/knockout.d.ts b/knockout/knockout.d.ts
index 6321cff0a5..f0e9fe023f 100644
--- a/knockout/knockout.d.ts
+++ b/knockout/knockout.d.ts
@@ -61,8 +61,10 @@ interface KnockoutSubscription {
 }
 
 interface KnockoutSubscribable<T> extends KnockoutSubscribableFunctions<T> {
-	subscribe(callback: (newValue: T) => void, target?: any, event?: string): KnockoutSubscription;
+    subscribe(callback: (newValue: T) => void, target: any, event: "beforeChange"): KnockoutSubscription;
+	subscribe(callback: (newValue: T) => void, target?: any, event?: "change"): KnockoutSubscription;
 	subscribe<TEvent>(callback: (newValue: TEvent) => void, target: any, event: string): KnockoutSubscription;
+
 	extend(requestedExtenders: { [key: string]: any; }): KnockoutSubscribable<T>;
 	getSubscriptionsCount(): number;
 }
@@ -91,6 +93,11 @@ interface KnockoutObservableArrayStatic {
 }
 
 interface KnockoutObservableArray<T> extends KnockoutObservable<T[]>, KnockoutObservableArrayFunctions<T> {
+    subscribe(callback: (newValue: KnockoutArrayChange<T>[]) => void, target: any, event: "arrayChange"): KnockoutSubscription;
+    subscribe(callback: (newValue: T[]) => void, target: any, event: "beforeChange"): KnockoutSubscription;
+    subscribe(callback: (newValue: T[]) => void, target?: any, event?: "change"): KnockoutSubscription;
+    subscribe<TEvent>(callback: (newValue: TEvent) => void, target: any, event: string): KnockoutSubscription;
+
     extend(requestedExtenders: { [key: string]: any; }): KnockoutObservableArray<T>;
 }
 
@@ -325,7 +332,7 @@ interface KnockoutUtils {
 }
 
 interface KnockoutArrayChange<T> {
-    status: string;
+    status: "added" | "deleted";
     value: T;
     index: number;
     moved?: number;
diff --git a/knockout/knockoutamd-tests.ts b/knockout/knockoutamd-tests.ts
index c874c6208b..9ee6658335 100644
--- a/knockout/knockoutamd-tests.ts
+++ b/knockout/knockoutamd-tests.ts
@@ -1,6 +1,6 @@
 /// <reference path="./knockout.d.ts" />
 
-import ko = require("knockout");
+import ko = require("knockout");
 
 var myArray = ko.observableArray([1, 2, 3]);
 
diff --git a/knockout/tests/knockout-tests.ts b/knockout/tests/knockout-tests.ts
index 8da6c12950..122617b180 100644
--- a/knockout/tests/knockout-tests.ts
+++ b/knockout/tests/knockout-tests.ts
@@ -680,3 +680,38 @@ function test_tasks() {
         setTimeout(callback, 0);
     };
 }
+
+function observableEventsTests() {
+    var observable = ko.observable(1);
+    observable.subscribe(value => {
+        var num: number = value;
+    });
+    observable.subscribe(value => {
+        var num: number = value;
+    }, null, "change");
+    observable.subscribe(value => {
+        var num: number = value;
+    }, null, "beforeChange");
+}
+
+function observableArrayEventsTests() {
+    var observableArray = ko.observableArray([1, 2, 3, 4]);
+    observableArray.subscribe(array => {
+        var arr: number[] = array;
+    });
+    observableArray.subscribe(array => {
+        var arr: number[] = array;
+    }, null, "change");
+    observableArray.subscribe(array => {
+        var arr: number[] = array;
+    }, null, "beforeChange");
+    var count = 0;
+    observableArray.subscribe(changes => {
+        changes.forEach(change => {
+            if (change.status == "added")
+                count++;
+            else if (change.status == "deleted")
+                count--;
+        });
+    }, null, "arrayChange");
+}
\ No newline at end of file
diff --git a/koa-compress/koa-compress.d.ts b/koa-compress/koa-compress.d.ts
index c4cd2af582..49a0bb5f1b 100644
--- a/koa-compress/koa-compress.d.ts
+++ b/koa-compress/koa-compress.d.ts
@@ -37,5 +37,6 @@ declare module "koa-compress" {
      */
     function compress(options?: CompressOptions): { (ctx: Koa.Context, next?: () => any): any };
 
+    namespace compress {}
     export = compress;
 }
diff --git a/koa-favicon/koa-favicon.d.ts b/koa-favicon/koa-favicon.d.ts
index 618683fc76..e09c685173 100644
--- a/koa-favicon/koa-favicon.d.ts
+++ b/koa-favicon/koa-favicon.d.ts
@@ -31,5 +31,6 @@ declare module "koa-favicon" {
 
     }): { (ctx: Koa.Context, next?: () => any): any };
 
+    namespace favicon {}
     export = favicon;
 }
diff --git a/koa-json-error/koa-json-error-tests.ts b/koa-json-error/koa-json-error-tests.ts
new file mode 100644
index 0000000000..37aae696b0
--- /dev/null
+++ b/koa-json-error/koa-json-error-tests.ts
@@ -0,0 +1,13 @@
+/// <reference path="../koa/koa.d.ts" />
+/// <reference path="koa-json-error.d.ts" />
+/// <reference path="../lodash/lodash.d.ts" />
+
+import * as Koa from "koa";
+import * as error from "koa-json-error";
+import { assign } from "lodash";
+
+const app = new Koa();
+
+app.use(error({
+    preFormat: err => assign({}, err)
+}));
\ No newline at end of file
diff --git a/koa-json-error/koa-json-error.d.ts b/koa-json-error/koa-json-error.d.ts
new file mode 100644
index 0000000000..491ead463e
--- /dev/null
+++ b/koa-json-error/koa-json-error.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for koa-json-error v3.x
+// Project: https://github.com/koajs/json-error
+// Definitions by: Mudkip <https://github.com/mudkipme>
+// Definitions: https://github.com/mudkipme/DefinitelyTyped
+
+/// <reference path="../koa/koa.d.ts" />
+
+declare module "koa-json-error" {
+
+    import * as Koa from "koa";
+
+    interface JSONErrorOptions {
+        /**
+         * Perform some task before calling `options.format`. Must be a function with the original err as its only argument.
+         */
+        preFormat?: { (err: Error): any };
+
+        /**
+         * Runs inmediatly after `options.preFormat`. It receives two arguments: the original `err` and the output of     `options.preFormat`. It should `return` a newly formatted error.
+         */
+        format?: { (err: Error, obj: any): any };
+
+        /**
+         * Runs inmediatly after `options.format`. It receives two arguments: the original `err` and the output of   `options.format`.   It should `return` a newly formatted error.
+         */
+        postFormat?: { (err: Error, obj: any): any };
+    }
+
+    /**
+     * Error handler for pure Koa 2.0.0+ JSON apps
+     */
+    function jsonError(options?: JSONErrorOptions) : { (ctx: Koa.Context, next?: () => any): any };
+  
+    namespace jsonError {}
+    export = jsonError;
+}
\ No newline at end of file
diff --git a/koa-router/koa-router-tests.ts b/koa-router/koa-router-tests.ts
index 36d3e6c1c8..d2bae290a4 100644
--- a/koa-router/koa-router-tests.ts
+++ b/koa-router/koa-router-tests.ts
@@ -23,11 +23,11 @@ router
   .put('/users/:id', function (ctx, next) {
     ctx.body = ctx.params.id;
   })
-  .del('/users/:id', function (ctx, next) {
+  .del('/users/:id', function () {
     // ...
   });
 
-router.get('user', '/users/:id', function (ctx, next) {
+router.get('user', '/users/:id', function (ctx) {
     ctx.body = "sdsd";
 });
 
diff --git a/koa-router/koa-router.d.ts b/koa-router/koa-router.d.ts
index 25ec962dad..81a961b93a 100644
--- a/koa-router/koa-router.d.ts
+++ b/koa-router/koa-router.d.ts
@@ -49,11 +49,11 @@ declare module "koa-router" {
         }
 
         export interface IMiddleware {
-            (ctx: Router.IRouterContext, next?: () => any): any;
+            (ctx: Router.IRouterContext, next: () => Promise<any>): any;
         }
 
         export interface IParamMiddleware {
-            (param: string, ctx: Router.IRouterContext, next?: () => any): any;
+            (param: string, ctx: Router.IRouterContext, next: () => Promise<any>): any;
         }
 
         export interface IRouterAllowedMethodsOptions {
@@ -83,10 +83,8 @@ declare module "koa-router" {
         regexp: RegExp;
         path: string;
 
-        constructor(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
-        constructor(path: string, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
-        constructor(path: RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
-        constructor(path: RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
+        constructor(path: string | RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
+        constructor(path: string | RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
 
         /**
          * Returns whether request `path` matches route.
@@ -96,7 +94,7 @@ declare module "koa-router" {
         /**
          * Returns map of URL parameters for given `path` and `paramNames`.
          */
-        params(path: string, captures: string[], existingParams?: Object): Object;
+        params(path: string | RegExp, captures: string[], existingParams?: Object): Object;
 
         /**
          * Returns array of regexp url path captures.
@@ -138,61 +136,61 @@ declare module "koa-router" {
          * "down" the middleware stack.
          */
         use(...middleware: Array<Router.IMiddleware>): Router;
-        use(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        use(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * HTTP get method
          */
-        get(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        get(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        get(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        get(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * HTTP post method
          */
-        post(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        post(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        post(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        post(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * HTTP put method
          */
-        put(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        put(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        put(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        put(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * HTTP delete method
          */
-        delete(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        delete(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        delete(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        delete(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * Alias for `router.delete()` because delete is a reserved word
          */
-        del(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        del(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        del(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        del(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * HTTP head method
          */
-        head(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        head(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        head(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        head(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * HTTP options method
          */
-        options(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        options(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        options(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        options(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * HTTP path method
          */
-        patch(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        patch(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        patch(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        patch(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * Register route with all methods.
          */
-        all(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        all(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+        all(name: string, path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+        all(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
         /**
          * Set the path prefix for a Router instance that was already initialized.
@@ -226,7 +224,7 @@ declare module "koa-router" {
         /**
          * Create and register a route.
          */
-        register(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Object): Layer;
+        register(path: string | RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Object): Layer;
 
         /**
          * Lookup route with given `name`.
@@ -254,7 +252,7 @@ declare module "koa-router" {
         /**
          * Generate URL from url pattern and given `params`.
          */
-        static url(path: string, params: Object): string;
+        static url(path: string | RegExp, params: Object): string;
     }
 
     export = Router;
diff --git a/libxslt/libxslt-tests.ts b/libxslt/libxslt-tests.ts
new file mode 100644
index 0000000000..544269b11e
--- /dev/null
+++ b/libxslt/libxslt-tests.ts
@@ -0,0 +1,102 @@
+/// <reference path="libxslt.d.ts" />
+/// <reference path="../libxmljs/libxmljs.d.ts" />
+
+import * as libxslt from 'libxslt';
+import * as libxmljs from 'libxmljs';
+
+const document: libxmljs.XMLDocument = libxslt.libxmljs.parseXmlString('<xml></xml>');
+
+let stylesheet: libxslt.Stylesheet;
+
+stylesheet = libxslt.parse('<xslt></xslt>');
+
+stylesheet = libxslt.parse(document);
+
+libxslt.parse('<xslt></xslt>', (err, result) => {
+	if (err == null) {
+		stylesheet = result;
+	}
+});
+
+libxslt.parse(document, (err, result) => {
+	if (err == null) {
+		stylesheet = result;
+	}
+});
+
+libxslt.parseFile('/path/to/file', (err, result) => {
+	if (err == null) {
+		stylesheet = result;
+	}
+});
+
+let applyOptions: libxslt.ApplyOptions = {};
+
+applyOptions = {
+	outputFormat: 'string',
+	noWrapParams: true
+};
+
+let transformedString: string;
+
+let transformedDocument: libxmljs.XMLDocument;
+
+transformedString = stylesheet.apply('<xml></xml>');
+
+transformedString = stylesheet.apply('<xml></xml>', {});
+
+let applyResult = stylesheet.apply('<xml></xml>', {}, applyOptions);
+
+if (typeof applyResult === 'string') {
+	transformedString = applyResult;
+} else {
+	transformedDocument = applyResult;
+}
+
+stylesheet.apply('<xml></xml>', {}, applyOptions, (err, result) => {
+	if (err != null) {
+		return;
+	}
+
+	if (typeof result === 'string') {
+		transformedString = result;
+	} else {
+		transformedDocument = result;
+	}
+});
+
+transformedDocument = stylesheet.apply(document);
+
+transformedDocument = stylesheet.apply(document, {});
+
+applyResult = stylesheet.apply(document, {}, applyOptions);
+
+if (typeof applyResult === 'string') {
+	transformedString = applyResult;
+} else {
+	transformedDocument = applyResult;
+}
+
+stylesheet.apply(document, {}, applyOptions, (err, result) => {
+	if (err != null) {
+		return;
+	}
+
+	if (typeof result === 'string') {
+		transformedString = result;
+	} else {
+		transformedDocument = result;
+	}
+});
+
+stylesheet.applyToFile('/path/to/file', {}, applyOptions, (err, result) => {
+	if (err == null) {
+		transformedString = result;
+	}
+});
+
+stylesheet.applyToFile('/path/to/file', (err, result) => {
+	if (err == null) {
+		transformedString = result;
+	}
+});
diff --git a/libxslt/libxslt.d.ts b/libxslt/libxslt.d.ts
new file mode 100644
index 0000000000..0cfd4e1bcd
--- /dev/null
+++ b/libxslt/libxslt.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for node-libxslt
+// Project: https://github.com/albanm/node-libxslt
+// Definitions by: Alejandro Sánchez <https://github.com/alejo90>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../libxmljs/libxmljs.d.ts" />
+
+declare module 'libxslt' {
+	import * as xmljs from 'libxmljs';
+
+	export const libxmljs: typeof xmljs;
+
+	type OutputFormat = 'document' | 'string';
+
+	export interface ApplyOptions {
+		outputFormat?: OutputFormat;
+		noWrapParams?: boolean;
+	}
+
+	type ApplyResult = string | xmljs.XMLDocument;
+
+	type ApplyCallback = (err: Error, result: ApplyResult) => void;
+
+	type ApplyStringCallback = (err: Error, result: string) => void;
+
+	type ApplyDocumentCallback = (err: Error, result: xmljs.XMLDocument) => void;
+
+	export interface Stylesheet {
+		apply(source: string, params?: Object): string;
+
+		apply(source: string, params: Object, options: ApplyOptions): ApplyResult;
+
+		apply(source: string, params: Object, options: ApplyOptions, callback: ApplyCallback): void;
+
+		apply(source: string, callback: ApplyStringCallback): void;
+
+		apply(source: xmljs.XMLDocument, params?: Object): xmljs.XMLDocument;
+
+		apply(source: xmljs.XMLDocument, params: Object, options: ApplyOptions): ApplyResult;
+
+		apply(source: xmljs.XMLDocument, params: Object, options: ApplyOptions, callback: ApplyCallback): void;
+
+		apply(source: xmljs.XMLDocument, callback: ApplyDocumentCallback): void;
+
+		applyToFile(sourcePath: string, params: Object, options: ApplyOptions, callback: ApplyStringCallback): void;
+
+		applyToFile(sourcePath: string, callback: ApplyStringCallback): void;
+	}
+
+	type ParseCallback = (err: Error, stylesheet: Stylesheet) => void;
+
+	export function parse(source: string): Stylesheet;
+
+	export function parse(source: string, callback: ParseCallback): void;
+
+	export function parse(source: xmljs.XMLDocument): Stylesheet;
+
+	export function parse(source: xmljs.XMLDocument, callback: ParseCallback): void;
+
+	export function parseFile(sourcePath: string, callback: ParseCallback): void;
+}
diff --git a/masonry-layout/masonry-layout-tests.ts b/masonry-layout/masonry-layout-tests.ts
index e83a898f54..65f629db10 100644
--- a/masonry-layout/masonry-layout-tests.ts
+++ b/masonry-layout/masonry-layout-tests.ts
@@ -1,48 +1,48 @@
-// test file for masonry-layout.d.ts
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="./masonry-layout.d.ts" />
-
-//import {Masonry} from "./masonry-layout.d.ts";
-
-// responsive layouts
-function testResponsiveLayouts() {
-    $('.grid').masonry({
-        itemSelector: '.grid-item',
-        columnWidth: '.grid-sizer',
-        percentPosition: true
-    });
-}
-
-// recommended Options
-function testRecommendedOptions() {
-    $('.grid').masonry({
-        columnWidth: 200,
-        itemSelector: '.grid-item'
-    });
-
-    var msnry = new Masonry.Masonry('.grid', {
-        columnWidth: 200,
-        itemSelector: '.grid-item'
-    });
-}
-
-// extended Options
-function testExtendedOptions() {
-    var msnry = new Masonry.Masonry('.grid', {
-        itemSelector: '.grid-item',
-        columnWidth: '.grid-sizer',
-        percentPosition: true,
-        gutter: '.gutter-sizer',
-        stamp: '.stamp',
-        fitWidth: true,
-        originLeft: true,
-        originTop: true,
-        containerStyle: {
-            position: 'relative'
-        },
-        transitionDuration: '0.4s',
-        resize: true,
-        initLayout: true
-    }); 
-} 
+// test file for masonry-layout.d.ts
+
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="./masonry-layout.d.ts" />
+
+//import {Masonry} from "./masonry-layout.d.ts";
+
+// responsive layouts
+function testResponsiveLayouts() {
+    $('.grid').masonry({
+        itemSelector: '.grid-item',
+        columnWidth: '.grid-sizer',
+        percentPosition: true
+    });
+}
+
+// recommended Options
+function testRecommendedOptions() {
+    $('.grid').masonry({
+        columnWidth: 200,
+        itemSelector: '.grid-item'
+    });
+
+    var msnry = new Masonry.Masonry('.grid', {
+        columnWidth: 200,
+        itemSelector: '.grid-item'
+    });
+}
+
+// extended Options
+function testExtendedOptions() {
+    var msnry = new Masonry.Masonry('.grid', {
+        itemSelector: '.grid-item',
+        columnWidth: '.grid-sizer',
+        percentPosition: true,
+        gutter: '.gutter-sizer',
+        stamp: '.stamp',
+        fitWidth: true,
+        originLeft: true,
+        originTop: true,
+        containerStyle: {
+            position: 'relative'
+        },
+        transitionDuration: '0.4s',
+        resize: true,
+        initLayout: true
+    }); 
+} 
diff --git a/masonry-layout/masonry-layout.d.ts b/masonry-layout/masonry-layout.d.ts
index 0923a8f463..a76796096b 100644
--- a/masonry-layout/masonry-layout.d.ts
+++ b/masonry-layout/masonry-layout.d.ts
@@ -1,70 +1,70 @@
-// Type definitions for Masonry 4.0.0 
-// Project: https://github.com/desandro/masonry 
-// Definitions by: Mark Wilson <https://github.com/m-a-wilson>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped 
-
-/// <reference path="../jquery/jquery.d.ts" /> 
-
-// Modified from original definitions by: 
-// Travis Brown < https://github.com/warriorrocker>
-
-declare module Masonry {
-
-     class Masonry implements MasonryGrid { 
-        constructor(options?: MasonryOptions); 
-        constructor(selector: string, options?: MasonryOptions); 
-    } 
-
-     interface MasonryGrid {
-        masonry?(): void;
-        masonry?(eventName: string, listener: any): void;
-
-        // layout 
-        layout?(): void;
-        layoutItems?(items: Array<any>, isStill?: boolean): void;
-        stamp?(elements: Array<any>): void;
-        unstamp?(elements: Array<any>): void;
-
-        // add and remove items 
-        appended?(elements: Array<any>): void;
-        prepended?(elements: Array<any>): void;
-        addItems?(elements: Array<any>): void;
-        remove?(elements: Array<any>): void;
-
-        // events 
-        on?(eventName: string, listener: any): void;
-        off?(eventName: string, listener: any): void;
-        once?(eventName: string, listener: any): void;
-
-        // utilities 
-        reloadItems?(): void;
-        destroy?(): void;
-        getItemElements?(): Array<any>;
-        data?(element: Element): Masonry;
-    }
-
-     interface MasonryOptions {
-
-        // layout 
-        itemSelector?: string;
-        columnWidth?: any;
-        percentPosition?: boolean;
-        gutter?: any;
-        stamp?: string;
-        fitWidth?: boolean;
-        originLeft?: boolean;
-        originTop?: boolean;
-
-        // setup 
-        containerStyle?: Object;
-        transitionDuration?: any;
-        resize?: boolean;
-        initLayout?: boolean;
-    }
-}
-
-interface JQuery {
-	masonry(options?: Masonry.MasonryOptions): JQuery;
-}
-
-
+// Type definitions for Masonry 4.0.0 
+// Project: https://github.com/desandro/masonry 
+// Definitions by: Mark Wilson <https://github.com/m-a-wilson>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped 
+
+/// <reference path="../jquery/jquery.d.ts" /> 
+
+// Modified from original definitions by: 
+// Travis Brown < https://github.com/warriorrocker>
+
+declare module Masonry {
+
+     class Masonry implements MasonryGrid { 
+        constructor(options?: MasonryOptions); 
+        constructor(selector: string, options?: MasonryOptions); 
+    } 
+
+     interface MasonryGrid {
+        masonry?(): void;
+        masonry?(eventName: string, listener: any): void;
+
+        // layout 
+        layout?(): void;
+        layoutItems?(items: Array<any>, isStill?: boolean): void;
+        stamp?(elements: Array<any>): void;
+        unstamp?(elements: Array<any>): void;
+
+        // add and remove items 
+        appended?(elements: Array<any>): void;
+        prepended?(elements: Array<any>): void;
+        addItems?(elements: Array<any>): void;
+        remove?(elements: Array<any>): void;
+
+        // events 
+        on?(eventName: string, listener: any): void;
+        off?(eventName: string, listener: any): void;
+        once?(eventName: string, listener: any): void;
+
+        // utilities 
+        reloadItems?(): void;
+        destroy?(): void;
+        getItemElements?(): Array<any>;
+        data?(element: Element): Masonry;
+    }
+
+     interface MasonryOptions {
+
+        // layout 
+        itemSelector?: string;
+        columnWidth?: any;
+        percentPosition?: boolean;
+        gutter?: any;
+        stamp?: string;
+        fitWidth?: boolean;
+        originLeft?: boolean;
+        originTop?: boolean;
+
+        // setup 
+        containerStyle?: Object;
+        transitionDuration?: any;
+        resize?: boolean;
+        initLayout?: boolean;
+    }
+}
+
+interface JQuery {
+	masonry(options?: Masonry.MasonryOptions): JQuery;
+}
+
+
diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts
index 2913c0bd57..2430923d9d 100644
--- a/material-ui/material-ui.d.ts
+++ b/material-ui/material-ui.d.ts
@@ -513,8 +513,8 @@ declare namespace __MaterialUI {
         iconClassNameRight?: string;
         iconElementLeft?: React.ReactElement<any>;
         iconElementRight?: React.ReactElement<any>;
-        iconStyleRight?: string;
-        iconStyleLeft?: string;
+        iconStyleRight?: React.CSSProperties;
+        iconStyleLeft?: React.CSSProperties;
         onLeftIconButtonTouchTap?: TouchTapEventHandler;
         onRightIconButtonTouchTap?: TouchTapEventHandler;
         onTitleTouchTap?: TouchTapEventHandler;
@@ -556,7 +556,7 @@ declare namespace __MaterialUI {
         errorStyle?: React.CSSProperties;
         errorText?: string;
         filter?: (searchText: string, key: string, item: AutoCompleteDataItem) => boolean;
-        floatingLabelText?: string;
+        floatingLabelText?: React.ReactNode;
         fullWidth?: boolean;
         hintText?: string;
         listStyle?: React.CSSProperties;
diff --git a/mongoose-sequence/mongoose-sequence-tests.ts b/mongoose-sequence/mongoose-sequence-tests.ts
new file mode 100644
index 0000000000..7962afeeb4
--- /dev/null
+++ b/mongoose-sequence/mongoose-sequence-tests.ts
@@ -0,0 +1,52 @@
+/// <reference path="./mongoose-sequence.d.ts" />
+/// <reference path="../mongoose/mongoose.d.ts" />
+/// <reference path="../express/express.d.ts" />
+
+/**
+ * Based on the examples on: https://github.com/ramiel/mongoose-sequence
+ * Created by Linus Brolin <https://github.com/linusbrolin/>.
+ */
+
+import { SequenceDocument, SequenceOptions, SequenceSchema, Document, Schema, Model, model } from 'mongoose';
+import * as mongooseSequence from 'mongoose-sequence';
+
+//#region Test Models
+interface User extends SequenceDocument {
+    name: string;
+    country: string;
+    city: string;
+    inhabitant_number: number;
+}
+
+const UserSchema: SequenceSchema = new Schema({
+    name: String,
+    country: String,
+    city: String,
+    inhabitant_number: Number
+});
+
+let seqOpts: SequenceOptions = { id: 'inhabitant_seq', inc_field: 'inhabitant_number', reference_fields: ['country', 'city'] };
+UserSchema.plugin(mongooseSequence, seqOpts);
+
+let UserModel: Model<User> = model<User>('User', UserSchema);
+//#endregion
+
+//#region Test Sequence
+let user: User = new UserModel({
+    name: 'Patrice',
+    country: 'France',
+    city: 'Paris'
+});
+user.save();
+console.log(user.inhabitant_number);
+
+user.setNext('inhabitant_seq', function(err: any, user: User) {
+    if (err) {
+        console.log(err);
+        return;
+    }
+    if (user) {
+        console.log(user.inhabitant_number);
+    }
+});
+//#endregion
diff --git a/mongoose-sequence/mongoose-sequence.d.ts b/mongoose-sequence/mongoose-sequence.d.ts
new file mode 100644
index 0000000000..b0dec033bd
--- /dev/null
+++ b/mongoose-sequence/mongoose-sequence.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for mongoose-sequence 3.0.2
+// Project: https://github.com/ramiel/mongoose-sequence
+// Definitions by: Linus Brolin <https://github.com/linusbrolin/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../mongoose/mongoose.d.ts" />
+
+declare module 'mongoose' {
+  export interface SequenceOptions {
+    inc_field: string;                  // The name of the field to increment. Mandatory, default is _id
+    id?: string;                        // Id of the sequence. Is mandatory only for scoped sequences but its use is strongly encouraged.
+    reference_fields?: Array<string>;   // The field to reference for a scoped counter. Optional
+    disable_hooks?: boolean;            // If true, the counter will not be incremented on saving a new document. Default to false
+    collection_name?: string;           // By default the collection name to mantain the status of the counters is counters. You can override it using this option
+  }
+
+  export interface SequenceDocument extends Document {
+    setNext(sequenceId: string, callback: (err: any, res: SequenceDocument) => void): void;
+  }
+
+  export interface SequenceSchema extends Schema {
+    plugin(
+      plugin: (schema: SequenceSchema, options: SequenceOptions) => void,
+      options: SequenceOptions
+    ): this;
+
+    // overload for the default mongoose plugin function
+    plugin(plugin: (schema: Schema, options?: Object) => void, opts?: Object): this;
+  }
+}
+
+declare module 'mongoose-sequence' {
+  import mongoose = require('mongoose');
+  var _: (schema: mongoose.Schema, options?: Object) => void;
+  export = _;
+}
diff --git a/mongoose/README.md b/mongoose/README.md
index 411f6ace2e..9becde8b89 100644
--- a/mongoose/README.md
+++ b/mongoose/README.md
@@ -49,7 +49,7 @@ interface IUser extends Document {
   data: any[];
 }
 
-var UserModel: Model<IUser> = mongoose.model<IUser>('User', UserSchema);
+var UserModel: Model<IUser> = model<IUser>('User', UserSchema);
 
 var user = new UserModel({name: 'Jane'});
 user.username;     // IUser properties are available
diff --git a/musicmetadata/musicmetadata.d.ts b/musicmetadata/musicmetadata.d.ts
index b772468546..0e951f8d08 100644
--- a/musicmetadata/musicmetadata.d.ts
+++ b/musicmetadata/musicmetadata.d.ts
@@ -19,8 +19,8 @@ declare module "musicmetadata" {
 
 declare namespace MM {
     export interface Options {
-        duration: boolean;
-        fileSize: number;
+        duration?: boolean;
+        fileSize?: number;
     }
 
     export interface Metadata {
@@ -45,4 +45,4 @@ declare namespace MM {
         format: string;
         data: Buffer;
     }
-}
\ No newline at end of file
+}
diff --git a/navigation/navigation-tests.ts b/navigation/navigation-tests.ts
index c1b6e45ff9..52e6bfded4 100644
--- a/navigation/navigation-tests.ts
+++ b/navigation/navigation-tests.ts
@@ -37,10 +37,11 @@ namespace NavigationTests {
 	person.navigated = (data) => {};
     person.urlEncode = function urlEncode(state: Navigation.State, key: string, val: string, queryString: boolean): string {
         return queryString ? val.replace(/\s/g, '+') : encodeURIComponent(val);
-    }
+    };
     person.urlDecode = function urlDecode(state: Navigation.State, key: string, val: string, queryString: boolean): string {
         return queryString ? val.replace(/\+/g, ' ') : decodeURIComponent(val);
-    }
+    };
+	person.validate = (data: any) => data.id > 0;
 	
 	// Navigation Event
 	var navigationListener = (oldState: Navigation.State, state: Navigation.State, data: any, asyncData: any) => {
diff --git a/navigation/navigation.d.ts b/navigation/navigation.d.ts
index ad3c1c8e23..1ae460a9f3 100644
--- a/navigation/navigation.d.ts
+++ b/navigation/navigation.d.ts
@@ -138,6 +138,12 @@ declare namespace Navigation {
          * @param queryString A value indicating the Url value's location
          */
         urlDecode(state: State, key: string, val: string, queryString: boolean): string;
+        /**
+         * Validates the NavigationData before navigating to the new State
+         * @param data The new NavigationData
+         * @returns Validation success indicator
+         */
+        validate(data: any): boolean;
         /**
          * Truncates the crumb trail whenever a repeated or initial State is
          * encountered
@@ -178,9 +184,9 @@ declare namespace Navigation {
          */
         getHref(url: string): string;
         /**
-         * Gets a Url from the anchor 
+         * Gets a Url from the anchor or location
          */
-        getUrl(anchor: HTMLAnchorElement): string;
+        getUrl(hrefElement: HTMLAnchorElement | Location): string;
         /**
          * Removes browser history event listeners
          */
@@ -230,9 +236,9 @@ declare namespace Navigation {
          */
         getHref(url: string): string;
         /**
-         * Gets a Url from the anchor 
+         * Gets a Url from the anchor or location
          */
-        getUrl(anchor: HTMLAnchorElement): string;
+        getUrl(hrefElement: HTMLAnchorElement | Location): string;
         /**
          * Removes a listener for the hashchange event
          */
@@ -281,9 +287,9 @@ declare namespace Navigation {
          */
         getHref(url: string): string;
         /**
-         * Gets a Url from the anchor 
+         * Gets a Url from the anchor or location
          */
-        getUrl(anchor: HTMLAnchorElement): string;
+        getUrl(hrefElement: HTMLAnchorElement | Location): string;
         /**
          * Removes a listener for the popstate event
          */
@@ -381,10 +387,6 @@ declare namespace Navigation {
          * Crumb first
          */
         crumbs: Crumb[];
-        /**
-         * Gets the crumb trail
-         */
-        crumbTrail: string[];
         /**
          * Gets the next crumb
          */
diff --git a/ncp/ncp-tests.ts b/ncp/ncp-tests.ts
index f1ce04c21e..06f818e0f8 100644
--- a/ncp/ncp-tests.ts
+++ b/ncp/ncp-tests.ts
@@ -8,6 +8,9 @@ opts = {};
 opts = {
 	filter: /abc/
 };
+opts = {
+    filter: (filename: string) => true
+};
 opts = {
 	transform: (read: NodeJS.ReadableStream, write: NodeJS.WritableStream) => {
 
diff --git a/ncp/ncp.d.ts b/ncp/ncp.d.ts
index 50393195e6..b76fa5c912 100644
--- a/ncp/ncp.d.ts
+++ b/ncp/ncp.d.ts
@@ -10,7 +10,7 @@ declare module 'ncp' {
 	function ncp (source: string, destination: string, options: Options, callback: (err: Error) => void): void;
 
 	interface Options {
-		filter? : RegExp;
+		filter? : RegExp | ((filename: string) => boolean);
 		transform? : (read: NodeJS.ReadableStream, write: NodeJS.WritableStream) => void;
 		clobber? : boolean;
 		stopOnErr? : boolean;
diff --git a/nock/nock-tests.ts b/nock/nock-tests.ts
index bc936a05b8..ffb456b420 100644
--- a/nock/nock-tests.ts
+++ b/nock/nock-tests.ts
@@ -97,6 +97,12 @@ inst = inst.log(() => {
 
 });
 
+inst = inst.delay(2000);
+inst = inst.delayBody(2000);
+inst = inst.delayConnection(2000);
+inst.getTotalDelay();
+inst = inst.socketDelay(2000);
+
 inst.done();
 bool = inst.isDone();
 inst.restore();
diff --git a/nock/nock.d.ts b/nock/nock.d.ts
index b82721da78..615ec0d3ca 100644
--- a/nock/nock.d.ts
+++ b/nock/nock.d.ts
@@ -96,7 +96,10 @@ declare module "nock" {
 			log(out: () => void): Scope;
 
 			delay(timeMs: number): Scope;
+			delayBody(timeMs: number): Scope;
 			delayConnection(timeMs: number): Scope;
+			getTotalDelay(): number;
+			socketDelay(timeMs: number): Scope;
 
 			times(repeats: number): Scope;
 			once(): Scope;
diff --git a/node-7z/node-7z-tests.ts b/node-7z/node-7z-tests.ts
new file mode 100644
index 0000000000..7de496f683
--- /dev/null
+++ b/node-7z/node-7z-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="node-7z.d.ts" />
+
+import Zip = require('node-7z'); // Name the class as you want!
+var myTask = new Zip();
+myTask.extractFull('myArchive.7z', 'destination', { p: 'myPassword' })
+
+// Equivalent to `on('data', function (files) { // ... });`
+.progress(function (files: Array<string>): void {
+  console.log('Some files are extracted: %s', files);
+})
+
+// When all is done
+.then(function () {
+  console.log('Extracting done!');
+})
+
+// On error
+.catch(function (err: any) {
+  console.error(err);
+});
diff --git a/node-7z/node-7z.d.ts b/node-7z/node-7z.d.ts
new file mode 100644
index 0000000000..506b3da952
--- /dev/null
+++ b/node-7z/node-7z.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for node-7z v0.4.1
+// Project: https://github.com/quentinrossetti/node-7z
+// Definitions by: Erik Rothoff Andersson <https://github.com/erkie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+
+declare module "node-7z" {
+  // node-7z uses `when` promises which have a progress method, however they are deprecated
+  // internally node-7z uses the progress events to emit files that are extracted,
+  // (also the progress event emits an array of strings, which doesn't correlate with any promise<T>)
+  // so instead of patching `when` promises I'm extending the generic Promise for use internally
+  interface PromiseWithProgress<T> extends Promise<T> {
+    progress(progress: (files: Array<string>) => void): this;
+  }
+
+  // Options are mapped to the 7z program so there is no idea to define all possible types here
+  interface CommandLineSwitches {
+    raw?: Array<string>;
+    [key: string]: any
+  }
+
+  interface FileSpec {
+    path: string;
+    type: string;
+    method: string;
+    physicalSize: number;
+  }
+
+  class Zip {
+    add(archive: string, files: string | Array<string>, options: CommandLineSwitches): PromiseWithProgress<{}>;
+    delete(archive: string, files: string | Array<string>, options: CommandLineSwitches): PromiseWithProgress<{}>;
+    extract(archive: string, dest: string, options: CommandLineSwitches): PromiseWithProgress<{}>;
+    extractFull(archive: string, dest: string, options: CommandLineSwitches): PromiseWithProgress<{}>;
+    list(archive: string, options: CommandLineSwitches): PromiseWithProgress<FileSpec>;
+    test(archive: string, options: CommandLineSwitches): PromiseWithProgress<{}>;
+    update(archive: string, files: string | Array<string>, options: CommandLineSwitches): PromiseWithProgress<{}>;
+  }
+
+  export = Zip;
+}
diff --git a/node/node-0.10.d.ts b/node/node-0.10.d.ts
index 80b46a475c..9055ec82a7 100644
--- a/node/node-0.10.d.ts
+++ b/node/node-0.10.d.ts
@@ -688,6 +688,7 @@ declare module "child_process" {
         pid: number;
         kill(signal?: string): void;
         send(message: any, sendHandle: any): void;
+        connected: boolean;
         disconnect(): void;
     }
 
diff --git a/node/node-0.11.d.ts b/node/node-0.11.d.ts
index 212768c21a..91cfef468d 100644
--- a/node/node-0.11.d.ts
+++ b/node/node-0.11.d.ts
@@ -611,6 +611,7 @@ declare module "child_process" {
         pid: number;
         kill(signal?: string): void;
         send(message: any, sendHandle: any): void;
+        connected: boolean;
         disconnect(): void;
     }
 
diff --git a/node/node-0.12.d.ts b/node/node-0.12.d.ts
index 49091419a8..4459ebe96a 100644
--- a/node/node-0.12.d.ts
+++ b/node/node-0.12.d.ts
@@ -829,6 +829,7 @@ declare module "child_process" {
         pid: number;
         kill(signal?: string): void;
         send(message: any, sendHandle?: any): void;
+        connected: boolean;
         disconnect(): void;
         unref(): void;
     }
diff --git a/node/node-0.8.8.d.ts b/node/node-0.8.8.d.ts
index 321c386655..2be7c6aae3 100644
--- a/node/node-0.8.8.d.ts
+++ b/node/node-0.8.8.d.ts
@@ -545,6 +545,7 @@ declare module "child_process" {
         pid: number;
         kill(signal?: string): void;
         send(message: any, sendHandle: any): void;
+        connected: boolean;
         disconnect(): void;
     }
 
diff --git a/node/node-4-tests.ts b/node/node-4-tests.ts
index 9db708b910..2de910db67 100644
--- a/node/node-4-tests.ts
+++ b/node/node-4-tests.ts
@@ -24,22 +24,43 @@ import * as string_decoder from "string_decoder";
 // Specifically test buffer module regression.
 import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
 
-assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+//////////////////////////////////////////////////////////
+/// Assert Tests : https://nodejs.org/api/assert.html ///
+//////////////////////////////////////////////////////////
 
-assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+namespace assert_tests{
+    {
+        assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+        
+        assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+        
+        assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
+        
+        assert.doesNotThrow(() => {
+            const b = false;
+            if (b) { throw "a hammer at your face"; }
+        }, undefined, "What the...*crunch*");
+        
+        assert.equal(3, "3", "uses == comparator");
 
-assert.equal(3, "3", "uses == comparator");
-
-assert.notStrictEqual(2, "2", "uses === comparator");
-
-assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses === comparator");
-
-assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
-
-assert.doesNotThrow(() => {
-    const b = false;
-    if (b) { throw "a hammer at your face"; }
-}, undefined, "What the...*crunch*");
+        assert.fail(1, 2, undefined, '>');
+        
+        assert.ifError(0);
+        
+        assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
+        
+        assert.notEqual(1, 2, "uses != comparator");
+        
+        assert.notStrictEqual(2, "2", "uses === comparator");
+        
+        assert.ok(true);
+        assert.ok(1);
+        
+        assert.strictEqual(1, 1,  "uses === comparator");
+        
+        assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
+    }
+}
 
 ////////////////////////////////////////////////////
 /// Events tests : http://nodejs.org/api/events.html
@@ -87,59 +108,75 @@ namespace events_tests {
         result = emitter.emit(event, any, any);
         result = emitter.emit(event, any, any, any);
     }
+    
+    {
+        class Networker extends events.EventEmitter {
+            constructor() {
+                super();
+
+                this.emit("mingling");
+            }
+        }
+    }
 }
 
 ////////////////////////////////////////////////////
 /// File system tests : http://nodejs.org/api/fs.html
 ////////////////////////////////////////////////////
-fs.writeFile("thebible.txt",
-    "Do unto others as you would have them do unto you.",
-    assert.ifError);
 
-fs.write(1234, "test");
-
-fs.writeFile("Harry Potter",
-    "\"You be wizzing, Harry,\" jived Dumbledore.",
+namespace fs_tests {
     {
-        encoding: "ascii"
-    },
-    assert.ifError);
+        fs.writeFile("thebible.txt",
+            "Do unto others as you would have them do unto you.",
+            assert.ifError);
 
-var content: string,
-    buffer: Buffer;
+        fs.write(1234, "test");
 
-content = fs.readFileSync('testfile', 'utf8');
-content = fs.readFileSync('testfile', {encoding : 'utf8'});
-buffer = fs.readFileSync('testfile');
-buffer = fs.readFileSync('testfile', {flag : 'r'});
-fs.readFile('testfile', 'utf8', (err, data) => content = data);
-fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data);
-fs.readFile('testfile', (err, data) => buffer = data);
-fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data);
-
-class Networker extends events.EventEmitter {
-    constructor() {
-        super();
-
-        this.emit("mingling");
+        fs.writeFile("Harry Potter",
+            "\"You be wizzing, Harry,\" jived Dumbledore.",
+            {
+                encoding: "ascii"
+            },
+            assert.ifError);
     }
+
+    {
+        var content: string;
+        var buffer: Buffer;
+
+        content = fs.readFileSync('testfile', 'utf8');
+        content = fs.readFileSync('testfile', {encoding : 'utf8'});
+        buffer = fs.readFileSync('testfile');
+        buffer = fs.readFileSync('testfile', {flag : 'r'});
+        fs.readFile('testfile', 'utf8', (err, data) => content = data);
+        fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data);
+        fs.readFile('testfile', (err, data) => buffer = data);
+        fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data);
+    }
+
+    {
+        var errno: number;
+        fs.readFile('testfile', (err, data) => {
+            if (err && err.errno) {
+                errno = err.errno;
+            }
+        });
+    }
+
+    {
+        fs.mkdtemp('/tmp/foo-', (err, folder) => {
+            console.log(folder);
+            // Prints: /tmp/foo-itXde2
+        });
+    }
+
+    {
+        var tempDir: string;
+        tempDir = fs.mkdtempSync('/tmp/foo-');
+    }
+
 }
 
-var errno: number;
-fs.readFile('testfile', (err, data) => {
-    if (err && err.errno) {
-        errno = err.errno;
-    }
-});
-
-fs.mkdtemp('/tmp/foo-', (err, folder) => {
-    console.log(folder);
-    // Prints: /tmp/foo-itXde2
-});
-
-var tempDir: string;
-tempDir = fs.mkdtempSync('/tmp/foo-');
-
 ///////////////////////////////////////////////////////
 /// Buffer tests : https://nodejs.org/api/buffer.html
 ///////////////////////////////////////////////////////
@@ -235,23 +272,36 @@ function bufferTests() {
 /// Url tests : http://nodejs.org/api/url.html
 ////////////////////////////////////////////////////
 
-url.format(url.parse('http://www.example.com/xyz'));
+namespace url_tests {
+    {
+        url.format(url.parse('http://www.example.com/xyz'));
+        
+        // https://google.com/search?q=you're%20a%20lizard%2C%20gary
+        url.format({
+            protocol: 'https',
+            host: "google.com",
+            pathname: 'search',
+            query: { q: "you're a lizard, gary" }
+        });   
+    }
 
-// https://google.com/search?q=you're%20a%20lizard%2C%20gary
-url.format({
-    protocol: 'https',
-    host: "google.com",
-    pathname: 'search',
-    query: { q: "you're a lizard, gary" }
-});
+    {
+        var helloUrl = url.parse('http://example.com/?hello=world', true)
+        assert.equal(helloUrl.query.hello, 'world');
+    }
+}
 
-var helloUrl = url.parse('http://example.com/?hello=world', true)
-assert.equal(helloUrl.query.hello, 'world');
+/////////////////////////////////////////////////////
+/// util tests : https://nodejs.org/api/util.html ///
+/////////////////////////////////////////////////////
 
-
-// Old and new util.inspect APIs
-util.inspect(["This is nice"], false, 5);
-util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
+namespace util_tests {
+    {
+        // Old and new util.inspect APIs
+        util.inspect(["This is nice"], false, 5);
+        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });    
+    }
+}
 
 ////////////////////////////////////////////////////
 /// Stream tests : http://nodejs.org/api/stream.html
@@ -266,51 +316,57 @@ function stream_readable_pipe_test() {
     r.close();
 }
 
-////////////////////////////////////////////////////
-/// Crypto tests : http://nodejs.org/api/crypto.html
-////////////////////////////////////////////////////
+////////////////////////////////////////////////////////
+/// Crypto tests : http://nodejs.org/api/crypto.html ///
+////////////////////////////////////////////////////////
 
-var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+namespace crypto_tests {
+    {
+        var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+    }
+    
+    {
+        let hmac: crypto.Hmac;
+        (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
+            let hash: Buffer | string = hmac.read();
+        });
+    }
+    
+    {
+        //crypto_cipher_decipher_string_test
+        let key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: string = "This is the clear text.";
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherText: string = cipher.update(clearText, "utf8", "hex");
+        cipherText += cipher.final("hex");
 
-{
-    let hmac: crypto.Hmac;
-    (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
-        let hash: Buffer|string = hmac.read();
-    });
-}
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let clearText2: string = decipher.update(cipherText, "hex", "utf8");
+        clearText2 += decipher.final("utf8");
 
-function crypto_cipher_decipher_string_test() {
-	var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-	var clearText:string = "This is the clear text.";
-	var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-	var cipherText:string = cipher.update(clearText, "utf8", "hex");
-	cipherText += cipher.final("hex");
+        assert.equal(clearText2, clearText);
+    }
 
-	var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-	var clearText2:string = decipher.update(cipherText, "hex", "utf8");
-	clearText2 += decipher.final("utf8");
+    {
+        //crypto_cipher_decipher_buffer_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
 
-	assert.equal(clearText2, clearText);
-}
+        let cipherText: Buffer = Buffer.concat(cipherBuffers);
 
-function crypto_cipher_decipher_buffer_test() {
-	var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-	var clearText:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
-	var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-	var cipherBuffers:Buffer[] = [];
-	cipherBuffers.push(cipher.update(clearText));
-	cipherBuffers.push(cipher.final());
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
 
-	var cipherText:Buffer = Buffer.concat(cipherBuffers);
+        let clearText2: Buffer = Buffer.concat(decipherBuffers);
 
-	var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-	var decipherBuffers:Buffer[] = [];
-	decipherBuffers.push(decipher.update(cipherText));
-	decipherBuffers.push(decipher.final());
-
-	var clearText2:Buffer = Buffer.concat(decipherBuffers);
-
-	assert.deepEqual(clearText2, clearText);
+        assert.deepEqual(clearText2, clearText);
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -329,27 +385,18 @@ var tlsOpts: tls.TlsOptions = {
 };
 var tlsSocket = tls.connect(tlsOpts);
 
-
+////////////////////////////////////////////////////
+/// Http tests : http://nodejs.org/api/http.html ///
 ////////////////////////////////////////////////////
 
-// Make sure .listen() and .close() retuern a Server instance
-http.createServer().listen(0).close().address();
-net.createServer().listen(0).close().address();
-
-var request = http.request('http://0.0.0.0');
-request.once('error', function () {});
-request.setNoDelay(true);
-request.abort();
-
-////////////////////////////////////////////////////
-/// Http tests : http://nodejs.org/api/http.html
-////////////////////////////////////////////////////
 namespace http_tests {
-    // Status codes
-    var code = 100;
-    var codeMessage = http.STATUS_CODES['400'];
-    var codeMessage = http.STATUS_CODES[400];
+    {
+        // Status codes
+        var codeMessage = http.STATUS_CODES['400'];
+        var codeMessage = http.STATUS_CODES[400];
+    }
 
+    {
 	var agent: http.Agent = new http.Agent({
 		keepAlive: true,
 		keepAliveMsecs: 10000,
@@ -359,20 +406,29 @@ namespace http_tests {
 
 	var agent: http.Agent = http.globalAgent;
 
-	http.request({
-		agent: false
-	});
-	http.request({
-		agent: agent
-	});
-	http.request({
-		agent: undefined
-	});
+	http.request({agent: false});
+	http.request({agent: agent});
+	http.request({agent: undefined});
+    }
+    
+    {
+        // Make sure .listen() and .close() retuern a Server instance
+        http.createServer().listen(0).close().address();
+        net.createServer().listen(0).close().address();
+    }
+    
+    {
+        var request = http.request('http://0.0.0.0');
+        request.once('error', function() { });
+        request.setNoDelay(true);
+        request.abort();
+    }
 }
 
-////////////////////////////////////////////////////
-/// Https tests : http://nodejs.org/api/https.html
-////////////////////////////////////////////////////
+//////////////////////////////////////////////////////
+/// Https tests : http://nodejs.org/api/https.html ///
+//////////////////////////////////////////////////////
+
 namespace https_tests {
     var agent: https.Agent = new https.Agent({
         keepAlive: true,
@@ -416,11 +472,13 @@ namespace tty_tests {
 /// Dgram tests : http://nodejs.org/api/dgram.html
 ////////////////////////////////////////////////////
 
-var ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
-});
-var ai: dgram.AddressInfo = ds.address();
-ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
-});
+namespace dgram_tests {
+    var ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
+    });
+    var ai: dgram.AddressInfo = ds.address();
+    ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
+    });
+}
 
 ////////////////////////////////////////////////////
 ///Querystring tests : https://nodejs.org/api/querystring.html
@@ -516,82 +574,82 @@ namespace path_tests {
     path.isAbsolute('.')         // false
 
     path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb')
-// returns
-//    '..\\..\\impl\\bbb'
+    // returns
+    //    '..\\..\\impl\\bbb'
 
     path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb')
-// returns
-//    '../../impl/bbb'
+    // returns
+    //    '../../impl/bbb'
 
     path.dirname('/foo/bar/baz/asdf/quux')
-// returns
-//    '/foo/bar/baz/asdf'
+    // returns
+    //    '/foo/bar/baz/asdf'
 
     path.basename('/foo/bar/baz/asdf/quux.html')
-// returns
-//    'quux.html'
+    // returns
+    //    'quux.html'
 
     path.basename('/foo/bar/baz/asdf/quux.html', '.html')
-// returns
-//    'quux'
+    // returns
+    //    'quux'
 
     path.extname('index.html')
-// returns
-//    '.html'
+    // returns
+    //    '.html'
 
     path.extname('index.coffee.md')
-// returns
-//    '.md'
+    // returns
+    //    '.md'
 
     path.extname('index.')
-// returns
-//    '.'
+    // returns
+    //    '.'
 
     path.extname('index')
-// returns
-//    ''
+    // returns
+    //    ''
 
     'foo/bar/baz'.split(path.sep)
-// returns
-//        ['foo', 'bar', 'baz']
+    // returns
+    //        ['foo', 'bar', 'baz']
 
     'foo\\bar\\baz'.split(path.sep)
-// returns
-//        ['foo', 'bar', 'baz']
+    // returns
+    //        ['foo', 'bar', 'baz']
 
     console.log(process.env.PATH)
-// '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
+    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
 
     process.env.PATH.split(path.delimiter)
-// returns
-//        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
+    // returns
+    //        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
 
     console.log(process.env.PATH)
-// 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
+    // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
 
     process.env.PATH.split(path.delimiter)
-// returns
-//        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
+    // returns
+    //        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
 
     path.parse('/home/user/dir/file.txt')
-// returns
-//    {
-//        root : "/",
-//        dir : "/home/user/dir",
-//        base : "file.txt",
-//        ext : ".txt",
-//        name : "file"
-//    }
+    // returns
+    //    {
+    //        root : "/",
+    //        dir : "/home/user/dir",
+    //        base : "file.txt",
+    //        ext : ".txt",
+    //        name : "file"
+    //    }
 
     path.parse('C:\\path\\dir\\index.html')
-// returns
-//    {
-//        root : "C:\",
-//        dir : "C:\path\dir",
-//        base : "index.html",
-//        ext : ".html",
-//        name : "index"
-//    }
+    // returns
+    //    {
+    //        root : "C:\",
+    //        dir : "C:\path\dir",
+    //        base : "index.html",
+    //        ext : ".html",
+    //        name : "index"
+    //    }
 
     path.format({
         root : "/",
@@ -600,8 +658,8 @@ namespace path_tests {
         ext : ".txt",
         name : "file"
     });
-// returns
-//    '/home/user/dir/file.txt'
+    // returns
+    //    '/home/user/dir/file.txt'
 }
 
 ////////////////////////////////////////////////////
@@ -717,20 +775,28 @@ namespace string_decoder_tests {
 /// Child Process tests: https://nodejs.org/api/child_process.html ///
 //////////////////////////////////////////////////////////////////////
 
-childProcess.exec("echo test");
-childProcess.spawnSync("echo test");
+namespace child_process_tests {
+    {
+        childProcess.exec("echo test");
+        childProcess.spawnSync("echo test");    
+    }
+}
 
 //////////////////////////////////////////////////////////////////////
 /// cluster tests: https://nodejs.org/api/cluster.html ///
 //////////////////////////////////////////////////////////////////////
 
-cluster.fork();
-Object.keys(cluster.workers).forEach(key => {
-    const worker = cluster.workers[key];
-    if (worker.isDead()) {
-        console.log('worker %d is dead', worker.process.pid);
+namespace cluster_tests　{
+    {
+        cluster.fork();
+        Object.keys(cluster.workers).forEach(key => {
+            const worker = cluster.workers[key];
+            if (worker.isDead()) {
+                console.log('worker %d is dead', worker.process.pid);
+            }
+        });
     }
-});
+}
 
 ////////////////////////////////////////////////////
 /// os tests : https://nodejs.org/api/os.html
@@ -839,4 +905,42 @@ namespace errors_tests {
         const myObject = {};
         Error.captureStackTrace(myObject);
     }
-}
\ No newline at end of file
+}
+
+///////////////////////////////////////////////////////////
+/// Process Tests : https://nodejs.org/api/process.html ///
+///////////////////////////////////////////////////////////
+
+import * as p from "process";
+namespace process_tests {
+    {
+        var eventEmitter: events.EventEmitter;
+        eventEmitter = process;                // Test that process implements EventEmitter...
+        
+        var _p: NodeJS.Process = process;
+        _p = p;
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Console Tests : https://nodejs.org/api/console.html ///
+///////////////////////////////////////////////////////////
+
+import * as c from "console";
+namespace console_tests {
+    {
+        var _c: Console = console;
+        _c = c;
+    }
+}
+
+///////////////////////////////////////////////////
+/// Net Tests : https://nodejs.org/api/net.html ///
+///////////////////////////////////////////////////
+
+namespace net_tests {
+    {
+        // Make sure .listen() and .close() retuern a Server instance
+        net.createServer().listen(0).close().address();
+    }
+}
diff --git a/node/node-4.d.ts b/node/node-4.d.ts
index 4516331d7d..f05444336d 100644
--- a/node/node-4.d.ts
+++ b/node/node-4.d.ts
@@ -430,7 +430,7 @@ declare namespace NodeJS {
 interface NodeBuffer extends Uint8Array {
     write(string: string, offset?: number, length?: number, encoding?: string): number;
     toString(encoding?: string, start?: number, end?: number): string;
-    toJSON(): any;
+    toJSON(): {type: 'Buffer', data: any[]};
     equals(otherBuffer: Buffer): boolean;
     compare(otherBuffer: Buffer): number;
     copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
@@ -1036,6 +1036,7 @@ declare module "child_process" {
         pid: number;
         kill(signal?: string): void;
         send(message: any, sendHandle?: any): void;
+        connected: boolean;
         disconnect(): void;
         unref(): void;
     }
@@ -2402,8 +2403,63 @@ declare module "constants" {
     export var W_OK: number;
     export var X_OK: number;
     export var UV_UDP_REUSEADDR: number;
+    export var EDQUOT: number;
+    export var EMULTIHOP: number;
+    export var ESTALE: number;
+    export var O_DIRECT: number;
+    export var O_DIRECTORY: number;
+    export var O_NOCTTY: number;
+    export var O_NOFOLLOW: number;
+    export var O_NONBLOCK: number;
+    export var O_SYNC: number;
+    export var SIGALRM: number;
+    export var SIGBUS: number;
+    export var SIGCHLD: number;
+    export var SIGCONT: number;
+    export var SIGIO: number;
+    export var SIGIOT: number;
+    export var SIGPIPE: number;
+    export var SIGPOLL: number;
+    export var SIGPROF: number;
+    export var SIGPWR: number;
+    export var SIGQUIT: number;
+    export var SIGSTKFLT: number;
+    export var SIGSTOP: number;
+    export var SIGSYS: number;
+    export var SIGTRAP: number;
+    export var SIGTSTP: number;
+    export var SIGTTIN: number;
+    export var SIGTTOU: number;
+    export var SIGUNUSED: number;
+    export var SIGURG: number;
+    export var SIGUSR1: number;
+    export var SIGUSR2: number;
+    export var SIGVTALRM: number;
+    export var SIGXCPU: number;
+    export var SIGXFSZ: number;
+    export var S_IFBLK: number;
+    export var S_IFIFO: number;
+    export var S_IFSOCK: number;
+    export var S_IRGRP: number;
+    export var S_IROTH: number;
+    export var S_IRUSR: number;
+    export var S_IRWXG: number;
+    export var S_IRWXO: number;
+    export var S_IRWXU: number;
+    export var S_IWGRP: number;
+    export var S_IWOTH: number;
+    export var S_IWUSR: number;
+    export var S_IXGRP: number;
+    export var S_IXOTH: number;
+    export var S_IXUSR: number;
+    export var defaultCipherList: string;
+    export var defaultCoreCipherList: string;
 }
 
 declare module "process" {
     export = process;
 }
+
+declare module "console" {
+    export = console;
+}
diff --git a/node/node-tests.ts b/node/node-tests.ts
index af214a4385..e0600d936d 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -21,26 +21,48 @@ import * as os from "os";
 import * as vm from "vm";
 import * as string_decoder from "string_decoder";
 import * as stream from "stream";
+import * as timers from "timers";
 
 // Specifically test buffer module regression.
 import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
 
-assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+//////////////////////////////////////////////////////////
+/// Assert Tests : https://nodejs.org/api/assert.html ///
+//////////////////////////////////////////////////////////
 
-assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+namespace assert_tests{
+    {
+        assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+        
+        assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+        
+        assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
+        
+        assert.doesNotThrow(() => {
+            const b = false;
+            if (b) { throw "a hammer at your face"; }
+        }, undefined, "What the...*crunch*");
+        
+        assert.equal(3, "3", "uses == comparator");
 
-assert.equal(3, "3", "uses == comparator");
-
-assert.notStrictEqual(2, "2", "uses === comparator");
-
-assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses === comparator");
-
-assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
-
-assert.doesNotThrow(() => {
-    const b = false;
-    if (b) { throw "a hammer at your face"; }
-}, undefined, "What the...*crunch*");
+        assert.fail(1, 2, undefined, '>');
+        
+        assert.ifError(0);
+        
+        assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
+        
+        assert.notEqual(1, 2, "uses != comparator");
+        
+        assert.notStrictEqual(2, "2", "uses === comparator");
+        
+        assert.ok(true);
+        assert.ok(1);
+        
+        assert.strictEqual(1, 1,  "uses === comparator");
+        
+        assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
+    }
+}
 
 ////////////////////////////////////////////////////
 /// Events tests : http://nodejs.org/api/events.html
@@ -96,75 +118,110 @@ namespace events_tests {
 
         result = emitter.eventNames();
     }
+    
+    {
+        class Networker extends events.EventEmitter {
+            constructor() {
+                super();
+
+                this.emit("mingling");
+            }
+        }
+    }
 }
 
 ////////////////////////////////////////////////////
 /// File system tests : http://nodejs.org/api/fs.html
 ////////////////////////////////////////////////////
-fs.writeFile("thebible.txt",
-    "Do unto others as you would have them do unto you.",
-    assert.ifError);
 
-fs.write(1234, "test");
-
-fs.writeFile("Harry Potter",
-    "\"You be wizzing, Harry,\" jived Dumbledore.",
+namespace fs_tests {
     {
-        encoding: "ascii"
-    },
-    assert.ifError);
+        fs.writeFile("thebible.txt",
+            "Do unto others as you would have them do unto you.",
+            assert.ifError);
+        
+        fs.write(1234, "test");
+        
+        fs.writeFile("Harry Potter",
+            "\"You be wizzing, Harry,\" jived Dumbledore.",
+            {
+                encoding: "ascii"
+            },
+            assert.ifError);	
+    }
 
-var content: string,
-    buffer: Buffer;
-
-content = fs.readFileSync('testfile', 'utf8');
-content = fs.readFileSync('testfile', {encoding : 'utf8'});
-buffer = fs.readFileSync('testfile');
-buffer = fs.readFileSync('testfile', {flag : 'r'});
-fs.readFile('testfile', 'utf8', (err, data) => content = data);
-fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data);
-fs.readFile('testfile', (err, data) => buffer = data);
-fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data);
-
-class Networker extends events.EventEmitter {
-    constructor() {
-        super();
-
-        this.emit("mingling");
+    {
+        var content: string;
+        var buffer: Buffer;
+        
+        content = fs.readFileSync('testfile', 'utf8');
+        content = fs.readFileSync('testfile', {encoding : 'utf8'});
+        buffer = fs.readFileSync('testfile');
+        buffer = fs.readFileSync('testfile', {flag : 'r'});
+        fs.readFile('testfile', 'utf8', (err, data) => content = data);
+        fs.readFile('testfile', {encoding : 'utf8'}, (err, data) => content = data);
+        fs.readFile('testfile', (err, data) => buffer = data);
+        fs.readFile('testfile', {flag : 'r'}, (err, data) => buffer = data);
+    }
+    
+    {
+        var errno: string;
+        fs.readFile('testfile', (err, data) => {
+            if (err && err.errno) {
+                errno = err.errno;
+            }
+        });
+    }
+    
+    {
+        fs.mkdtemp('/tmp/foo-', (err, folder) => {
+            console.log(folder);
+            // Prints: /tmp/foo-itXde2
+        });
+    }
+    
+    {
+        var tempDir: string;
+        tempDir = fs.mkdtempSync('/tmp/foo-');
+    }
+    
+    {
+        fs.watch('/tmp/foo-', (event, filename) => {
+          console.log(event, filename);
+        });
+        
+        fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
+          console.log(event, filename);
+        });
+        
+        fs.watch('/tmp/foo-', {
+          recursive: true,
+          persistent: true,
+          encoding: 'utf8'
+        }, (event, filename) => {
+          console.log(event, filename);
+        });
+    }
+    
+    {
+        fs.access('/path/to/folder', (err) => {});
+        
+        fs.access(Buffer.from(''), (err) => {});
+        
+        fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => {});
+        
+        fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => {});
+        
+        fs.accessSync('/path/to/folder');
+        
+        fs.accessSync(Buffer.from(''));
+        
+        fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK);
+        
+        fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK);
     }
 }
 
-var errno: number;
-fs.readFile('testfile', (err, data) => {
-    if (err && err.errno) {
-        errno = err.errno;
-    }
-});
-
-fs.mkdtemp('/tmp/foo-', (err, folder) => {
-    console.log(folder);
-    // Prints: /tmp/foo-itXde2
-});
-
-var tempDir: string;
-tempDir = fs.mkdtempSync('/tmp/foo-');
-
-fs.watch('/tmp/foo-', (event, filename) => {
-  console.log(event, filename);
-});
-
-fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
-  console.log(event, filename);
-});
-
-fs.watch('/tmp/foo-', {
-  recursive: true,
-  persistent: true,
-  encoding: 'utf8'
-}, (event, filename) => {
-  console.log(event, filename);
-});
-
 ///////////////////////////////////////////////////////
 /// Buffer tests : https://nodejs.org/api/buffer.html
 ///////////////////////////////////////////////////////
@@ -263,9 +320,11 @@ function bufferTests() {
         let buffer = new Buffer('123');
         let val: [number, number];
 
+        /* comment out for --target es5
         for (let entry of buffer.entries()) {
             val = entry;
         }
+         */
     }
 
     {
@@ -286,18 +345,22 @@ function bufferTests() {
         let buffer = new Buffer('123');
         let val: number;
 
+        /* comment out for --target es5
         for (let key of buffer.keys()) {
             val = key;
         }
+         */
     }
 
     {
         let buffer = new Buffer('123');
         let val: number;
 
+        /* comment out for --target es5
         for (let value of buffer.values()) {
             val = value;
         }
+         */
     }
 
     // Imported Buffer from buffer module works properly
@@ -320,23 +383,36 @@ function bufferTests() {
 /// Url tests : http://nodejs.org/api/url.html
 ////////////////////////////////////////////////////
 
-url.format(url.parse('http://www.example.com/xyz'));
+namespace url_tests {
+    {
+        url.format(url.parse('http://www.example.com/xyz'));
+        
+        // https://google.com/search?q=you're%20a%20lizard%2C%20gary
+        url.format({
+            protocol: 'https',
+            host: "google.com",
+            pathname: 'search',
+            query: { q: "you're a lizard, gary" }
+        });   
+    }
 
-// https://google.com/search?q=you're%20a%20lizard%2C%20gary
-url.format({
-    protocol: 'https',
-    host: "google.com",
-    pathname: 'search',
-    query: { q: "you're a lizard, gary" }
-});
+    {
+        var helloUrl = url.parse('http://example.com/?hello=world', true)
+        assert.equal(helloUrl.query.hello, 'world');
+    }
+}
 
-var helloUrl = url.parse('http://example.com/?hello=world', true)
-assert.equal(helloUrl.query.hello, 'world');
+/////////////////////////////////////////////////////
+/// util tests : https://nodejs.org/api/util.html ///
+/////////////////////////////////////////////////////
 
-
-// Old and new util.inspect APIs
-util.inspect(["This is nice"], false, 5);
-util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
+namespace util_tests {
+    {
+        // Old and new util.inspect APIs
+        util.inspect(["This is nice"], false, 5);
+        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });    
+    }
+}
 
 ////////////////////////////////////////////////////
 /// Stream tests : http://nodejs.org/api/stream.html
@@ -415,51 +491,57 @@ function simplified_stream_ctor_test() {
     })
 }
 
-////////////////////////////////////////////////////
-/// Crypto tests : http://nodejs.org/api/crypto.html
-////////////////////////////////////////////////////
+////////////////////////////////////////////////////////
+/// Crypto tests : http://nodejs.org/api/crypto.html ///
+////////////////////////////////////////////////////////
 
-var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+namespace crypto_tests {
+    {
+        var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+    }
+    
+    {
+        let hmac: crypto.Hmac;
+        (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
+            let hash: Buffer | string = hmac.read();
+        });
+    }
+    
+    {
+        //crypto_cipher_decipher_string_test
+        let key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: string = "This is the clear text.";
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherText: string = cipher.update(clearText, "utf8", "hex");
+        cipherText += cipher.final("hex");
 
-{
-    let hmac: crypto.Hmac;
-    (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
-        let hash: Buffer|string = hmac.read();
-    });
-}
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let clearText2: string = decipher.update(cipherText, "hex", "utf8");
+        clearText2 += decipher.final("utf8");
 
-function crypto_cipher_decipher_string_test() {
-	var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-	var clearText:string = "This is the clear text.";
-	var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-	var cipherText:string = cipher.update(clearText, "utf8", "hex");
-	cipherText += cipher.final("hex");
+        assert.equal(clearText2, clearText);
+    }
 
-	var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-	var clearText2:string = decipher.update(cipherText, "hex", "utf8");
-	clearText2 += decipher.final("utf8");
+    {
+        //crypto_cipher_decipher_buffer_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
 
-	assert.equal(clearText2, clearText);
-}
+        let cipherText: Buffer = Buffer.concat(cipherBuffers);
 
-function crypto_cipher_decipher_buffer_test() {
-	var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-	var clearText:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
-	var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-	var cipherBuffers:Buffer[] = [];
-	cipherBuffers.push(cipher.update(clearText));
-	cipherBuffers.push(cipher.final());
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
 
-	var cipherText:Buffer = Buffer.concat(cipherBuffers);
+        let clearText2: Buffer = Buffer.concat(decipherBuffers);
 
-	var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-	var decipherBuffers:Buffer[] = [];
-	decipherBuffers.push(decipher.update(cipherText));
-	decipherBuffers.push(decipher.final());
-
-	var clearText2:Buffer = Buffer.concat(decipherBuffers);
-
-	assert.deepEqual(clearText2, clearText);
+        assert.deepEqual(clearText2, clearText);
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -472,33 +554,24 @@ var ctx: tls.SecureContext = tls.createSecureContext({
 });
 var blah = ctx.context;
 
-var tlsOpts: tls.TlsOptions = {
+var connOpts: tls.ConnectionOptions = {
 	host: "127.0.0.1",
 	port: 55
 };
-var tlsSocket = tls.connect(tlsOpts);
-
+var tlsSocket = tls.connect(connOpts);
 
 ////////////////////////////////////////////////////
-
-// Make sure .listen() and .close() retuern a Server instance
-http.createServer().listen(0).close().address();
-net.createServer().listen(0).close().address();
-
-var request = http.request('http://0.0.0.0');
-request.once('error', function () {});
-request.setNoDelay(true);
-request.abort();
-
-////////////////////////////////////////////////////
-/// Http tests : http://nodejs.org/api/http.html
+/// Http tests : http://nodejs.org/api/http.html ///
 ////////////////////////////////////////////////////
+
 namespace http_tests {
-    // Status codes
-    var code = 100;
-    var codeMessage = http.STATUS_CODES['400'];
-    var codeMessage = http.STATUS_CODES[400];
+    {
+        // Status codes
+        var codeMessage = http.STATUS_CODES['400'];
+        var codeMessage = http.STATUS_CODES[400];
+    }
 
+    {
 	var agent: http.Agent = new http.Agent({
 		keepAlive: true,
 		keepAliveMsecs: 10000,
@@ -508,20 +581,29 @@ namespace http_tests {
 
 	var agent: http.Agent = http.globalAgent;
 
-	http.request({
-		agent: false
-	});
-	http.request({
-		agent: agent
-	});
-	http.request({
-		agent: undefined
-	});
+	http.request({agent: false});
+	http.request({agent: agent});
+	http.request({agent: undefined});
+    }
+    
+    {
+        // Make sure .listen() and .close() retuern a Server instance
+        http.createServer().listen(0).close().address();
+        net.createServer().listen(0).close().address();
+    }
+    
+    {
+        var request = http.request('http://0.0.0.0');
+        request.once('error', function() { });
+        request.setNoDelay(true);
+        request.abort();
+    }
 }
 
-////////////////////////////////////////////////////
-/// Https tests : http://nodejs.org/api/https.html
-////////////////////////////////////////////////////
+//////////////////////////////////////////////////////
+/// Https tests : http://nodejs.org/api/https.html ///
+//////////////////////////////////////////////////////
+
 namespace https_tests {
     var agent: https.Agent = new https.Agent({
         keepAlive: true,
@@ -565,14 +647,16 @@ namespace tty_tests {
 /// Dgram tests : http://nodejs.org/api/dgram.html
 ////////////////////////////////////////////////////
 
-var ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
-});
-ds.bind();
-ds.bind(41234);
-var ai: dgram.AddressInfo = ds.address();
-ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
-});
-ds.send(new Buffer("hello"), 5000, "127.0.0.1");
+namespace dgram_tests {
+    var ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
+    });
+    ds.bind();
+    ds.bind(41234);
+    var ai: dgram.AddressInfo = ds.address();
+    ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
+    });
+    ds.send(new Buffer("hello"), 5000, "127.0.0.1");
+}
 
 ////////////////////////////////////////////////////
 ///Querystring tests : https://nodejs.org/api/querystring.html
@@ -668,82 +752,82 @@ namespace path_tests {
     path.isAbsolute('.')         // false
 
     path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb')
-// returns
-//    '..\\..\\impl\\bbb'
+    // returns
+    //    '..\\..\\impl\\bbb'
 
     path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb')
-// returns
-//    '../../impl/bbb'
+    // returns
+    //    '../../impl/bbb'
 
     path.dirname('/foo/bar/baz/asdf/quux')
-// returns
-//    '/foo/bar/baz/asdf'
+    // returns
+    //    '/foo/bar/baz/asdf'
 
     path.basename('/foo/bar/baz/asdf/quux.html')
-// returns
-//    'quux.html'
+    // returns
+    //    'quux.html'
 
     path.basename('/foo/bar/baz/asdf/quux.html', '.html')
-// returns
-//    'quux'
+    // returns
+    //    'quux'
 
     path.extname('index.html')
-// returns
-//    '.html'
+    // returns
+    //    '.html'
 
     path.extname('index.coffee.md')
-// returns
-//    '.md'
+    // returns
+    //    '.md'
 
     path.extname('index.')
-// returns
-//    '.'
+    // returns
+    //    '.'
 
     path.extname('index')
-// returns
-//    ''
+    // returns
+    //    ''
 
     'foo/bar/baz'.split(path.sep)
-// returns
-//        ['foo', 'bar', 'baz']
+    // returns
+    //        ['foo', 'bar', 'baz']
 
     'foo\\bar\\baz'.split(path.sep)
-// returns
-//        ['foo', 'bar', 'baz']
+    // returns
+    //        ['foo', 'bar', 'baz']
 
     console.log(process.env.PATH)
-// '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
+    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
 
     process.env.PATH.split(path.delimiter)
-// returns
-//        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
+    // returns
+    //        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
 
     console.log(process.env.PATH)
-// 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
+    // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
 
     process.env.PATH.split(path.delimiter)
-// returns
-//        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
+    // returns
+    //        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
 
     path.parse('/home/user/dir/file.txt')
-// returns
-//    {
-//        root : "/",
-//        dir : "/home/user/dir",
-//        base : "file.txt",
-//        ext : ".txt",
-//        name : "file"
-//    }
+    // returns
+    //    {
+    //        root : "/",
+    //        dir : "/home/user/dir",
+    //        base : "file.txt",
+    //        ext : ".txt",
+    //        name : "file"
+    //    }
 
     path.parse('C:\\path\\dir\\index.html')
-// returns
-//    {
-//        root : "C:\",
-//        dir : "C:\path\dir",
-//        base : "index.html",
-//        ext : ".html",
-//        name : "index"
-//    }
+    // returns
+    //    {
+    //        root : "C:\",
+    //        dir : "C:\path\dir",
+    //        base : "index.html",
+    //        ext : ".html",
+    //        name : "index"
+    //    }
 
     path.format({
         root : "/",
@@ -752,8 +836,8 @@ namespace path_tests {
         ext : ".txt",
         name : "file"
     });
-// returns
-//    '/home/user/dir/file.txt'
+    // returns
+    //    '/home/user/dir/file.txt'
 }
 
 ////////////////////////////////////////////////////
@@ -872,20 +956,28 @@ namespace string_decoder_tests {
 /// Child Process tests: https://nodejs.org/api/child_process.html ///
 //////////////////////////////////////////////////////////////////////
 
-childProcess.exec("echo test");
-childProcess.spawnSync("echo test");
+namespace child_process_tests {
+    {
+        childProcess.exec("echo test");
+        childProcess.spawnSync("echo test");    
+    }
+}
 
 //////////////////////////////////////////////////////////////////////
 /// cluster tests: https://nodejs.org/api/cluster.html ///
 //////////////////////////////////////////////////////////////////////
 
-cluster.fork();
-Object.keys(cluster.workers).forEach(key => {
-    const worker = cluster.workers[key];
-    if (worker.isDead()) {
-        console.log('worker %d is dead', worker.process.pid);
+namespace cluster_tests　{
+    {
+        cluster.fork();
+        Object.keys(cluster.workers).forEach(key => {
+            const worker = cluster.workers[key];
+            if (worker.isDead()) {
+                console.log('worker %d is dead', worker.process.pid);
+            }
+        });
     }
-});
+}
 
 ////////////////////////////////////////////////////
 /// os tests : https://nodejs.org/api/os.html
@@ -982,6 +1074,31 @@ namespace vm_tests {
     }
 }
 
+/////////////////////////////////////////////////////
+/// Timers tests : https://nodejs.org/api/timers.html
+/////////////////////////////////////////////////////
+
+namespace timers_tests {
+    {
+        let immediateId = timers.setImmediate(function(){ console.log("immediate"); });
+        timers.clearImmediate(immediateId);
+    }
+    {
+        let counter = 0;
+        let timeout = timers.setInterval(function(){ console.log("interval"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearInterval(timeout);
+    }
+    {
+        let counter = 0;
+        let timeout = timers.setTimeout(function(){ console.log("timeout"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearTimeout(timeout);
+    }
+}
+
 /////////////////////////////////////////////////////////
 /// Errors Tests : https://nodejs.org/api/errors.html ///
 /////////////////////////////////////////////////////////
@@ -996,9 +1113,192 @@ namespace errors_tests {
     }
 }
 
-namespace process_tests{
+///////////////////////////////////////////////////////////
+/// Process Tests : https://nodejs.org/api/process.html ///
+///////////////////////////////////////////////////////////
+
+import * as p from "process";
+namespace process_tests {
     {
         var eventEmitter: events.EventEmitter;
-         eventEmitter = process;                // Test that process implements EventEmitter...
+        eventEmitter = process;                // Test that process implements EventEmitter...
+        
+        var _p: NodeJS.Process = process;
+        _p = p;
     }
-}
\ No newline at end of file
+}
+
+///////////////////////////////////////////////////////////
+/// Console Tests : https://nodejs.org/api/console.html ///
+///////////////////////////////////////////////////////////
+
+import * as c from "console";
+namespace console_tests {
+    {
+        var _c: Console = console;
+        _c = c;
+    }
+}
+
+///////////////////////////////////////////////////
+/// Net Tests : https://nodejs.org/api/net.html ///
+///////////////////////////////////////////////////
+
+namespace net_tests {
+    {
+        // Make sure .listen() and .close() retuern a Server instance
+        net.createServer().listen(0).close().address();
+    }
+}
+
+/*****************************************************************************
+ *                                                                           *
+ * The following tests are the modules not mentioned in document but existed *
+ *                                                                           *
+ *****************************************************************************/
+
+///////////////////////////////////////////////////////////
+/// Constants Tests                                     ///
+///////////////////////////////////////////////////////////
+
+import * as constants from 'constants';
+namespace constants_tests {
+    var str: string;
+    var num: number;
+    num = constants.SIGHUP
+    num = constants.SIGINT
+    num = constants.SIGQUIT
+    num = constants.SIGILL
+    num = constants.SIGTRAP
+    num = constants.SIGABRT
+    num = constants.SIGIOT
+    num = constants.SIGBUS
+    num = constants.SIGFPE
+    num = constants.SIGKILL
+    num = constants.SIGUSR1
+    num = constants.SIGSEGV
+    num = constants.SIGUSR2
+    num = constants.SIGPIPE
+    num = constants.SIGALRM
+    num = constants.SIGTERM
+    num = constants.SIGCHLD
+    num = constants.SIGSTKFLT
+    num = constants.SIGCONT
+    num = constants.SIGSTOP
+    num = constants.SIGTSTP
+    num = constants.SIGTTIN
+    num = constants.SIGTTOU
+    num = constants.SIGURG
+    num = constants.SIGXCPU
+    num = constants.SIGXFSZ
+    num = constants.SIGVTALRM
+    num = constants.SIGPROF
+    num = constants.SIGWINCH
+    num = constants.SIGIO
+    num = constants.SIGPOLL
+    num = constants.SIGPWR
+    num = constants.SIGSYS
+    num = constants.SIGUNUSED
+    num = constants.O_RDONLY
+    num = constants.O_WRONLY
+    num = constants.O_RDWR
+    num = constants.S_IFMT
+    num = constants.S_IFREG
+    num = constants.S_IFDIR
+    num = constants.S_IFCHR
+    num = constants.S_IFBLK
+    num = constants.S_IFIFO
+    num = constants.S_IFLNK
+    num = constants.S_IFSOCK
+    num = constants.O_CREAT
+    num = constants.O_EXCL
+    num = constants.O_NOCTTY
+    num = constants.O_TRUNC
+    num = constants.O_APPEND
+    num = constants.O_DIRECTORY
+    num = constants.O_NOATIME
+    num = constants.O_NOFOLLOW
+    num = constants.O_SYNC
+    num = constants.O_DIRECT
+    num = constants.O_NONBLOCK
+    num = constants.S_IRWXU
+    num = constants.S_IRUSR
+    num = constants.S_IWUSR
+    num = constants.S_IXUSR
+    num = constants.S_IRWXG
+    num = constants.S_IRGRP
+    num = constants.S_IWGRP
+    num = constants.S_IXGRP
+    num = constants.S_IRWXO
+    num = constants.S_IROTH
+    num = constants.S_IWOTH
+    num = constants.S_IXOTH
+    num = constants.F_OK
+    num = constants.R_OK
+    num = constants.W_OK
+    num = constants.X_OK
+    num = constants.SSL_OP_ALL
+    num = constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
+    num = constants.SSL_OP_CIPHER_SERVER_PREFERENCE
+    num = constants.SSL_OP_CISCO_ANYCONNECT
+    num = constants.SSL_OP_COOKIE_EXCHANGE
+    num = constants.SSL_OP_CRYPTOPRO_TLSEXT_BUG
+    num = constants.SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
+    num = constants.SSL_OP_EPHEMERAL_RSA
+    num = constants.SSL_OP_LEGACY_SERVER_CONNECT
+    num = constants.SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
+    num = constants.SSL_OP_MICROSOFT_SESS_ID_BUG
+    num = constants.SSL_OP_MSIE_SSLV2_RSA_PADDING
+    num = constants.SSL_OP_NETSCAPE_CA_DN_BUG
+    num = constants.SSL_OP_NETSCAPE_CHALLENGE_BUG
+    num = constants.SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
+    num = constants.SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
+    num = constants.SSL_OP_NO_COMPRESSION
+    num = constants.SSL_OP_NO_QUERY_MTU
+    num = constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+    num = constants.SSL_OP_NO_SSLv2
+    num = constants.SSL_OP_NO_SSLv3
+    num = constants.SSL_OP_NO_TICKET
+    num = constants.SSL_OP_NO_TLSv1
+    num = constants.SSL_OP_NO_TLSv1_1
+    num = constants.SSL_OP_NO_TLSv1_2
+    num = constants.SSL_OP_PKCS1_CHECK_1
+    num = constants.SSL_OP_PKCS1_CHECK_2
+    num = constants.SSL_OP_SINGLE_DH_USE
+    num = constants.SSL_OP_SINGLE_ECDH_USE
+    num = constants.SSL_OP_SSLEAY_080_CLIENT_DH_BUG
+    num = constants.SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
+    num = constants.SSL_OP_TLS_BLOCK_PADDING_BUG
+    num = constants.SSL_OP_TLS_D5_BUG
+    num = constants.SSL_OP_TLS_ROLLBACK_BUG
+    num = constants.ENGINE_METHOD_RSA
+    num = constants.ENGINE_METHOD_DSA
+    num = constants.ENGINE_METHOD_DH
+    num = constants.ENGINE_METHOD_RAND
+    num = constants.ENGINE_METHOD_ECDH
+    num = constants.ENGINE_METHOD_ECDSA
+    num = constants.ENGINE_METHOD_CIPHERS
+    num = constants.ENGINE_METHOD_DIGESTS
+    num = constants.ENGINE_METHOD_STORE
+    num = constants.ENGINE_METHOD_PKEY_METHS
+    num = constants.ENGINE_METHOD_PKEY_ASN1_METHS
+    num = constants.ENGINE_METHOD_ALL
+    num = constants.ENGINE_METHOD_NONE
+    num = constants.DH_CHECK_P_NOT_SAFE_PRIME
+    num = constants.DH_CHECK_P_NOT_PRIME
+    num = constants.DH_UNABLE_TO_CHECK_GENERATOR
+    num = constants.DH_NOT_SUITABLE_GENERATOR
+    num = constants.NPN_ENABLED
+    num = constants.ALPN_ENABLED
+    num = constants.RSA_PKCS1_PADDING
+    num = constants.RSA_SSLV23_PADDING
+    num = constants.RSA_NO_PADDING
+    num = constants.RSA_PKCS1_OAEP_PADDING
+    num = constants.RSA_X931_PADDING
+    num = constants.RSA_PKCS1_PSS_PADDING
+    num = constants.POINT_CONVERSION_COMPRESSED
+    num = constants.POINT_CONVERSION_UNCOMPRESSED
+    num = constants.POINT_CONVERSION_HYBRID
+    str = constants.defaultCoreCipherList
+    str = constants.defaultCipherList
+}
diff --git a/node/node.d.ts b/node/node.d.ts
index 6b043fbe83..81b13e4e1d 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -233,7 +233,7 @@ declare var Buffer: {
 ************************************************/
 declare namespace NodeJS {
     export interface ErrnoException extends Error {
-        errno?: number;
+        errno?: string;
         code?: string;
         path?: string;
         syscall?: string;
@@ -281,8 +281,8 @@ declare namespace NodeJS {
     }
 
     export interface ReadWriteStream extends ReadableStream, WritableStream {
-      pause(): ReadWriteStream;
-      resume(): ReadWriteStream;
+        pause(): ReadWriteStream;
+        resume(): ReadWriteStream;
     }
 
     export interface Events extends EventEmitter { }
@@ -372,7 +372,7 @@ declare namespace NodeJS {
         arch: string;
         platform: string;
         memoryUsage(): MemoryUsage;
-        nextTick(callback: Function): void;
+        nextTick(callback: Function, ...args: any[]): void;
         umask(mask?: number): number;
         uptime(): number;
         hrtime(time?: number[]): number[];
@@ -456,15 +456,17 @@ declare namespace NodeJS {
     }
 }
 
+interface IterableIterator<T> { }
+
 /**
  * @deprecated
  */
 interface NodeBuffer extends Uint8Array {
     write(string: string, offset?: number, length?: number, encoding?: string): number;
     toString(encoding?: string, start?: number, end?: number): string;
-    toJSON(): any;
+    toJSON(): {type: 'Buffer', data: any[]};
     equals(otherBuffer: Buffer): boolean;
-    compare(otherBuffer: Buffer): number;
+    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
     copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
     slice(start?: number, end?: number): Buffer;
     writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
@@ -586,10 +588,11 @@ declare module "http" {
         agent?: Agent | boolean;
     }
 
-    export interface Server extends events.EventEmitter, net.Server {
+    export interface Server extends net.Server {
         setTimeout(msecs: number, callback: Function): void;
         maxHeadersCount: number;
         timeout: number;
+        listening: boolean;
     }
     /**
      * @deprecated Use IncomingMessage
@@ -597,7 +600,7 @@ declare module "http" {
     export interface ServerRequest extends IncomingMessage {
         connection: net.Socket;
     }
-    export interface ServerResponse extends events.EventEmitter, stream.Writable {
+    export interface ServerResponse extends stream.Writable {
         // Extended base methods
         write(buffer: Buffer): boolean;
         write(buffer: Buffer, cb?: Function): boolean;
@@ -627,7 +630,7 @@ declare module "http" {
         end(str: string, encoding?: string, cb?: Function): void;
         end(data?: any, encoding?: string): void;
     }
-    export interface ClientRequest extends events.EventEmitter, stream.Writable {
+    export interface ClientRequest extends stream.Writable {
         // Extended base methods
         write(buffer: Buffer): boolean;
         write(buffer: Buffer, cb?: Function): boolean;
@@ -653,8 +656,11 @@ declare module "http" {
         end(str: string, encoding?: string, cb?: Function): void;
         end(data?: any, encoding?: string): void;
     }
-    export interface IncomingMessage extends events.EventEmitter, stream.Readable {
+    export interface IncomingMessage extends stream.Readable {
         httpVersion: string;
+        httpVersionMajor: string;
+        httpVersionMinor: string;
+        connection: net.Socket;
         headers: any;
         rawHeaders: string[];
         trailers: any;
@@ -736,17 +742,30 @@ declare module "http" {
 declare module "cluster" {
     import * as child from "child_process";
     import * as events from "events";
+    import * as net from "net";
 
+    // interfaces
     export interface ClusterSettings {
+        execArgv?: string[]; // default: process.execArgv
         exec?: string;
         args?: string[];
         silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+    }
+
+    export interface ClusterSetupMasterSettings {
+        exec?: string;  // default: process.argv[1]
+        args?: string[];  // default: process.argv.slice(2)
+        silent?: boolean;  // default: false
+        stdio?: any[];
     }
 
     export interface Address {
         address: string;
         port: number;
-        addressType: string;
+        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
     }
 
     export class Worker extends events.EventEmitter {
@@ -761,33 +780,153 @@ declare module "cluster" {
         isDead(): boolean;
     }
 
-    export var settings: ClusterSettings;
+    export interface Cluster extends events.EventEmitter {
+        Worker: Worker;
+        disconnect(callback?: Function): void;
+        fork(env?: any): Worker;
+        isMaster: boolean;
+        isWorker: boolean;
+        // TODO: cluster.schedulingPolicy
+        settings: ClusterSettings;
+        setupMaster(settings?: ClusterSetupMasterSettings): void;
+        worker: Worker;
+        workers: {
+            [index: string]: Worker
+        };
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. exit
+         *   3. fork
+         *   4. listening
+         *   5. message
+         *   6. online
+         *   7. setup
+         */
+        addListener(event: string, listener: Function): this;
+        addListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        addListener(event: "fork", listener: (worker: Worker) => void): this;
+        addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        addListener(event: "online", listener: (worker: Worker) => void): this;
+        addListener(event: "setup", listener: (settings: any) => void): this;
+
+        on(event: string, listener: Function): this;
+        on(event: "disconnect", listener: (worker: Worker) => void): this;
+        on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        on(event: "fork", listener: (worker: Worker) => void): this;
+        on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        on(event: "online", listener: (worker: Worker) => void): this;
+        on(event: "setup", listener: (settings: any) => void): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "disconnect", listener: (worker: Worker) => void): this;
+        once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        once(event: "fork", listener: (worker: Worker) => void): this;
+        once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        once(event: "online", listener: (worker: Worker) => void): this;
+        once(event: "setup", listener: (settings: any) => void): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependListener(event: "online", listener: (worker: Worker) => void): this;
+        prependListener(event: "setup", listener: (settings: any) => void): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+
+    }
+
+    export function disconnect(callback ?: Function): void;
+    export function fork(env?: any): Worker;
     export var isMaster: boolean;
     export var isWorker: boolean;
-    export function setupMaster(settings?: ClusterSettings): void;
-    export function fork(env?: any): Worker;
-    export function disconnect(callback?: Function): void;
+    // TODO: cluster.schedulingPolicy
+    export var settings: ClusterSettings;
+    export function setupMaster(settings?: ClusterSetupMasterSettings): void;
     export var worker: Worker;
     export var workers: {
         [index: string]: Worker
     };
 
-    // Event emitter
-    export function addListener(event: string, listener: Function): void;
-    export function on(event: "disconnect", listener: (worker: Worker) => void): void;
-    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): void;
-    export function on(event: "fork", listener: (worker: Worker) => void): void;
-    export function on(event: "listening", listener: (worker: Worker, address: any) => void): void;
-    export function on(event: "message", listener: (worker: Worker, message: any) => void): void;
-    export function on(event: "online", listener: (worker: Worker) => void): void;
-    export function on(event: "setup", listener: (settings: any) => void): void;
-    export function on(event: string, listener: Function): any;
-    export function once(event: string, listener: Function): void;
-    export function removeListener(event: string, listener: Function): void;
-    export function removeAllListeners(event?: string): void;
-    export function setMaxListeners(n: number): void;
+    /**
+     * events.EventEmitter
+     *   1. disconnect
+     *   2. exit
+     *   3. fork
+     *   4. listening
+     *   5. message
+     *   6. online
+     *   7. setup
+     */
+    export function addListener(event: string, listener: Function): Cluster;
+    export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function on(event: string, listener: Function): Cluster;
+    export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function on(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function once(event: string, listener: Function): Cluster;
+    export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function once(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function removeListener(event: string, listener: Function): Cluster;
+    export function removeAllListeners(event?: string): Cluster;
+    export function setMaxListeners(n: number): Cluster;
+    export function getMaxListeners(): number;
     export function listeners(event: string): Function[];
     export function emit(event: string, ...args: any[]): boolean;
+    export function listenerCount(type: string): number;
+
+    export function prependListener(event: string, listener: Function): Cluster;
+    export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function prependOnceListener(event: string, listener: Function): Cluster;
+    export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function eventNames(): string[];
 }
 
 declare module "zlib" {
@@ -880,21 +1019,142 @@ declare module "os" {
         internal: boolean;
     }
 
-    export function tmpdir(): string;
-    export function homedir(): string;
-    export function endianness(): "BE" | "LE";
     export function hostname(): string;
-    export function type(): string;
-    export function platform(): string;
-    export function arch(): string;
-    export function release(): string;
-    export function uptime(): number;
     export function loadavg(): number[];
-    export function totalmem(): number;
+    export function uptime(): number;
     export function freemem(): number;
+    export function totalmem(): number;
     export function cpus(): CpuInfo[];
+    export function type(): string;
+    export function release(): string;
     export function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
+    export function homedir(): string;
+    export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string }
+    export var constants: {
+        UV_UDP_REUSEADDR: number,
+        errno: {
+            SIGHUP: number;
+            SIGINT: number;
+            SIGQUIT: number;
+            SIGILL: number;
+            SIGTRAP: number;
+            SIGABRT: number;
+            SIGIOT: number;
+            SIGBUS: number;
+            SIGFPE: number;
+            SIGKILL: number;
+            SIGUSR1: number;
+            SIGSEGV: number;
+            SIGUSR2: number;
+            SIGPIPE: number;
+            SIGALRM: number;
+            SIGTERM: number;
+            SIGCHLD: number;
+            SIGSTKFLT: number;
+            SIGCONT: number;
+            SIGSTOP: number;
+            SIGTSTP: number;
+            SIGTTIN: number;
+            SIGTTOU: number;
+            SIGURG: number;
+            SIGXCPU: number;
+            SIGXFSZ: number;
+            SIGVTALRM: number;
+            SIGPROF: number;
+            SIGWINCH: number;
+            SIGIO: number;
+            SIGPOLL: number;
+            SIGPWR: number;
+            SIGSYS: number;
+            SIGUNUSED: number;
+        },
+        signals: {
+            E2BIG: number;
+            EACCES: number;
+            EADDRINUSE: number;
+            EADDRNOTAVAIL: number;
+            EAFNOSUPPORT: number;
+            EAGAIN: number;
+            EALREADY: number;
+            EBADF: number;
+            EBADMSG: number;
+            EBUSY: number;
+            ECANCELED: number;
+            ECHILD: number;
+            ECONNABORTED: number;
+            ECONNREFUSED: number;
+            ECONNRESET: number;
+            EDEADLK: number;
+            EDESTADDRREQ: number;
+            EDOM: number;
+            EDQUOT: number;
+            EEXIST: number;
+            EFAULT: number;
+            EFBIG: number;
+            EHOSTUNREACH: number;
+            EIDRM: number;
+            EILSEQ: number;
+            EINPROGRESS: number;
+            EINTR: number;
+            EINVAL: number;
+            EIO: number;
+            EISCONN: number;
+            EISDIR: number;
+            ELOOP: number;
+            EMFILE: number;
+            EMLINK: number;
+            EMSGSIZE: number;
+            EMULTIHOP: number;
+            ENAMETOOLONG: number;
+            ENETDOWN: number;
+            ENETRESET: number;
+            ENETUNREACH: number;
+            ENFILE: number;
+            ENOBUFS: number;
+            ENODATA: number;
+            ENODEV: number;
+            ENOENT: number;
+            ENOEXEC: number;
+            ENOLCK: number;
+            ENOLINK: number;
+            ENOMEM: number;
+            ENOMSG: number;
+            ENOPROTOOPT: number;
+            ENOSPC: number;
+            ENOSR: number;
+            ENOSTR: number;
+            ENOSYS: number;
+            ENOTCONN: number;
+            ENOTDIR: number;
+            ENOTEMPTY: number;
+            ENOTSOCK: number;
+            ENOTSUP: number;
+            ENOTTY: number;
+            ENXIO: number;
+            EOPNOTSUPP: number;
+            EOVERFLOW: number;
+            EPERM: number;
+            EPIPE: number;
+            EPROTO: number;
+            EPROTONOSUPPORT: number;
+            EPROTOTYPE: number;
+            ERANGE: number;
+            EROFS: number;
+            ESPIPE: number;
+            ESRCH: number;
+            ESTALE: number;
+            ETIME: number;
+            ETIMEDOUT: number;
+            ETXTBSY: number;
+            EWOULDBLOCK: number;
+            EXDEV: number;
+        },
+    };
+    export function arch(): string;
+    export function platform(): string;
+    export function tmpdir(): string;
     export var EOL: string;
+    export function endianness(): "BE" | "LE";
 }
 
 declare module "https" {
@@ -914,7 +1174,7 @@ declare module "https" {
         requestCert?: boolean;
         rejectUnauthorized?: boolean;
         NPNProtocols?: any;
-        SNICallback?: (servername: string, cb:(err:Error,ctx:tls.SecureContext)=>any) => any;
+        SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
     }
 
     export interface RequestOptions extends http.RequestOptions {
@@ -967,7 +1227,7 @@ declare module "punycode" {
 
 declare module "repl" {
     import * as stream from "stream";
-    import * as events from "events";
+    import * as readline from "readline";
 
     export interface ReplOptions {
         prompt?: string;
@@ -979,8 +1239,17 @@ declare module "repl" {
         useGlobal?: boolean;
         ignoreUndefined?: boolean;
         writer?: Function;
+        completer?: Function;
+        replMode?: any;
+        breakEvalOnSigint?: any;
     }
-    export function start(options: ReplOptions): events.EventEmitter;
+
+    export interface REPLServer extends readline.ReadLine {
+        defineCommand(keyword: string, cmd: Function | { help: string, action: Function }): void;
+        displayPrompt(preserveCursor?: boolean): void
+    }
+
+    export function start(options: ReplOptions): REPLServer;
 }
 
 declare module "readline" {
@@ -1261,18 +1530,50 @@ declare module "url" {
 }
 
 declare module "dns" {
+    export interface MxRecord {
+        exchange: string,
+        priority: number
+    }
+
     export function lookup(domain: string, family: number, callback: (err: Error, address: string, family: number) => void): string;
     export function lookup(domain: string, callback: (err: Error, address: string, family: number) => void): string;
     export function resolve(domain: string, rrtype: string, callback: (err: Error, addresses: string[]) => void): string[];
     export function resolve(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
     export function resolve4(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
     export function resolve6(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
-    export function resolveMx(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
+    export function resolveMx(domain: string, callback: (err: Error, addresses: MxRecord[]) =>void ): string[];
     export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
     export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
     export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
     export function resolveCname(domain: string, callback: (err: Error, addresses: string[]) => void): string[];
     export function reverse(ip: string, callback: (err: Error, domains: string[]) => void): string[];
+    export function setServers(servers: string[]): void;
+
+    //Error codes
+    export var NODATA: string;
+    export var FORMERR: string;
+    export var SERVFAIL: string;
+    export var NOTFOUND: string;
+    export var NOTIMP: string;
+    export var REFUSED: string;
+    export var BADQUERY: string;
+    export var BADNAME: string;
+    export var BADFAMILY: string;
+    export var BADRESP: string;
+    export var CONNREFUSED: string;
+    export var TIMEOUT: string;
+    export var EOF: string;
+    export var FILE: string;
+    export var NOMEM: string;
+    export var DESTRUCTION: string;
+    export var BADSTR: string;
+    export var BADFLAGS: string;
+    export var NONAME: string;
+    export var BADHINTS: string;
+    export var NOTINITIALIZED: string;
+    export var LOADIPHLPAPI: string;
+    export var ADDRGETNETWORKPARAMS: string;
+    export var CANCELLED: string;
 }
 
 declare module "net" {
@@ -1375,19 +1676,35 @@ declare module "dgram" {
         port: number;
     }
 
-    export function createSocket(type: string, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    interface BindOptions {
+        port: number;
+        address?: string;
+        exclusive?: boolean;
+    }
 
-    interface Socket extends events.EventEmitter {
-        send(buf: Buffer, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
-        send(buf: Buffer, offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
+    interface SocketOptions {
+        type: "udp4" | "udp6";
+        reuseAddr?: boolean;
+    }
+
+    export function createSocket(type: string, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+
+    export interface Socket extends events.EventEmitter {
+        send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
+        send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
         bind(port?: number, address?: string, callback?: () => void): void;
-        close(): void;
+        bind(options: BindOptions, callback?: Function): void;
+        close(callback?: any): void;
         address(): AddressInfo;
         setBroadcast(flag: boolean): void;
+        setTTL(ttl: number): void;
         setMulticastTTL(ttl: number): void;
         setMulticastLoopback(flag: boolean): void;
         addMembership(multicastAddress: string, multicastInterface?: string): void;
         dropMembership(multicastAddress: string, multicastInterface?: string): void;
+        ref(): void;
+        unref(): void;
     }
 }
 
@@ -1660,14 +1977,23 @@ declare module "fs" {
     export function watch(filename: string, options: { persistent?: boolean; recursive?: boolean; encoding?: string }, listener?: (event: string, filename: string | Buffer) => any): FSWatcher;
     export function exists(path: string | Buffer, callback?: (exists: boolean) => void): void;
     export function existsSync(path: string | Buffer): boolean;
-    /** Constant for fs.access(). File is visible to the calling process. */
-    export var F_OK: number;
-    /** Constant for fs.access(). File can be read by the calling process. */
-    export var R_OK: number;
-    /** Constant for fs.access(). File can be written by the calling process. */
-    export var W_OK: number;
-    /** Constant for fs.access(). File can be executed by the calling process. */
-    export var X_OK: number;
+
+    interface Constants {
+        /** Constant for fs.access(). File is visible to the calling process. */
+        F_OK: number;
+
+        /** Constant for fs.access(). File can be read by the calling process. */
+        R_OK: number;
+
+        /** Constant for fs.access(). File can be written by the calling process. */
+        W_OK: number;
+
+        /** Constant for fs.access(). File can be executed by the calling process. */
+        X_OK: number;
+    }
+
+    export const constants: Constants;
+
     /** Tests a user's permissions for the file specified by path. */
     export function access(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
     export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
@@ -1688,6 +2014,8 @@ declare module "fs" {
         fd?: number;
         mode?: number;
     }): WriteStream;
+    export function fdatasync(fd: number, callback: Function): void;
+    export function fdatasyncSync(fd: number): void;
 }
 
 declare module "path" {
@@ -1997,18 +2325,26 @@ declare module "tls" {
     export interface TlsOptions {
         host?: string;
         port?: number;
-        pfx?: any;   //string or buffer
-        key?: any;   //string or buffer
+        pfx?: string | Buffer[];
+        key?: string | string[] | Buffer | any[];
         passphrase?: string;
-        cert?: any;
-        ca?: any;    //string or buffer
-        crl?: any;   //string or string array
+        cert?: string | string[] | Buffer | Buffer[];
+        ca?: string | string[] | Buffer | Buffer[];
+        crl?: string | string[];
         ciphers?: string;
-        honorCipherOrder?: any;
+        honorCipherOrder?: boolean;
         requestCert?: boolean;
         rejectUnauthorized?: boolean;
-        NPNProtocols?: any;  //array or Buffer;
-        SNICallback?: (servername: string, cb:(err:Error,ctx:SecureContext)=>any) => any;
+        NPNProtocols?: string[] | Buffer;
+        SNICallback?: (servername: string, cb: (err: Error, ctx: SecureContext) => any) => any;
+        ecdhCurve?: string;
+        dhparam?: string | Buffer;
+        handshakeTimeout?: number;
+        ALPNProtocols?: string[] | Buffer;
+        sessionTimeout?: number;
+        ticketKeys?: any;
+        sessionIdContext?: string;
+        secureProtocol?: string;
     }
 
     export interface ConnectionOptions {
@@ -2016,13 +2352,20 @@ declare module "tls" {
         port?: number;
         socket?: net.Socket;
         pfx?: string | Buffer
-        key?: string | Buffer
+        key?: string | string[] | Buffer | Buffer[];
         passphrase?: string;
-        cert?: string | Buffer
-        ca?: (string | Buffer)[];
+        cert?: string | string[] | Buffer | Buffer[];
+        ca?: string | Buffer | (string | Buffer)[];
         rejectUnauthorized?: boolean;
         NPNProtocols?: (string | Buffer)[];
         servername?: string;
+        path?: string;
+        ALPNProtocols?: (string | Buffer)[];
+        checkServerIdentity?: (servername: string, cert: string | Buffer | (string | Buffer)[]) => any;
+        secureProtocol?: string;
+        secureContext?: Object;
+        session?: Buffer;
+        minDHSize?: number;
     }
 
     export interface Server extends net.Server {
@@ -2075,7 +2418,7 @@ declare module "tls" {
     }
 
     export function createServer(options: TlsOptions, secureConnectionListener?: (cleartextStream: ClearTextStream) => void): Server;
-    export function connect(options: TlsOptions, secureConnectionListener?: () => void): ClearTextStream;
+    export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): ClearTextStream;
     export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): ClearTextStream;
     export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): ClearTextStream;
     export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
@@ -2083,6 +2426,18 @@ declare module "tls" {
 }
 
 declare module "crypto" {
+    export interface Certificate {
+        exportChallenge(spkac: string | Buffer): Buffer;
+        exportPublicKey(spkac: string | Buffer): Buffer;
+        verifySpkac(spkac: Buffer): boolean;
+    }
+    export var Certificate: {
+        new (): Certificate;
+        (): Certificate;
+    }
+
+    export var fips: boolean;
+
     export interface CredentialDetails {
         pfx: string;
         key: string;
@@ -2095,70 +2450,93 @@ declare module "crypto" {
     export interface Credentials { context?: any; }
     export function createCredentials(details: CredentialDetails): Credentials;
     export function createHash(algorithm: string): Hash;
-    export function createHmac(algorithm: string, key: string): Hmac;
-    export function createHmac(algorithm: string, key: Buffer): Hmac;
-    export interface Hash {
-        update(data: any, input_encoding?: string): Hash;
-        digest(encoding: 'buffer'): Buffer;
-        digest(encoding: string): any;
+    export function createHmac(algorithm: string, key: string | Buffer): Hmac;
+
+    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
+    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
+    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
+    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
+    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
+
+    export interface Hash extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer): Hash;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hash;
         digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
     }
     export interface Hmac extends NodeJS.ReadWriteStream {
-        update(data: any, input_encoding?: string): Hmac;
-        digest(encoding: 'buffer'): Buffer;
-        digest(encoding: string): any;
+        update(data: string | Buffer): Hmac;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
         digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
     }
     export function createCipher(algorithm: string, password: any): Cipher;
     export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
     export interface Cipher extends NodeJS.ReadWriteStream {
         update(data: Buffer): Buffer;
-        update(data: string, input_encoding: "utf8" | "ascii" | "binary"): Buffer;
-        update(data: Buffer, input_encoding: any, output_encoding: "binary" | "base64" | "hex"): string;
-        update(data: string, input_encoding: "utf8" | "ascii" | "binary", output_encoding: "binary" | "base64" | "hex"): string;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
+        update(data: Buffer, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
-        setAutoPadding(auto_padding: boolean): void;
+        setAutoPadding(auto_padding?: boolean): void;
         getAuthTag(): Buffer;
+        setAAD(buffer: Buffer): void;
     }
     export function createDecipher(algorithm: string, password: any): Decipher;
     export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
     export interface Decipher extends NodeJS.ReadWriteStream {
         update(data: Buffer): Buffer;
-        update(data: string, input_encoding: "binary" | "base64" | "hex"): Buffer;
-        update(data: Buffer, input_encoding: any, output_encoding: "utf8" | "ascii" | "binary"): string;
-        update(data: string, input_encoding: "binary" | "base64" | "hex", output_encoding: "utf8" | "ascii" | "binary"): string;
+        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
+        update(data: Buffer, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
-        setAutoPadding(auto_padding: boolean): void;
+        setAutoPadding(auto_padding?: boolean): void;
         setAuthTag(tag: Buffer): void;
+        setAAD(buffer: Buffer): void;
     }
     export function createSign(algorithm: string): Signer;
     export interface Signer extends NodeJS.WritableStream {
-        update(data: any): void;
-        sign(private_key: string, output_format: string): string;
+        update(data: string | Buffer): Signer;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        sign(private_key: string | { key: string; passphrase: string }): Buffer;
+        sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
     }
     export function createVerify(algorith: string): Verify;
     export interface Verify extends NodeJS.WritableStream {
-        update(data: any): void;
-        verify(object: string, signature: string, signature_format?: string): boolean;
+        update(data: string | Buffer): Verify;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        verify(object: string, signature: Buffer): boolean;
+        verify(object: string, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
     }
-    export function createDiffieHellman(prime_length: number): DiffieHellman;
-    export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman;
+    export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
+    export function createDiffieHellman(prime: Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
     export interface DiffieHellman {
-        generateKeys(encoding?: string): string;
-        computeSecret(other_public_key: string, input_encoding?: string, output_encoding?: string): string;
-        getPrime(encoding?: string): string;
-        getGenerator(encoding: string): string;
-        getPublicKey(encoding?: string): string;
-        getPrivateKey(encoding?: string): string;
-        setPublicKey(public_key: string, encoding?: string): void;
-        setPrivateKey(public_key: string, encoding?: string): void;
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrime(): Buffer;
+        getPrime(encoding: HexBase64Latin1Encoding): string;
+        getGenerator(): Buffer;
+        getGenerator(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        setPublicKey(public_key: Buffer): void;
+        setPublicKey(public_key: string, encoding: string): void;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: string): void;
+        verifyError: number;
     }
     export function getDiffieHellman(group_name: string): DiffieHellman;
-    export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => any): void;
     export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
-    export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number): Buffer;
     export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
     export function randomBytes(size: number): Buffer;
     export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
@@ -2166,119 +2544,269 @@ declare module "crypto" {
     export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
     export interface RsaPublicKey {
         key: string;
-        padding?: any;
+        padding?: number;
     }
     export interface RsaPrivateKey {
         key: string;
         passphrase?: string,
-        padding?: any;
+        padding?: number;
     }
     export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
     export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
+    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
+    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
     export function getCiphers(): string[];
     export function getCurves(): string[];
     export function getHashes(): string[];
+    export interface ECDH {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
+    }
+    export function createECDH(curve_name: string): ECDH;
+    export var DEFAULT_ENCODING: string;
 }
 
 declare module "stream" {
     import * as events from "events";
 
-    export class Stream extends events.EventEmitter {
+    class internal extends events.EventEmitter {
         pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
     }
+    namespace internal {
 
-    export interface ReadableOptions {
-        highWaterMark?: number;
-        encoding?: string;
-        objectMode?: boolean;
-        read?: (size?: number) => any;
+        export class Stream extends internal { }
+
+        export interface ReadableOptions {
+            highWaterMark?: number;
+            encoding?: string;
+            objectMode?: boolean;
+            read?: (size?: number) => any;
+        }
+
+        export class Readable extends events.EventEmitter implements NodeJS.ReadableStream {
+            readable: boolean;
+            constructor(opts?: ReadableOptions);
+            _read(size: number): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): void;
+            pause(): Readable;
+            resume(): Readable;
+            pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
+            push(chunk: any, encoding?: string): boolean;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             *   1. close
+             *   2. data
+             *   3. end
+             *   4. readable
+             *   5. error
+             **/
+            addListener(event: string, listener: Function): this;
+            addListener(event: string, listener: Function): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            addListener(event: "end", listener: () => void): this;
+            addListener(event: "readable", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+
+            emit(event: string, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "data", chunk: Buffer | string): boolean;
+            emit(event: "end"): boolean;
+            emit(event: "readable"): boolean;
+            emit(event: "error", err: Error): boolean;
+
+            on(event: string, listener: Function): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "data", listener: (chunk: Buffer | string) => void): this;
+            on(event: "end", listener: () => void): this;
+            on(event: "readable", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+
+            once(event: string, listener: Function): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "data", listener: (chunk: Buffer | string) => void): this;
+            once(event: "end", listener: () => void): this;
+            once(event: "readable", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+
+            prependListener(event: string, listener: Function): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependListener(event: "end", listener: () => void): this;
+            prependListener(event: "readable", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+
+            prependOnceListener(event: string, listener: Function): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependOnceListener(event: "end", listener: () => void): this;
+            prependOnceListener(event: "readable", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+
+            removeListener(event: string, listener: Function): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            removeListener(event: "end", listener: () => void): this;
+            removeListener(event: "readable", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+        }
+
+        export interface WritableOptions {
+            highWaterMark?: number;
+            decodeStrings?: boolean;
+            objectMode?: boolean;
+            write?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            writev?: (chunks: { chunk: string | Buffer, encoding: string }[], callback: Function) => any;
+        }
+
+        export class Writable extends events.EventEmitter implements NodeJS.WritableStream {
+            writable: boolean;
+            constructor(opts?: WritableOptions);
+            _write(chunk: any, encoding: string, callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            end(): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             *   1. close
+             *   2. drain
+             *   3. error
+             *   4. finish
+             *   5. pipe
+             *   6. unpipe
+             **/
+            addListener(event: string, listener: Function): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "drain", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+            addListener(event: "finish", listener: () => void): this;
+            addListener(event: "pipe", listener: (src: Readable) => void): this;
+            addListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            emit(event: string, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "drain", chunk: Buffer | string): boolean;
+            emit(event: "error", err: Error): boolean;
+            emit(event: "finish"): boolean;
+            emit(event: "pipe", src: Readable): boolean;
+            emit(event: "unpipe", src: Readable): boolean;
+
+            on(event: string, listener: Function): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "drain", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+            on(event: "finish", listener: () => void): this;
+            on(event: "pipe", listener: (src: Readable) => void): this;
+            on(event: "unpipe", listener: (src: Readable) => void): this;
+
+            once(event: string, listener: Function): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "drain", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+            once(event: "finish", listener: () => void): this;
+            once(event: "pipe", listener: (src: Readable) => void): this;
+            once(event: "unpipe", listener: (src: Readable) => void): this;
+
+            prependListener(event: string, listener: Function): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "drain", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: "finish", listener: () => void): this;
+            prependListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            prependOnceListener(event: string, listener: Function): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "drain", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: "finish", listener: () => void): this;
+            prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            removeListener(event: string, listener: Function): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "drain", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+            removeListener(event: "finish", listener: () => void): this;
+            removeListener(event: "pipe", listener: (src: Readable) => void): this;
+            removeListener(event: "unpipe", listener: (src: Readable) => void): this;
+        }
+
+        export interface DuplexOptions extends ReadableOptions, WritableOptions {
+            allowHalfOpen?: boolean;
+            readableObjectMode?: boolean;
+            writableObjectMode?: boolean;
+        }
+
+        // Note: Duplex extends both Readable and Writable.
+        export class Duplex extends Readable implements NodeJS.ReadWriteStream {
+            // Readable
+            pause(): Duplex;
+            resume(): Duplex;
+            // Writeable
+            writable: boolean;
+            constructor(opts?: DuplexOptions);
+            _write(chunk: any, encoding: string, callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            end(): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+        }
+
+        export interface TransformOptions extends ReadableOptions, WritableOptions {
+            transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            flush?: (callback: Function) => any;
+        }
+
+        // Note: Transform lacks the _read and _write methods of Readable/Writable.
+        export class Transform extends events.EventEmitter implements NodeJS.ReadWriteStream {
+            readable: boolean;
+            writable: boolean;
+            constructor(opts?: TransformOptions);
+            _transform(chunk: any, encoding: string, callback: Function): void;
+            _flush(callback: Function): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): void;
+            pause(): Transform;
+            resume(): Transform;
+            pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
+            push(chunk: any, encoding?: string): boolean;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            end(): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+        }
+
+        export class PassThrough extends Transform { }
     }
 
-    export class Readable extends events.EventEmitter implements NodeJS.ReadableStream {
-        readable: boolean;
-        constructor(opts?: ReadableOptions);
-        _read(size: number): void;
-        read(size?: number): any;
-        setEncoding(encoding: string): void;
-        pause(): Readable;
-        resume(): Readable;
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
-        unshift(chunk: any): void;
-        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
-        push(chunk: any, encoding?: string): boolean;
-    }
-
-    export interface WritableOptions {
-        highWaterMark?: number;
-        decodeStrings?: boolean;
-        objectMode?: boolean;
-        write?: (chunk: string|Buffer, encoding: string, callback: Function) => any;
-        writev?: (chunks: {chunk: string|Buffer, encoding: string}[], callback: Function) => any;
-    }
-
-    export class Writable extends events.EventEmitter implements NodeJS.WritableStream {
-        writable: boolean;
-        constructor(opts?: WritableOptions);
-        _write(chunk: any, encoding: string, callback: Function): void;
-        write(chunk: any, cb?: Function): boolean;
-        write(chunk: any, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(chunk: any, cb?: Function): void;
-        end(chunk: any, encoding?: string, cb?: Function): void;
-    }
-
-    export interface DuplexOptions extends ReadableOptions, WritableOptions {
-        allowHalfOpen?: boolean;
-        readableObjectMode?: boolean;
-        writableObjectMode?: boolean;
-    }
-
-    // Note: Duplex extends both Readable and Writable.
-    export class Duplex extends Readable implements NodeJS.ReadWriteStream {
-        // Readable
-        pause(): Duplex;
-        resume(): Duplex;
-        // Writeable
-        writable: boolean;
-        constructor(opts?: DuplexOptions);
-        _write(chunk: any, encoding: string, callback: Function): void;
-        write(chunk: any, cb?: Function): boolean;
-        write(chunk: any, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(chunk: any, cb?: Function): void;
-        end(chunk: any, encoding?: string, cb?: Function): void;
-    }
-
-    export interface TransformOptions extends ReadableOptions, WritableOptions {
-        transform?: (chunk: string|Buffer, encoding: string, callback: Function) => any;
-        flush?: (callback: Function) => any;
-    }
-
-    // Note: Transform lacks the _read and _write methods of Readable/Writable.
-    export class Transform extends events.EventEmitter implements NodeJS.ReadWriteStream {
-        readable: boolean;
-        writable: boolean;
-        constructor(opts?: TransformOptions);
-        _transform(chunk: any, encoding: string, callback: Function): void;
-        _flush(callback: Function): void;
-        read(size?: number): any;
-        setEncoding(encoding: string): void;
-        pause(): Transform;
-        resume(): Transform;
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
-        unshift(chunk: any): void;
-        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
-        push(chunk: any, encoding?: string): boolean;
-        write(chunk: any, cb?: Function): boolean;
-        write(chunk: any, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(chunk: any, cb?: Function): void;
-        end(chunk: any, encoding?: string, cb?: Function): void;
-    }
-
-    export class PassThrough extends Transform { }
+    export = internal;
 }
 
 declare module "util" {
@@ -2303,6 +2831,18 @@ declare module "util" {
     export function isError(object: any): boolean;
     export function inherits(constructor: any, superConstructor: any): void;
     export function debuglog(key: string): (msg: string, ...param: any[]) => void;
+    export function isBoolean(object: any): boolean;
+    export function isBuffer(object: any): boolean;
+    export function isFunction(object: any): boolean;
+    export function isNull(object: any): boolean;
+    export function isNullOrUndefined(object: any): boolean;
+    export function isNumber(object: any): boolean;
+    export function isObject(object: any): boolean;
+    export function isPrimitive(object: any): boolean;
+    export function isString(object: any): boolean;
+    export function isSymbol(object: any): boolean;
+    export function isUndefined(object: any): boolean;
+    export function deprecate(fn: Function, message: string): Function;
 }
 
 declare module "assert" {
@@ -2322,7 +2862,7 @@ declare module "assert" {
             });
         }
 
-        export function fail(actual?: any, expected?: any, message?: string, operator?: string): void;
+        export function fail(actual: any, expected: any, message: string, operator: string): void;
         export function ok(value: any, message?: string): void;
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;
@@ -2378,6 +2918,9 @@ declare module "domain" {
         bind(cb: (err: Error, data: any) => any): any;
         intercept(cb: (data: any) => any): any;
         dispose(): void;
+        members: any[];
+        enter(): void;
+        exit(): void;
     }
 
     export function create(): Domain;
@@ -2628,8 +3171,63 @@ declare module "constants" {
     export var W_OK: number;
     export var X_OK: number;
     export var UV_UDP_REUSEADDR: number;
+    export var SIGQUIT: number;
+    export var SIGTRAP: number;
+    export var SIGIOT: number;
+    export var SIGBUS: number;
+    export var SIGUSR1: number;
+    export var SIGUSR2: number;
+    export var SIGPIPE: number;
+    export var SIGALRM: number;
+    export var SIGCHLD: number;
+    export var SIGSTKFLT: number;
+    export var SIGCONT: number;
+    export var SIGSTOP: number;
+    export var SIGTSTP: number;
+    export var SIGTTIN: number;
+    export var SIGTTOU: number;
+    export var SIGURG: number;
+    export var SIGXCPU: number;
+    export var SIGXFSZ: number;
+    export var SIGVTALRM: number;
+    export var SIGPROF: number;
+    export var SIGIO: number;
+    export var SIGPOLL: number;
+    export var SIGPWR: number;
+    export var SIGSYS: number;
+    export var SIGUNUSED: number;
+    export var defaultCoreCipherList: string;
+    export var defaultCipherList: string;
+    export var ENGINE_METHOD_RSA: number;
+    export var ALPN_ENABLED: number;
 }
 
 declare module "process" {
     export = process;
 }
+
+declare module "v8" {
+    interface HeapSpaceInfo {
+        space_name: string;
+        space_size: number;
+        space_used_size: number;
+        space_available_size: number;
+        physical_space_size: number;
+    }
+    export function getHeapStatistics(): { total_heap_size: number, total_heap_size_executable: number, total_physical_size: number, total_avaialble_size: number, used_heap_size: number, heap_size_limit: number };
+    export function getHeapSpaceStatistics(): HeapSpaceInfo[];
+    export function setFlagsFromString(flags: string): void;
+}
+
+declare module "timers" {
+    export function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export function clearTimeout(timeoutId: NodeJS.Timer): void;
+    export function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export function clearInterval(intervalId: NodeJS.Timer): void;
+    export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+    export function clearImmediate(immediateId: any): void;
+}
+
+declare module "console" {
+    export = console;
+}
diff --git a/notify.js/notify.js.d.ts b/notify.js/notify.js.d.ts
index ae31ea6317..49fd3415ec 100644
--- a/notify.js/notify.js.d.ts
+++ b/notify.js/notify.js.d.ts
@@ -1,131 +1,131 @@
-// Type definitions for notify.js
-// Project: https://github.com/notifyjs/notifyjs
-// Definitions by: Bahman Nikkhahan <https://github.com/bahman616>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace NotifyJS {
-    interface NotificationOptions {
-        // whether to hide the notification on click
-        clickToHide: boolean;
-        // whether to auto-hide the notification
-        autoHide: boolean;
-        // if autoHide, hide after milliseconds
-        autoHideDelay: number;
-        // show the arrow pointing at the element
-        arrowShow: boolean;
-        // arrow size in pixels
-        arrowSize: number;
-        // position defines the notification position though uses the defaults below
-        position: string;
-        // default positions
-        elementPosition: string;
-        globalPosition: string;
-        // default style
-        style: string;
-        // default class (string or [string])
-        className: string;
-        // show animation
-        showAnimation: string;
-        // show animation duration
-        showDuration: number;
-        // hide animation
-        hideAnimation: string;
-        // hide animation duration
-        hideDuration: number;
-        // padding between element and notification
-        gap: number;
-    }
-
-    interface JQueryStaticNotify {
-        /** 
-         * notify user
-         * @param element a jquery element
-         * @param notificationdata global notification data
-         * @param options notification options
-         */
-        (element?: any, notificationdata?: any, options?: NotificationOptions): JQueryStatic;
-
-        /**
-         * Add style
-         * @param styleName style name
-         * @param styleDefinition style definition object
-         */
-        addStyle(styleName: string, styleDefinition: any): any;
-
-        /**
-         * Remove style
-         * @param styleName style name
-         */
-        removeStyle(styleName: string): any;
-
-        /**
-         * Get style
-         * @param styleName style name
-         */
-        getStyle(styleName: string): any;
-
-        /**
-         * Insert css
-         * @param cssText css text to insert
-         */
-        insertCSS(cssText: string): any;
-
-        /**
-         * Set defaults for notifications
-         * @param options notification iptions
-         */
-        defaults(options: NotificationOptions): any;
-    }
-
-    interface JQueryStatic {
-        notify: JQueryStaticNotify;
-    }
-
-    interface JQueryNotify {
-        /**
-         * notify user
-         * @param element a jquery element
-         * @param notificationdata global notification data
-         * @param options notification options
-         */
-        (element?: any, notificationdata?: any, options?: NotificationOptions): JQuery;
-
-        /**
-         * Add style
-         * @param styleName style name
-         * @param styleDefinition style definition object
-         */
-        addStyle(styleName: string, styleDefinition: any): any;
-
-        /**
-         * Remove style
-         * @param styleName style name
-         */
-        removeStyle(styleName: string): any;
-
-        /**
-         * Get style
-         * @param styleName style name
-         */
-        getStyle(styleName: string): any;
-
-        /**
-         * Insert css
-         * @param cssText css text to insert
-         */
-        insertCSS(cssText: string): any;
-
-        /**
-         * Set defaults for notifications
-         * @param options notification iptions
-         */
-        defaults(options: NotificationOptions): any;
-
-    }
-
-    interface JQuery {
-        notify: JQueryStaticNotify;
-    }
-}
+// Type definitions for notify.js
+// Project: https://github.com/notifyjs/notifyjs
+// Definitions by: Bahman Nikkhahan <https://github.com/bahman616>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare namespace NotifyJS {
+    interface NotificationOptions {
+        // whether to hide the notification on click
+        clickToHide: boolean;
+        // whether to auto-hide the notification
+        autoHide: boolean;
+        // if autoHide, hide after milliseconds
+        autoHideDelay: number;
+        // show the arrow pointing at the element
+        arrowShow: boolean;
+        // arrow size in pixels
+        arrowSize: number;
+        // position defines the notification position though uses the defaults below
+        position: string;
+        // default positions
+        elementPosition: string;
+        globalPosition: string;
+        // default style
+        style: string;
+        // default class (string or [string])
+        className: string;
+        // show animation
+        showAnimation: string;
+        // show animation duration
+        showDuration: number;
+        // hide animation
+        hideAnimation: string;
+        // hide animation duration
+        hideDuration: number;
+        // padding between element and notification
+        gap: number;
+    }
+
+    interface JQueryStaticNotify {
+        /** 
+         * notify user
+         * @param element a jquery element
+         * @param notificationdata global notification data
+         * @param options notification options
+         */
+        (element?: any, notificationdata?: any, options?: NotificationOptions): JQueryStatic;
+
+        /**
+         * Add style
+         * @param styleName style name
+         * @param styleDefinition style definition object
+         */
+        addStyle(styleName: string, styleDefinition: any): any;
+
+        /**
+         * Remove style
+         * @param styleName style name
+         */
+        removeStyle(styleName: string): any;
+
+        /**
+         * Get style
+         * @param styleName style name
+         */
+        getStyle(styleName: string): any;
+
+        /**
+         * Insert css
+         * @param cssText css text to insert
+         */
+        insertCSS(cssText: string): any;
+
+        /**
+         * Set defaults for notifications
+         * @param options notification iptions
+         */
+        defaults(options: NotificationOptions): any;
+    }
+
+    interface JQueryStatic {
+        notify: JQueryStaticNotify;
+    }
+
+    interface JQueryNotify {
+        /**
+         * notify user
+         * @param element a jquery element
+         * @param notificationdata global notification data
+         * @param options notification options
+         */
+        (element?: any, notificationdata?: any, options?: NotificationOptions): JQuery;
+
+        /**
+         * Add style
+         * @param styleName style name
+         * @param styleDefinition style definition object
+         */
+        addStyle(styleName: string, styleDefinition: any): any;
+
+        /**
+         * Remove style
+         * @param styleName style name
+         */
+        removeStyle(styleName: string): any;
+
+        /**
+         * Get style
+         * @param styleName style name
+         */
+        getStyle(styleName: string): any;
+
+        /**
+         * Insert css
+         * @param cssText css text to insert
+         */
+        insertCSS(cssText: string): any;
+
+        /**
+         * Set defaults for notifications
+         * @param options notification iptions
+         */
+        defaults(options: NotificationOptions): any;
+
+    }
+
+    interface JQuery {
+        notify: JQueryStaticNotify;
+    }
+}
diff --git a/notify.js/notify.js.tests.ts b/notify.js/notify.js.tests.ts
index f533b47288..505f3c4ec5 100644
--- a/notify.js/notify.js.tests.ts
+++ b/notify.js/notify.js.tests.ts
@@ -1,53 +1,53 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="notify.js.d.ts"/>
-
-// setting defaults for notification plugin
-$.notify.defaults({
-    clickToHide: true,
-    autoHide: false,
-    autoHideDelay: 5000,
-    arrowShow: true,
-    arrowSize: 5,
-    position: 'top center',
-    elementPosition: 'bottom left',
-    globalPosition: 'top center',
-    style: 'bootstrap',
-    className: 'error',
-    showAnimation: 'slideDown',
-    showDuration: 400,
-    hideAnimation: 'slideUp',
-    hideDuration: 200,
-    gap: 2
-});
-
-$(".elem-demo").notify("Hello Box");
-$.notify("Access granted", "success");
-$.notify("Do not press this button", "info");
-$.notify('hello !!', {
-    style: 'happyblue'
-});
-$.notify('hello !!', {
-    style: 'happyblue'
-});
-//add a new style 'foo'
-$.notify.addStyle('foo', {
-    html:
-    "<div>" +
-    "<div class='clearfix'>" +
-    "<div class='title' data-notify-html='title'/>" +
-    "<div class='buttons'>" +
-    "<button class='no'>Cancel</button>" +
-    "<button class='yes' data-notify-text='button'></button>" +
-    "</div>" +
-    "</div>" +
-    "</div>"
-});
-
-$.notify({
-    title: 'Would you like some Foo ?',
-    button: 'Confirm'
-}, {
-        style: 'foo',
-        autoHide: false,
-        clickToHide: false
+/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="notify.js.d.ts"/>
+
+// setting defaults for notification plugin
+$.notify.defaults({
+    clickToHide: true,
+    autoHide: false,
+    autoHideDelay: 5000,
+    arrowShow: true,
+    arrowSize: 5,
+    position: 'top center',
+    elementPosition: 'bottom left',
+    globalPosition: 'top center',
+    style: 'bootstrap',
+    className: 'error',
+    showAnimation: 'slideDown',
+    showDuration: 400,
+    hideAnimation: 'slideUp',
+    hideDuration: 200,
+    gap: 2
+});
+
+$(".elem-demo").notify("Hello Box");
+$.notify("Access granted", "success");
+$.notify("Do not press this button", "info");
+$.notify('hello !!', {
+    style: 'happyblue'
+});
+$.notify('hello !!', {
+    style: 'happyblue'
+});
+//add a new style 'foo'
+$.notify.addStyle('foo', {
+    html:
+    "<div>" +
+    "<div class='clearfix'>" +
+    "<div class='title' data-notify-html='title'/>" +
+    "<div class='buttons'>" +
+    "<button class='no'>Cancel</button>" +
+    "<button class='yes' data-notify-text='button'></button>" +
+    "</div>" +
+    "</div>" +
+    "</div>"
+});
+
+$.notify({
+    title: 'Would you like some Foo ?',
+    button: 'Confirm'
+}, {
+        style: 'foo',
+        autoHide: false,
+        clickToHide: false
     });
\ No newline at end of file
diff --git a/openlayers/openlayers.d.ts b/openlayers/openlayers.d.ts
index ec180bf45d..7cc216f1c2 100644
--- a/openlayers/openlayers.d.ts
+++ b/openlayers/openlayers.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for OpenLayers v3.6.0
+// Type definitions for OpenLayers v3.18.2
 // Project: http://openlayers.org/
 // Definitions by: Wouter Goedhart <https://github.com/woutergd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -48,6 +48,46 @@ declare namespace olx {
         extent: ol.Extent;
     }
 
+    interface OverviewMapOptions {
+        /*** Whether the control should start collapsed or not (expanded). Default to true.*/
+        collapsed?: boolean;
+        /*** Text label to use for the expanded overviewmap button. Default is «. Instead of text, also a Node (e.g. a span element) can be used.*/
+        collapseLabel? :string | Node;
+        /*** Whether the control can be collapsed or not. Default to true.*/
+        collapsible?: boolean;
+        /*** Text label to use for the collapsed overviewmap button. Default is ». Instead of text, also a Node (e.g. a span element) can be used.*/
+        label?: string | Node;
+        /*** Layers for the overview map. If not set, then all main map layers are used instead.*/
+        layers?: ol.layer.Layer[] | ol.Collection<ol.layer.Layer>;
+        /*** Function called when the control should be re-rendered. This is called in a requestAnimationFrame callback.*/
+        render?: Function;
+        /*** Specify a target if you want the control to be rendered outside of the map's viewport.*/
+        target?: Element;
+        /*** Text label to use for the button tip. Default is Overview map*/
+        tipLabel?: string;
+        /*** Custom view for the overview map. If not provided, a default view with an EPSG:3857 projection will be used.*/
+        view?: ol.View;
+    }
+
+    interface RotateOptions {
+        /*** CSS class name. Default is ol-rotate.*/
+        className?: string;
+        /*** Text label to use for the rotate button. Default is ⇧. Instead of text, also a Node (e.g. a span element) can be used.*/
+        label?: string | Element;
+        /*** Text label to use for the rotate tip. Default is Reset rotation.*/
+        tipLabel?: string;
+        /*** Animation duration in milliseconds. Default is 250.*/
+        duration?: number;
+        /*** Hide the control when rotation is 0. Default is true.*/
+        autoHide?: boolean;
+        /*** Function called when the control should be re-rendered. This is called in a requestAnimationFrame callback.*/
+        render?: Function;
+        /*** Function called when the control is clicked. This will override the default resetNorth.*/
+        resetNorth?: Function;
+        /*** Target.*/
+        target?: Element;
+    }
+
     interface AttributionOptions {
 
         /** HTML markup for this attribution. */
@@ -211,6 +251,30 @@ declare namespace olx {
         /** experimental Whether to wrap the world horizontally. When set to false, only one world will be rendered. When true, tiles will be requested for one world only, but they will be wrapped horizontally to render multiple worlds. The default is true. */
         wrapX?: boolean;
     }
+    interface OSMOptions {
+        /** Attributions */
+        attributions?: ol.AttributionLike;
+        /** Cache size. Default is 2048. */
+        cacheSize?: number;
+        /**
+         * The crossOrigin attribute for loaded images. Note that you must provide a crossOrigin value if you are using the WebGL
+         * renderer or if you want to access pixel data with the Canvas renderer.
+         * See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail. Default is anonymous.
+         */
+        crossOrigin?: string;
+        /** Max zoom. Default is 19. */
+        maxZoom?: number;
+        /** Whether the layer is opaque. Default is true. */
+        opaque?: boolean;
+        /** Maximum allowed reprojection error (in pixels). Default is 0.5. Higher values can increase reprojection performance, but decrease precision. */
+        reprojectionErrorThreshold?: number;
+        /** Optional function to load a tile given a URL. */
+        tileLoadFunction?: ol.TileLoadFunctionType;
+        /** URL template. Must include {x}, {y} or {-y}, and {z} placeholders. Default is https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png. */
+        url?: string;
+        /** Whether to wrap the world horizontally. Default is true. */
+        wrapX?: boolean;
+    }
     /**
      * Object literal with config options for the map logo.
      */
@@ -562,46 +626,365 @@ declare namespace olx {
 
     namespace interaction {
         interface DefaultsOptions {
+            /*** Whether Alt-Shift-drag rotate is desired. Default is true.*/
             altShiftDragRotate?: boolean;
+            /*** Whether double click zoom is desired. Default is true.*/
             doubleClickZoom?: boolean;
+            /*** Whether keyboard interaction is desired. Default is true.*/
             keyboard?: boolean;
+            /*** Whether mousewheel zoom is desired. Default is true.*/
             mouseWheelZoom?: boolean;
+            /*** Whether Shift-drag zoom is desired. Default is true.*/
             shiftDragZoom?: boolean;
+            /*** Whether drag pan is desired. Default is true.*/
             dragPan?: boolean;
+            /*** Whether pinch rotate is desired. Default is true.*/
             pinchRotate?: boolean;
+            /*** Whether pinch zoom is desired. Default is true.*/
             pinchZoom?: boolean;
+            /*** Zoom delta*/
             zoomDelta?: number;
+            /*** Zoom duration*/
             zoomDuration?: number;
         }
+        interface InteractionOptions {
+            /**
+             * Method called by the map to notify the interaction that a browser event was dispatched to the map.
+             * The function may return false to prevent the propagation of the event to other interactions in
+             * the map's interactions chain. Required.
+             */
+            handleEvent: Function;
+        }
         interface ModifyOptions {
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event will
+             * be considered to add or move a vertex to the sketch. Default is ol.events.condition.primaryAction.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should
+             * be handled. By default, ol.events.condition.singleClick with ol.events.condition.noModifierKeys results
+             * in a vertex deletion.
+             */
             deleteCondition?: ol.events.ConditionType;
+            /*** Pixel tolerance for considering the pointer close enough to a segment or vertex for editing. Default is 10.*/
             pixelTolerance?: number;
+            /*** Style used for the features being modified. By default the default edit style is used (see ol.style).*/
             style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
+            /*** The features the interaction works on. Required.*/
             features: ol.Collection<ol.Feature>;
+            /*** Wrap the world horizontally on the sketch overlay. Default is false.*/
             wrapX?: boolean;
         }
+        interface DragBoxOptions {
+            /*** CSS class name for styling the box. The default is ol-dragbox.*/
+            className?: string;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * Default is ol.events.condition.always.
+             */
+            condition?: ol.events.ConditionType;
+            /*** A function that takes a ol.MapBrowserEvent and two ol.Pixels to indicate whether a boxend event should be fired.*/
+            boxEndCondition?: ol.interaction.DragBoxEndConditionType;
+        }
         interface DrawOptions {
+            /**
+             * The maximum distance in pixels between "down" and "up" for a "up" event to be considered a "click" event and actually
+             * add a point/vertex to the geometry being drawn. Default is 6 pixels. That value was chosen for the draw interaction
+             * to behave correctly on mouse as well as on touch devices.
+             */
             clickTolerance?: number;
+            /**
+             * Destination collection for the drawn features.
+             */
             features?: ol.Collection<ol.Feature>;
+            /**
+             * Destination source for the drawn features.
+             */
             source?: ol.source.Vector;
+            /**
+             * Pixel distance for snapping to the drawing finish. Default is 12.
+             */
             snapTolerance?: number;
+            /**
+             * Drawing type ('Point', 'LineString', 'Polygon', 'MultiPoint', 'MultiLineString', 'MultiPolygon' or 'Circle'). Required.
+             */
             type: ol.geom.GeometryType;
+            /**
+             * The number of points that can be drawn before a polygon ring or line string is finished. The default is no restriction.
+             */
             maxPoints?: number;
+            /**
+             * The number of points that must be drawn before a polygon ring or line string can be finished. Default is 3 for polygon
+             * rings and 2 for line strings.
+             */
             minPoints?: number;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether the drawing can be finished.
+             */
+            finishCondition?: ol.events.ConditionType;
+            /**
+             * Style for sketch features.
+             */
             style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
+            /**
+             * Function that is called when a geometry's coordinates are updated.
+             */
             geometryFunction?: ol.interaction.DrawGeometryFunctionType;
+            /**
+             * Geometry name to use for features created by the draw interaction.
+             */
+            geometryName?: string;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * By default ol.events.condition.noModifierKeys, i.e. a click, adds a vertex or deactivates freehand drawing.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * Condition that activates freehand drawing for lines and polygons. This function takes an ol.MapBrowserEvent and returns
+             * a boolean to indicate whether that event should be handled. The default is ol.events.condition.shiftKeyOnly, meaning that
+             *  the Shift key activates freehand drawing.
+             */
+            freehandCondition?: ol.events.ConditionType;
+            /**
+             * Wrap the world horizontally on the sketch overlay. Default is false.
+             */
             wrapX?: boolean;
         }
-        interface SelectOptions {
-            addCondition?: ol.events.ConditionType;
+        interface DoubleClickZoomOptions {
+            /**
+             * Animation duration in milliseconds. Default is 250.
+             */
+            duration?: number;
+            /**
+             * The zoom delta applied on each double click, default is 1.
+             */
+            delta?: number;
+        }
+        interface DragAndDropOptions {
+            /**
+             * Format constructors.
+             */
+            formatConstructors?: Array<ol.format.Feature>;
+            /**
+             * Target projection. By default, the map's view's projection is used.
+             */
+            projection: ol.proj.ProjectionLike;
+            /**
+             * The element that is used as the drop target, default is the viewport element.
+             */
+            target?: Element;
+        }
+        interface DragPanOptions {
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * Default is ol.events.condition.noModifierKeys.
+             */
             condition?: ol.events.ConditionType;
-            layers?: Array<ol.layer.Layer> | ((layer: ol.layer.Layer) => boolean);
-            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
-            removeCondition?: ol.events.ConditionType;
-            toggleCondition?: ol.events.ConditionType;
-            multi?: boolean;
+            /**
+             * Kinetic inertia to apply to the pan.
+             */
+            kinetic?: ol.Kinetic;
+        }
+        interface DragRotateOptions {
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * Default is ol.events.condition.altShiftKeysOnly.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * Animation duration in milliseconds. Default is 250.
+             */
+            duration?: number;
+        }
+        interface DragRotateAndZoomOptions {
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * Default is ol.events.condition.shiftKeyOnly.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * Animation duration in milliseconds. Default is 400.
+             */
+            duration?: number;
+        }
+        interface DragZoomOptions {
+            /**
+             * CSS class name for styling the box. The default is ol-dragzoom.
+             */
+            className?: string;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * Default is ol.events.condition.shiftKeyOnly.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * Animation duration in milliseconds. Default is 200.
+             */
+            duration?: number;
+            /**
+             * Use interaction for zooming out. Default is false.
+             */
+            out?: boolean;
+        }
+        interface KeyboardPanOptions {
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * Default is ol.events.condition.noModifierKeys and ol.events.condition.targetNotEditable.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * Animation duration in milliseconds. Default is 100.
+             */
+            duration?: number;
+            /**
+             * Pixel The amount to pan on each key press. Default is 128 pixels.
+             */
+            pixelDelta?: number;
+        }
+        interface KeyboardZoomOptions {
+            /**
+             * Animation duration in milliseconds. Default is 100.
+             */
+            duration?: number;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * Default is ol.events.condition.targetNotEditable.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * The amount to zoom on each key press. Default is 1.
+             */
+            delta?: number;
+        }
+        interface MouseWheelZoomOptions {
+            /**
+             * Animation duration in milliseconds. Default is 250.
+             */
+            duration?: number;
+            /**
+             * Enable zooming using the mouse's location as the anchor. Default is true.
+             * When set to false, zooming in and out will zoom to the center of the screen instead of zooming on the mouse's location.
+             */
+            useAnchor?: boolean;
+        }
+        interface PinchRotateOptions {
+            /**
+             * The duration of the animation in milliseconds. Default is 250.
+             */
+            duration?: number;
+            /**
+             * Minimal angle in radians to start a rotation. Default is 0.3.
+             */
+            threshold?: number;
+        }
+        interface PinchZoomOptions {
+            /**
+             * Animation duration in milliseconds. Default is 400.
+             */
+            duration?: number;
+        }
+        interface PointerOptions {
+            /**
+             * Function handling "down" events. If the function returns true then a drag sequence is started.
+             */
+            handleDownEvent?: Function;
+            /**
+             * Function handling "drag" events. This function is called on "move" events during a drag sequence.
+             */
+            handleDragEvent?: Function;
+            /**
+             * Method called by the map to notify the interaction that a browser event was dispatched to the map.
+             * The function may return false to prevent the propagation of the event to other interactions in the map's interactions chain.
+             */
+            handleEvent?: Function;
+            /**
+             * Function handling "move" events. This function is called on "move" events, also during a drag sequence
+             * (so during a drag sequence both the handleDragEvent function and this function are called).
+             */
+            handleMoveEvent?: Function;
+            /**
+             * Function handling "up" events. If the function returns false then the current drag sequence is stopped.
+             */
+            handleUpEvent?: Function;
+        }
+        interface SnapOptions {
+            /**
+             * Snap to these features. Either this option or source should be provided.
+             */
             features?: ol.Collection<ol.Feature>;
+            /**
+             * Snap to edges. Default is true.
+             */
+            edge?: boolean;
+            /**
+             * Snap to vertices. Default is true.
+             */
+            vertex?: boolean;
+            /**
+             * Pixel tolerance for considering the pointer close enough to a segment or vertex for snapping. Default is 10 pixels.
+             */
+            pixelTolerance?: number;
+            /**
+             * Snap to features from this source. Either this option or features should be provided.
+             */
+            source?: ol.source.Vector;
+        }
+        interface SelectOptions {
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * By default, this is ol.events.condition.never.
+             * Use this if you want to use different events for add and remove instead of toggle.
+             */
+            addCondition?: ol.events.ConditionType;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * This is the event for the selected features as a whole. By default, this is ol.events.condition.singleClick.
+             * Clicking on a feature selects that feature and removes any that were in the selection.
+             * Clicking outside any feature removes all from the selection.
+             * See toggle, add, remove options for adding/removing extra features to/ from the selection.
+             */
+            condition?: ol.events.ConditionType;
+            /**
+             * A list of layers from which features should be selected. Alternatively, a filter function can be provided.
+             * The function will be called for each layer in the map and should return true for layers that you want to be selectable.
+             * If the option is absent, all visible layers will be considered selectable.
+             */
+            layers?: Array<ol.layer.Layer> | ((layer: ol.layer.Layer) => boolean);
+            /**
+             * Style for the selected features. By default the default edit style is used (see ol.style).
+             */
+            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * By default, this is ol.events.condition.never.
+             * Use this if you want to use different events for add and remove instead of toggle.
+             */
+            removeCondition?: ol.events.ConditionType;
+            /**
+             * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether that event should be handled.
+             * This is in addition to the condition event. By default, ol.events.condition.shiftKeyOnly,
+             * i.e. pressing shift as well as the condition event, adds that feature to the current selection if it is not currently
+             * selected, and removes it if it is. See add and remove if you want to use different events instead of a toggle.
+             */
+            toggleCondition?: ol.events.ConditionType;
+            /**
+             * A boolean that determines if the default behaviour should select only single features or all (overlapping)
+             * features at the clicked map position. Default is false i.e single select
+             */
+            multi?: boolean;
+            /**
+             * Collection where the interaction will place selected features. Optional. If not set the interaction will create a collection.
+             * In any case the collection used by the interaction is returned by ol.interaction.Select#getFeatures.
+             */
+            features?: ol.Collection<ol.Feature>;
+            /**
+             * A function that takes an ol.Feature and an ol.layer.Layer and returns true if the feature may be selected or false otherwise.
+             */
             filter?: ol.interaction.SelectFilterFunction;
+            /**
+             * Wrap the world horizontally on the selection overlay. Default is true.
+             */
             wrapX?: boolean;
         }
     }
@@ -791,24 +1174,24 @@ declare namespace olx {
              */
             wrapX?: boolean;
         }
-        
+
         interface ClusterOptions extends VectorOptions{
-            
+
             /**
              * Minimum distance in pixels between clusters. Default is 20.
              */
             distance?: number;
-            
+
             extent?: ol.Extent;
-            
+
             geometryFunction?: any;
-            
+
             projection?: ol.proj.ProjectionLike;
-            
+
             source: ol.source.Vector;
-            
+
         }
-        
+
         interface WMTSOptions {
             attributions?: Array<ol.Attribution>;
             crossOrigin?: string;
@@ -1127,6 +1510,8 @@ declare namespace ol {
 
     interface ImageLoadFunctionType { (image: ol.Image, url: string): void }
 
+    type AttributionLike = string | Array<string> | ol.Attribution | Array<ol.Attribution>
+
     /**
      * An attribution for a layer source.
      */
@@ -2422,9 +2807,9 @@ declare namespace ol {
          * @returns Control.s
          */
         function defaults(options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
-        
+
         namespace ScaleLine {
-            
+
             /**
              * Units for the scale line. Supported values are 'degrees', 'imperial', 'nautical', 'metric', 'us'.
              */
@@ -2433,29 +2818,29 @@ declare namespace ol {
 
         class Control extends ol.Object{
             constructor(options: olx.control.ControlOptions);
-            
+
             /**
              * Get the map associated with this control.
              */
             getMap():ol.Map;
-            
+
             /**
-             * Remove the control from its current map and attach it to the new map. 
+             * Remove the control from its current map and attach it to the new map.
              * Subclasses may set up event handlers to get notified about changes to the map here.
              */
             setMap(map: ol.Map):void;
-            
+
             /**
-             * This function is used to set a target element for the control. 
-             * It has no effect if it is called after the control has been added to the map (i.e. after setMap is called on the control). 
-             * If no target is set in the options passed to the control constructor and if setTarget is not called then the control is 
+             * This function is used to set a target element for the control.
+             * It has no effect if it is called after the control has been added to the map (i.e. after setMap is called on the control).
+             * If no target is set in the options passed to the control constructor and if setTarget is not called then the control is
              * added to the map's overlay container.
              */
             setTarget(target: Element | string):void;
-            
-            
+
+
         }
-        
+
         class Attribution extends Control {
         }
 
@@ -2466,23 +2851,58 @@ declare namespace ol {
         }
 
         class OverviewMap extends Control {
+            constructor(options?: olx.OverviewMapOptions);
+
+            /**
+             * Update the overview map element.
+             * @param mapEvent
+             */
+            render(mapEvent: ol.MapEvent): void;
+
+            /**
+             * Determine if the overview map is collapsed.
+             */
+            getCollapsed(): boolean;
+
+            /**
+             * Return true if the overview map is collapsible, false otherwise.
+             */
+            getCollapsible(): boolean;
+
+            /**
+             * Return the overview map.
+             */
+            getOverviewMap(): ol.Map;
+
+            /**
+             * Collapse or expand the overview map according to the passed parameter. Will not do anything if the overview map isn't collapsible or if the current collapsed state is already the one requested.
+             * @param collapsed
+             */
+            setCollapsed(collapsed: boolean): void;
+
+            /**
+             * Set whether the overview map should be collapsible.
+             * @param collapsible
+             */
+            setCollapsible(collapsible: boolean): void;
         }
 
         class Rotate extends Control {
+            constructor(opt_options?: olx.RotateOptions);
         }
 
         class ScaleLine extends Control {
-            
+
             /**
              * Return the units to use in the scale line.
              */
             getUnits(): ScaleLine.Units;
-            
+
             /**
              * Set the units to use in the scale line.
              */
             setUnits(units: ScaleLine.Units): void;
-            
+
         }
 
         class Zoom extends Control{
@@ -3653,79 +4073,262 @@ declare namespace ol {
     }
 
     namespace interaction {
-
-        class DoubleClickZoom {
+        /**
+         * Allows the user to zoom by double-clicking on the map.
+         */
+        class DoubleClickZoom extends ol.interaction.Interaction {
+            constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
         }
-
-        class DragAndDrop {
+        /**
+         * Handles input of vector data by drag and drop.
+         */
+        class DragAndDrop extends ol.interaction.Interaction {
+            constructor(opt_options?: olx.interaction.DragAndDropOptions);
         }
-
+        /**
+         * Events emitted by ol.interaction.DragAndDrop instances are instances of this type.
+         */
         class DragAndDropEvent extends ol.events.Event {
         }
-
-        class DragBox {
+        /**
+         * Allows the user to draw a vector box by clicking and dragging on the map,
+         * normally combined with an ol.events.condition that limits it to when the shift or other key is held down.
+         * This is used, for example, for zooming to a specific area of the map
+         * (see ol.interaction.DragZoom and ol.interaction.DragRotateAndZoom).
+         *
+         * This interaction is only supported for mouse devices.
+         */
+        class DragBox extends ol.interaction.Pointer {
+            constructor(opt_options?: olx.interaction.DragBoxOptions);
+            /**
+             * Returns geometry of last drawn box.
+             */
+            getGeometry(): ol.geom.Polygon;
         }
-
-        class DragPan {
+        /**
+         * Allows the user to pan the map by dragging the map.
+         */
+        class DragPan extends ol.interaction.Pointer {
+            constructor(opt_options?: olx.interaction.DragPanOptions);
         }
-
-        class DragRotate {
+        /**
+         * Allows the user to rotate the map by clicking and dragging on the map,
+         * normally combined with an ol.events.condition that limits it to when the alt and shift keys are held down.
+         *
+         * This interaction is only supported for mouse devices.
+         */
+        class DragRotate extends ol.interaction.Pointer {
+            constructor(opt_options?: olx.interaction.DragRotateOptions);
         }
-
-        class DragRotateAndZoom {
+        /**
+         * Allows the user to zoom and rotate the map by clicking and dragging on the map.
+         * By default, this interaction is limited to when the shift key is held down.
+         *
+         * This interaction is only supported for mouse devices.
+         *
+         * And this interaction is not included in the default interactions.
+         */
+        class DragRotateAndZoom extends ol.interaction.Pointer {
+            constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
         }
-
-        class DragZoom {
+        /**
+         * Allows the user to zoom the map by clicking and dragging on the map,
+         * normally combined with an ol.events.condition that limits it to when a key, shift by default, is held down.
+         *
+         * To change the style of the box, use CSS and the .ol-dragzoom selector, or your custom one configured with className.
+         */
+        class DragZoom extends ol.interaction.DragBox {
+            constructor(opt_options?: olx.interaction.DragZoomOptions);
         }
-
+        /**
+         * Interaction for drawing feature geometries.
+         */
         class Draw extends ol.interaction.Pointer {
-            constructor(opt_options?: olx.interaction.DrawOptions)
+            constructor(opt_options?: olx.interaction.DrawOptions);
         }
-
+        /**
+         * Events emitted by ol.interaction.Draw instances are instances of this type.
+         */
         class DrawEvent extends ol.events.Event {
+            /**
+             * The feature being drawn.
+             */
+            feature: ol.Feature;
+            /**
+             * The event target.
+             */
+            target: ol.Object;
+            /**
+             * The event type.
+             */
+            type: string;
         }
-
+        /**
+         * Abstract base class; normally only used for creating subclasses and not instantiated in apps.
+         * User actions that change the state of the map. Some are similar to controls, but are not associated with a DOM element.
+         * For example, ol.interaction.KeyboardZoom is functionally the same as ol.control.Zoom, but triggered by a keyboard event
+         * not a button element event. Although interactions do not have a DOM element,
+         * some of them do render vectors and so are visible on the screen.
+         */
         class Interaction extends ol.Object {
+            constructor (options: olx.interaction.InteractionOptions)
+            /**
+             * Return whether the interaction is currently active.
+             */
+            getActive (): boolean;
+            /**
+             * Get the map associated with this interaction.
+             */
+            getMap (): ol.Map;
+            /**
+             * Activate or deactivate the interaction.
+             */
+            setActive (active: boolean): void;
         }
-
-        class KeyboardPan {
+        /**
+         * Allows the user to pan the map using keyboard arrows. Note that, although this interaction is by default included in maps,
+         * the keys can only be used when browser focus is on the element to which the keyboard events are attached.
+         * By default, this is the map div, though you can change this with the keyboardEventTarget in ol.Map.
+         * document never loses focus but, for any other element, focus will have to be on, and returned to,
+         * this element if the keys are to function. See also ol.interaction.KeyboardZoom.
+         */
+        class KeyboardPan extends ol.interaction.Interaction {
+            constructor(opt_options?: olx.interaction.KeyboardPanOptions);
         }
-
-        class KeyboardZoom {
+        /**
+         * Allows the user to zoom the map using keyboard + and -. Note that, although this interaction is by default included in maps,
+         * the keys can only be used when browser focus is on the element to which the keyboard events are attached. By default,
+         * this is the map div, though you can change this with the keyboardEventTarget in ol.Map. document never loses focus but,
+         * for any other element, focus will have to be on, and returned to, this element if the keys are to function.
+         * See also ol.interaction.KeyboardPan.
+         */
+        class KeyboardZoom extends ol.interaction.Interaction {
+            constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
         }
-
+        /**
+         * Interaction for modifying feature geometries.
+         */
         class Modify extends ol.interaction.Pointer {
-            constructor(opt_options?: olx.interaction.ModifyOptions)
+            constructor(opt_options?: olx.interaction.ModifyOptions);
         }
-
-        class MouseWheelZoom {
+        /**
+         * Allows the user to zoom the map by scrolling the mouse wheel.
+         */
+        class MouseWheelZoom extends ol.interaction.Interaction {
+            constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
         }
-
-        class PinchRotate {
+        /**
+         * Allows the user to rotate the map by twisting with two fingers on a touch screen.
+         */
+        class PinchRotate extends ol.interaction.Pointer {
+            constructor(opt_options?: olx.interaction.PinchRotateOptions);
         }
-
-        class PinchZoom {
+        /**
+         * Allows the user to zoom the map by pinching with two fingers on a touch screen.
+         */
+        class PinchZoom extends ol.interaction.Pointer {
+            constructor(opt_options?: olx.interaction.PinchZoomOptions);
         }
-
+        /**
+         * Base class that calls user-defined functions on down, move and up events. This class also manages "drag sequences".
+         *
+         * When the handleDownEvent user function returns true a drag sequence is started. During a drag sequence the handleDragEvent
+         * user function is called on move events. The drag sequence ends when the handleUpEvent user function is called and returns false.
+         */
         class Pointer extends ol.interaction.Interaction {
+            constructor(opt_options?: olx.interaction.PointerOptions);
         }
-
+        /**
+         * Interaction for selecting vector features. By default, selected features are styled differently, so this interaction can be used
+         * for visual highlighting, as well as selecting features for other actions, such as modification or output. There are three ways of
+         * controlling which features are selected: using the browser event as defined by the condition and optionally the toggle,
+         * add/remove, and multi options; a layers filter; and a further feature filter using the filter option.
+         *
+         * Selected features are added to an internal unmanaged layer.
+         */
         class Select extends ol.interaction.Interaction {
             constructor(opt_options?: olx.interaction.SelectOptions);
+            /**
+             * Returns the associated vectorlayer of the (last) selected feature.
+             * Note that this will not work with any programmatic method like pushing features to collection.
+             */
             getLayer(): ol.layer.Layer;
+            /**
+             * Get the selected features.
+             */
             getFeatures(): ol.Collection<ol.Feature>;
         }
-
-        class Snap {
+        /**
+         * Events emitted by ol.interaction.Select instances are instances of this type.
+         */
+        class SelectEvent extends ol.events.Event {
+            /**
+             * Deselectd features array.
+             */
+            deselected: Array<ol.Feature>;
+            /**
+             * Associated ol.MapBrowserEvent.
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
+            /**
+             * Selected features array.
+             */
+            selected: Array<ol.Feature>;
+            /**
+             * The event target.
+             */
+            target: ol.Object;
+            /**
+             * The event type.
+             */
+            type: string;
+            /**
+             * Stop event propagation.
+             */
+            preventDefault(): void;
+            /**
+             * Stop event propagation.
+             */
+            stopPropagation(): void;
         }
-
+        /**
+         * Handles snapping of vector features while modifying or drawing them. The features can come from a ol.source.Vector or
+         * ol.Collection Any interaction object that allows the user to interact with the features using the mouse can benefit
+         * from the snapping, as long as it is added before.
+         *
+         *The snap interaction modifies map browser event coordinate and pixel properties to force the snap to occur
+         * to any interaction that them.
+         */
+        class Snap extends ol.interaction.Pointer {
+            constructor(opt_options?: olx.interaction.SnapOptions);
+        }
+        /**
+         * Set of interactions included in maps by default. Specific interactions can be excluded by setting the appropriate option
+         * to false in the constructor options, but the order of the interactions is fixed. If you want to specify a different order for
+         * interactions, you will need to create your own ol.interaction.Interaction instances and insert them into a ol.Collection in
+         * the order you want before creating your ol.Map instance.
+         */
         function defaults(opts: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
-        interface DrawGeometryFunctionType { (coordinates: ol.Coordinate[], geom?: ol.geom.Geometry): ol.geom.Geometry; }
+        /**
+         * Function that takes coordinates and an optional existing geometry as arguments, and returns a geometry.
+         * The optional existing geometry is the geometry that is returned when the function is called without a second argument.
+         */
+        interface DrawGeometryFunctionType { (coordinates: ol.Coordinate, geom?: ol.geom.Geometry): ol.geom.Geometry; }
+        /**
+         * A function that takes an ol.Feature or ol.render.Feature and an ol.layer.Layer and returns true if the feature
+         * may be selected or false otherwise.
+         */
         interface SelectFilterFunction { (feature: ol.Feature | ol.render.Feature, layer: ol.layer.Layer): boolean; }
+        /**
+         * A function that takes a ol.MapBrowserEvent and two ol.Pixels and returns a {boolean}.
+         * If the condition is met, true should be returned.
+         */
+        interface DragBoxEndConditionType {
+            (evt: ol.MapBrowserEvent, startPixel: ol.Pixel, endPixel: ol.Pixel): boolean
+        }
     }
 
     namespace layer {
-
         /**
          * Abstract base class; normally only used for creating subclasses and not instantiated in apps. Note that with ol.layer.Base and all its subclasses, any property set in the options is set as a ol.Object property on the layer object, so is observable, and has get/set accessors.
          */
@@ -4061,7 +4664,7 @@ declare namespace ol {
              * @argument map.
              */
             setMap(map: ol.Map): void;
-            
+
             /**
              * Set Z-index of the layer, which is used to order layers before rendering. The default Z-index is 0.
              */
@@ -4254,12 +4857,13 @@ declare namespace ol {
         }
 
         class OSM extends XYZ {
+            constructor(opt_options?: olx.OSMOptions);
         }
 
         class Source extends ol.Object {
-            
+
             constructor(options: any);
-            
+
             /**
              * Get the projection of the source.
              * @return Projection.
diff --git a/parse/parse.d.ts b/parse/parse.d.ts
index 3a7d6b25f8..84fbc76027 100644
--- a/parse/parse.d.ts
+++ b/parse/parse.d.ts
@@ -1072,7 +1072,7 @@ declare namespace Parse {
             title?: string;
         }
 
-        interface SendOptions {
+        interface SendOptions extends UseMasterKeyOption {
             success?: () => void;
             error?: (error: Error) => void;
         }
diff --git a/passport-local-mongoose/passport-local-mongoose.d.ts b/passport-local-mongoose/passport-local-mongoose.d.ts
index ab2539a709..a3b5414c84 100644
--- a/passport-local-mongoose/passport-local-mongoose.d.ts
+++ b/passport-local-mongoose/passport-local-mongoose.d.ts
@@ -74,6 +74,9 @@ declare module 'mongoose' {
       plugin: (schema: PassportLocalSchema, options?: PassportLocalOptions) => void,
       options?: PassportLocalOptions
     ): this;
+
+    // overload for the default mongoose plugin function
+    plugin(plugin: (schema: Schema, options?: Object) => void, opts?: Object): this;
   }
 
   export function model<T extends Document>(
diff --git a/pdfkit/pdfkit-tests.ts b/pdfkit/pdfkit-tests.ts
index a21dfed815..86d6bc7e2e 100644
--- a/pdfkit/pdfkit-tests.ts
+++ b/pdfkit/pdfkit-tests.ts
@@ -24,7 +24,7 @@ doc.addPage({
 });
 
 doc.addPage({
-  margin: {
+  margins: {
     top: 50,
     bottom: 50,
     left: 72,
@@ -32,6 +32,10 @@ doc.addPage({
   }
 });
 
+doc.addPage({
+  layout: "landscape"
+});
+
 doc.info.Title = "Sample";
 doc.info.Author = "kila Mogrosso";
 
diff --git a/pdfkit/pdfkit.d.ts b/pdfkit/pdfkit.d.ts
index 70836187e2..30c8d138da 100644
--- a/pdfkit/pdfkit.d.ts
+++ b/pdfkit/pdfkit.d.ts
@@ -231,7 +231,9 @@ declare namespace PDFKit {
         info?: DocumentInfo;
         autoFirstPage?: boolean;
         size?: number[];
-        margin?: { top: number; left: number; bottom: number; right: number }|number;
+        margin?: number;
+        margins?: { top: number; left: number; bottom: number; right: number };
+        layout?: "portrait" | "landscape";
 
         bufferPages?: boolean;
     }
diff --git a/phonegap-plugin-barcodescanner/phonegap-plugin-barcodescanner-tests.ts b/phonegap-plugin-barcodescanner/phonegap-plugin-barcodescanner-tests.ts
new file mode 100644
index 0000000000..7b1f23a3fd
--- /dev/null
+++ b/phonegap-plugin-barcodescanner/phonegap-plugin-barcodescanner-tests.ts
@@ -0,0 +1,29 @@
+/// <reference path="../cordova/cordova.d.ts"/>
+/// <reference path="phonegap-plugin-barcodescanner.d.ts" />
+   
+cordova.plugins.barcodeScanner.scan(
+    function (result) {
+        alert("We got a barcode\n" +
+            "Result: " + result.text + "\n" +
+            "Format: " + result.format + "\n" +
+            "Cancelled: " + result.cancelled);
+    }, 
+    function (error) {
+        alert("Scanning failed: " + error);
+    },
+    {
+        "preferFrontCamera" : true, // iOS and Android
+        "showFlipCameraButton" : true, // iOS and Android
+        "prompt" : "Place a barcode inside the scan area", // supported on Android only
+        "formats" : "QR_CODE,PDF_417", // default: all but PDF_417 and RSS_EXPANDED
+        "orientation" : "landscape" // Android only (portrait|landscape), default unset so it rotates with the device
+    }
+);
+
+
+cordova.plugins.barcodeScanner.encode(cordova.plugins.barcodeScanner.Encode.TEXT_TYPE, "http://www.nytimes.com", function(success) {
+    alert("encode success: " + success);
+    }, function(fail) {
+    alert("encoding failed: " + fail);
+    }
+);
\ No newline at end of file
diff --git a/phonegap-plugin-barcodescanner/phonegap-plugin-barcodescanner.d.ts b/phonegap-plugin-barcodescanner/phonegap-plugin-barcodescanner.d.ts
new file mode 100644
index 0000000000..85bde977b7
--- /dev/null
+++ b/phonegap-plugin-barcodescanner/phonegap-plugin-barcodescanner.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for phonegap-plugin-barcodescanner
+// Project: https://github.com/phonegap/phonegap-plugin-barcodescanner
+// Definitions by: Nathan Ainslie <https://www.github.com/nainslie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface CordovaPlugins {
+    barcodeScanner: phonegapBarcode.BarcodeScanner;
+}
+
+declare namespace phonegapBarcode {
+    interface BarcodeScanResult {
+        text: string;
+        format: string;
+        cancelled: boolean;
+    }
+    
+    interface BarcodeScanOptions {
+        preferFrontCamera?: boolean;
+        showFlipCameraButton?: boolean;
+        prompt?: string;
+        formats?: string;
+        orientation?: "landscape" | "portrait";
+    }
+
+    interface EncodingType {
+        TEXT_TYPE: any;
+        EMAIL_TYPE: any;
+        PHONE_TYPE: any;
+        SMS_TYPE: any;
+    }
+
+    interface BarcodeScanner {
+        scan: (success: ((result: BarcodeScanResult) => any), failure?: ((err: any) => any), opts?: BarcodeScanOptions) => void;
+        encode: (encodingType: EncodingType, data: string, success: ((result: any) => any), failure?: ((err: any) => any)) => void;
+        Encode: EncodingType;
+    }
+}
\ No newline at end of file
diff --git a/pino/pino-tests.ts b/pino/pino-tests.ts
index 9a2c423222..4a1470db24 100644
--- a/pino/pino-tests.ts
+++ b/pino/pino-tests.ts
@@ -26,6 +26,12 @@ var instance = PINO({
   }
 })
 
+var pretty = PINO.pretty()
+var instance2 = PINO({
+  name: 'app',
+  safe: true
+}, pretty)
+
 
 var logger = instance
 logger.child({ a: 'property' }).info('hello child!')
diff --git a/pino/pino.d.ts b/pino/pino.d.ts
index 1d7049cf05..0a51c49275 100644
--- a/pino/pino.d.ts
+++ b/pino/pino.d.ts
@@ -41,8 +41,8 @@ declare module 'pino' {
     }
 
     interface Pino {
-        (optionsOrStream?: LoggerOptions | stream.Writable): Logger
-        (options: LoggerOptions, stream: stream.Writable): Logger
+        (optionsOrStream?: LoggerOptions | stream.Writable | stream.Readable): Logger
+        (options: LoggerOptions, stream: stream.Writable | stream.Readable): Logger
         levels: {
             values: LevelLabelsToValues
             labels: LevelValuesToLabels
diff --git a/point-in-polygon/point-in-polygon-tests.ts b/point-in-polygon/point-in-polygon-tests.ts
new file mode 100644
index 0000000000..39851bd00e
--- /dev/null
+++ b/point-in-polygon/point-in-polygon-tests.ts
@@ -0,0 +1,6 @@
+/// <reference path="point-in-polygon.d.ts" />
+
+import inside from 'point-in-polygon';
+
+const polygon = [ [ 1, 1 ], [ 1, 2 ], [ 2, 2 ], [ 2, 1 ] ];
+const inPolygon: boolean = inside([ 1.5, 1.5 ], polygon);
diff --git a/point-in-polygon/point-in-polygon.d.ts b/point-in-polygon/point-in-polygon.d.ts
new file mode 100644
index 0000000000..ceb85ecdec
--- /dev/null
+++ b/point-in-polygon/point-in-polygon.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for point-in-polygon
+// Project: https://github.com/substack/point-in-polygon
+// Definitions by: kogai <https://github.com/kogai>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'point-in-polygon' {
+    export default function inside(point: number[], polygon: number[][]): boolean;
+}
diff --git a/progress/progress.d.ts b/progress/progress.d.ts
index 6eb55a917e..79c769deaa 100644
--- a/progress/progress.d.ts
+++ b/progress/progress.d.ts
@@ -114,6 +114,11 @@ declare module "progress"
          * Terminates a progress bar.
          */
         terminate():void;
+        
+        /**
+         * Completed status of progress (Boolean)
+         */
+        complete:boolean;
     }
     namespace ProgressBar { }
 
diff --git a/protractor-helpers/protractor-helpers.d.ts b/protractor-helpers/protractor-helpers.d.ts
index 20aad94c54..3966acd36e 100644
--- a/protractor-helpers/protractor-helpers.d.ts
+++ b/protractor-helpers/protractor-helpers.d.ts
@@ -108,4 +108,3 @@ declare module "protractor-helpers" {
   function getFilteredConsoleErrors() : webdriver.promise.IThenable<string[]>; // TODO - discuss handling in IE
 
 }
-
diff --git a/quill/quill-tests.ts b/quill/quill-tests.ts
index 3a87bd5948..172b5fd461 100644
--- a/quill/quill-tests.ts
+++ b/quill/quill-tests.ts
@@ -1,10 +1,6 @@
 /// <reference path="quill.d.ts" />
-/// <reference path="../requirejs/require.d.ts"/>
-
-//export var Quill = require("quill");
 
 function test_quill() {
-
     var quillEditor = new Quill('#editor', {
         modules:
         {
@@ -14,6 +10,31 @@ function test_quill() {
     });
 }
 
+function test_deleteText() {
+    var quillEditor = new Quill('#editor');
+    quillEditor.deleteText(0, 10);
+}
+
+function test_disable() {
+    let quillEditor = new Quill('#Editor');
+    quillEditor.disable();
+}
+
+function test_enable() {
+    let quillEditor = new Quill('#Editor');
+    quillEditor.enable();
+}
+
+function test_getContents() {
+    var quillEditor = new Quill('#editor');
+    var delta: QuillJS.DeltaStatic = quillEditor.getContents();
+}
+
+function test_getLength() {
+    var quillEditor = new Quill('#editor');
+    var num: number = quillEditor.getLength();
+}
+
 function test_getText() {
     var quillEditor = new Quill('#editor');
     var strValue: string = quillEditor.getText();
@@ -29,26 +50,11 @@ function test_getText_substring() {
     var strValue: string = quillEditor.getText(0, 10);
 }
 
-function test_getLength() {
-    var quillEditor = new Quill('#editor');
-    var num: number = quillEditor.getLength();
-}
-
-function test_getContents() {
-    var quillEditor = new Quill('#editor');
-    var delta: DeltaStatic = quillEditor.getContents();
-}
-
 function test_insertText() {
     var quillEditor = new Quill('#editor');
     quillEditor.insertText(0, "Hello World");
 }
 
-function test_deleteText() {
-    var quillEditor = new Quill('#editor');
-    quillEditor.deleteText(0, 10);
-}
-
 function test_formatText() {
     var quillEditor = new Quill('#editor');
     quillEditor.formatText(0, 5, 'bold', true);
@@ -63,15 +69,28 @@ function test_formatText2() {
     });
 }
 
-function test_formatLine() {
+function test_formatLine1() {
+    var quillEditor = new Quill('#editor');
+    quillEditor.formatLine(1, 3, 'api');
+}
+
+function test_formatLine2() {
     var quillEditor = new Quill('#editor');
     quillEditor.formatLine(1, 3, 'align', 'right');
 }
 
+function test_formatLine3() {
+    var quillEditor = new Quill('#editor');
+    quillEditor.formatLine(1, 3, {
+            'align': 'right',
+            'bold': false,
+        });
+}
+
 function test_insertEmbed() {
     var quillEditor = new Quill('#editor');
 
-    quillEditor.insertEmbed(10, 'image', 'http://quilljs.com/images/cloud.png');
+    quillEditor.insertEmbed(10, 'image', 'http://com/images/cloud.png');
 }
 
 function test_updateContents() {
@@ -96,12 +115,6 @@ function test_setContents() {
     ]);
 }
 
-function test_setHTML() {
-    var quillEditor = new Quill('#editor');
-
-    quillEditor.setHTML('<div>Hello</div>');
-}
-
 function test_setText() {
     var quillEditor = new Quill('#editor');
     quillEditor.setText('Hello\n');
@@ -113,10 +126,10 @@ function test_getSelection() {
 
     var range = quillEditor.getSelection();
     if (range) {
-        if (range.start == range.end) {
-            console.log('User cursor is at index', range.start);
+        if (range.index == range.length) {
+            console.log('User cursor is at index', range.index);
         } else {
-            var text = quillEditor.getText(range.start, range.end);
+            var text = quillEditor.getText(range.index, range.length);
             console.log('User has highlighted: ', text);
         }
     } else {
@@ -129,11 +142,6 @@ function test_setSelection() {
     quillEditor.setSelection(0, 5);
 }
 
-function test_prepareFormat() {
-    var quillEditor = new Quill('#editor');
-    quillEditor.prepareFormat('bold', true);
-}
-
 function test_focus() {
     var quillEditor = new Quill('#editor');
     quillEditor.focus();
@@ -144,14 +152,6 @@ function test_getBounds() {
     quillEditor.setText('Hello\nWorld\n');
 }
 
-function test_addModule() {
-    var quillEditor = new Quill('#editor');
-
-    var toolbar = quillEditor.addModule('toolbar', {
-        container: '#toolbar-container'
-    });
-}
-
 function test_getModule()
 {
     var quillEditor = new Quill('#editor');
@@ -159,15 +159,28 @@ function test_getModule()
     var toolbar = quillEditor.getModule('toolbar');
 }
 
-
-function test_addFormat()
-{
-    var quillEditor = new Quill('#editor');
-    quillEditor.addFormat('strike', { tag: 'S', prepare: 'strikeThrough' });
-}
-
 function test_addContainer()
 {
     var quillEditor = new Quill('#editor');
     quillEditor.addContainer('ql-custom');
 }
+
+function test_on_EventType1(){
+    var quillEditor = new Quill('#editor');
+    quillEditor.on('text-change', (newDelta, oldDelta, source)=>{
+        // happened
+    });
+
+}
+
+function test_PasteHTML()
+{
+    var quillEditor = new Quill('#editor');
+    quillEditor.pasteHTML('<h1>Quill Rocks</h1>');
+}
+
+function test_PasteHTML2()
+{
+    var quillEditor = new Quill('#editor');
+    quillEditor.pasteHTML(5, '<h1>Quill Rocks</h1>');
+}
diff --git a/quill/quill.d.ts b/quill/quill.d.ts
index 3cef088442..2e75e14c20 100644
--- a/quill/quill.d.ts
+++ b/quill/quill.d.ts
@@ -1,118 +1,95 @@
-// Type definitions for Quill
+// Type definitions for Quill v1.0.3
 // Project: http://quilljs.com
 // Definitions by: Sumit <https://github.com/sumitkm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path="../eventemitter2/eventemitter2.d.ts" />
+declare namespace QuillJS {
 
-declare interface  DeltaStatic{
-	ops? : Array<any>;
-	retain?: any,
-	delete?: any,
-	insert?: any,
-	attributes?: any
+    export interface QuillOptionsStatic {
+        debug?: string,
+        modules?: { [key: string]: any },
+        placeholder?: string,
+        readOnly?: boolean,
+        theme?: string
+    }
+
+    export interface BoundsStatic {
+        left: number,
+        top: number,
+        height: number,
+        width: number
+    }
+
+    export interface DeltaStatic {
+        ops?: Array<any>;
+        retain?: any,
+        delete?: any,
+        insert?: any,
+        attributes?: any
+    }
+
+    export interface RangeStatic {
+        new (): RangeStatic;
+        index: number;
+        length: number;
+    }
+
+    type sourceType = "api" | "user" | "silent";
+    type formatsType = { [key: string]: any };
+
+    export interface QuillStatic {
+        new (selector: string, options?: QuillOptionsStatic): QuillStatic;
+        deleteText(start: number, end: number, source?: sourceType): void;
+        disable(): void;
+        enable(enabled?: boolean): void;
+        getContents(start?: number, end?: number): DeltaStatic;
+        getLength(): number;
+        getText(start?: number, end?: number): string;
+        insertEmbed(index: number, type: string, url: string, source?: sourceType): void;
+        insertText(index: number, text: string, source?: sourceType): void;
+        insertText(index: number, text: string, format: string, value: string, source?: sourceType): void;
+        insertText(index: number, text: string, formats: formatsType, source?: sourceType): void;
+        pasteHTML(index: number, html: string, source?:sourceType): string;
+        pasteHTML(html:string, source?: sourceType): string;
+        setContents(delta: DeltaStatic, source?: sourceType): void;
+        setText(text: string, source?: sourceType): void;
+        update(source?: string): void;
+        updateContents(delta: DeltaStatic, source?: sourceType): void;
+
+        format(name: string, value: any, source?: sourceType): void;
+        formatLine(index: number, length: number, source?: sourceType): void;
+        formatLine(index: number, length: number, format: string, value: any, source?: sourceType): void;
+        formatLine(index: number, length: number, formats: formatsType, source?: sourceType): void;
+        formatText(index: number, length: number, source?: sourceType): void;
+        formatText(index: number, length: number, format: string, value: any, source?: sourceType): void;
+        formatText(index: number, length: number, formats: formatsType, source?: sourceType): void;
+        getFormat(range?: RangeStatic): formatsType;
+        getFormat(index: number, length?: number): formatsType;
+        removeFormat(index: Number, length: Number, source?: sourceType): void;
+
+        blur(): void;
+        focus(): void;
+        getBounds(index: number, length?: number): BoundsStatic;
+        getSelection(focus?: boolean): RangeStatic;
+        hasFocus(): boolean;
+        setSelection(index: number, length: number, source?: sourceType): void;
+        setSelection(range: RangeStatic, source?: sourceType): void;
+
+        on(eventName: string, callback: (<T>(delta: T, oldContents: T, source: string) => void) |
+            ((name: string, ...args: any[]) => void)): QuillStatic;
+        once(eventName: string, callback: (delta: DeltaStatic, source: string) => void): QuillStatic;
+        off(eventName: string, callback: (delta: DeltaStatic, source: string) => void): QuillStatic;
+
+        debug(level: string): void;
+        import(path: string): any;
+        register(path: string, def: any, suppressWarning?: boolean): void;
+        register(defs: formatsType, suppressWarning?: boolean): void;
+        addContainer(className: string, refNode?: any): any;
+        getModule(name: string): any
+    }
 }
 
-declare interface RangeStatic{
-	new(): RangeStatic;
-	start: number;
-	end: number;
-}
-
-declare interface QuillStatic {
-	new(selector: string, options?: Object):QuillStatic;
-
-    on(eventName: string, callback: (delta: DeltaStatic, source: string) => void): EventEmitter2;
-    addModule(id: string, options: any) : Object;
-
-    getText(): string;
-    getText(start: number): string;
-    getText(start: number, end: number): string;
-
-    getLength(): number;
-
-    getContents(): DeltaStatic;
-    getContents(start: number): DeltaStatic;
-    getContents(start: number, end: number): DeltaStatic;
-
-    getHTML(): string;
-
-    insertText(index: number, text: string): void;
-    insertText(index: number, text: string, name: string, value: string): void;
-    insertText(index: number, text: string, formats: any): void;
-    insertText(index: number, text: string, source: string) : void;
-    insertText(index: number, text: string, name: string, value: string, source: string): void;
-    insertText(index: number, text: string, formats: any, source: string): void;
-
-    deleteText(start: number, end: number): void;
-    deleteText(start: number, end: number, source: string): void;
-
-    formatText(start: number, end: number): void;
-    formatText(start: number, end: number, name: string, value: boolean): void;
-    formatText(start: number, end: number, formats: any): void;
-    formatText(start: number, end: number, source: string): void;
-    formatText(start: number, end: number, name: string, value: string, source: string): void;
-    formatText(start: number, end: number, formats: string, source: string): void;
-
-
-    formatLine(start: number, end: number): void;
-    formatLine(start: number, end: number, name: string, value: boolean): void;
-    formatLine(start: number, end: number, formats: any): void;
-    formatLine(start: number, end: number, source: string): void;
-    formatLine(start: number, end: number, name: string, value: string, source: string): void;
-    formatLine(start: number, end: number, formats: any, source: string): void;
-
-
-    insertEmbed(index: number, type: string, url: string): void;
-    insertEmbed(index: number, type: string, url: string, source: string): void;
-
-    updateContents(delta: DeltaStatic): void;
-
-    setContents(delta: DeltaStatic): void;
-
-    setHTML(html: string): void;
-
-    setText(text: string): void;
-
-    getSelection(): RangeStatic;
-
-    setSelection(start: number, end: number): void;
-    setSelection(start: number, end: number, source: string): void;
-    setSelection(range: RangeStatic): void;
-    setSelection(range: RangeStatic, source: string): void;
-
-    prepareFormat(format: string, value: boolean): void;
-
-    focus(): void;
-
-    getBounds(index: number): any;
-
-    registerModule(name: string, callback: (quill: QuillStatic, options: any) => {}): any;
-
-    addModule(name: string, options: any): any;
-
-    getModule(name: string): any;
-
-    onModuleLoad(name: string, callback: (input: any) => {}): void;
-
-    addFormat(name: string, config: any): void;
-
-    addContainer(cssClass: string, before?: number): HTMLDivElement;
-}
-
-declare module "Range"
-{
-	var Range: RangeStatic;
-	export = Range;
-}
-
-declare var Delta: DeltaStatic;
-
-declare module "Delta"{
-	export = Delta;
-}
-
-declare var Quill: QuillStatic;
+declare var Quill: QuillJS.QuillStatic;
 
 declare module "Quill" {
     export = Quill;
diff --git a/radium/radium-tests.tsx b/radium/radium-tests.tsx
index c8379b39b2..b8ad3928dd 100644
--- a/radium/radium-tests.tsx
+++ b/radium/radium-tests.tsx
@@ -43,6 +43,12 @@ class TestComponentWithConfig extends React.Component<{ a?: number }, {}> {
                         }}
                         >
                     </Style>
+                    <Style scopeSelector="test"
+                        rules={{
+                            background: "green"
+                        }}
+                        >
+                    </Style>
                 </Radium.StyleRoot>
             </div>
         )
diff --git a/radium/radium.d.ts b/radium/radium.d.ts
index 1989156877..0cb4304d96 100644
--- a/radium/radium.d.ts
+++ b/radium/radium.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for radium 0.17.1
+// Type definitions for radium 0.18.1
 // Project: https://github.com/formidablelabs/radium
-// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev/>, Philipp Holzer <https://github.com/nupplaphil/>, Alexey Svetliakov <https://github.com/asvetliakov/>
+// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev/>, Philipp Holzer <https://github.com/nupplaphil/>, Alexey Svetliakov <https://github.com/asvetliakov/>, Mikael Hermansson <https://github.com/mihe/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../react/react.d.ts"/>
@@ -19,10 +19,10 @@ declare module 'radium' {
          */
         export interface StyleProps {
             /**
-             * An object of CSS rules to render. Each key of the rules object is a CSS selector and the value is an object
-             * of styles. If rules is empty, the component will render nothing.
+             * An object of styles, or an object of CSS rules to render. Each key of the rules object is a CSS
+             * selector and the value is an object of styles. If rules is empty, the component will render nothing.
              */
-            rules: StyleRules;
+            rules: React.CSSProperties | StyleRules;
             /**
              * A string that any included selectors in rules will be appended to.
              * Use to scope styles in the component to a particular element. A good use case might be to generate a unique
diff --git a/ravenjs/ravenjs-tests.ts b/ravenjs/ravenjs-tests.ts
index db0ddd6932..eafa48871c 100644
--- a/ravenjs/ravenjs-tests.ts
+++ b/ravenjs/ravenjs-tests.ts
@@ -44,3 +44,5 @@ Raven.setUserContext({
 
 Raven.captureMessage('Broken!');
 Raven.captureMessage('Broken!', {tags: { key: "value" }});
+
+Raven.showReportDialog(options);
diff --git a/ravenjs/ravenjs.d.ts b/ravenjs/ravenjs.d.ts
index ae891a7cda..e7e68b69aa 100644
--- a/ravenjs/ravenjs.d.ts
+++ b/ravenjs/ravenjs.d.ts
@@ -183,6 +183,8 @@ interface RavenStatic {
 
     /** 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. */
     isSetup(): boolean;
+
+    showReportDialog(options: RavenOptions): void;
 }
 
 interface RavenTransportOptions {
diff --git a/rbush/rbush-tests.ts b/rbush/rbush-tests.ts
new file mode 100644
index 0000000000..305f4b7205
--- /dev/null
+++ b/rbush/rbush-tests.ts
@@ -0,0 +1,41 @@
+/// <reference path="rbush.d.ts" />
+
+import * as rbush from 'rbush';
+
+interface IndexedRect extends rbush.BBox {
+  index: number;
+}
+
+function test_rbush() {
+  var index = rbush<IndexedRect>();
+
+  index
+    .clear()
+    .insert({
+      minX: 0,
+      minY: 0,
+      maxX: 10,
+      maxY: 10,
+      index: 0,
+    });
+
+  index.all();
+  index.fromJSON(index.toJSON());
+
+  index.search({
+    minX: 5,
+    maxX: 15,
+    minY: 5,
+    maxY: 11,
+  })
+
+  index.load([
+    {
+      minX: 0,
+      minY: 0,
+      maxX: 10,
+      maxY: 10,
+      index: 0,
+    }
+  ])
+}
diff --git a/rbush/rbush.d.ts b/rbush/rbush.d.ts
new file mode 100644
index 0000000000..6c04ce241c
--- /dev/null
+++ b/rbush/rbush.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for rbush 2.0.1
+// Project: https://github.com/mourner/rbush
+// Definitions by: Dan Vanderkam <http://danvk.org/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace rbush {
+  export interface BBox {
+    minX: number;
+    minY: number;
+    maxX: number;
+    maxY: number;
+  }
+
+  export interface RBush<T> {
+    /**
+     * Insert an item. To insert many items, use load().
+     */
+    insert(item: T): RBush<T>;
+
+    /**
+     * Bulk-insert the given data into the tree.
+     *
+     * Bulk insertion is usually ~2-3 times faster than inserting items one by one.
+     * After bulk loading (bulk insertion into an empty tree), subsequent query
+     * performance is also ~20-30% better.
+     *
+     * Note that when you do bulk insertion into an existing tree, it bulk-loads
+     * the given data into a separate tree and inserts the smaller tree into the
+     * larger tree. This means that bulk insertion works very well for clustered
+     * data (where items in one update are close to each other), but makes query
+     * performance worse if the data is scattered.
+     */
+    load(items: T[]): RBush<T>;
+
+    /**
+     * Remove a previously inserted item.
+     *
+     * By default, RBush removes objects by reference. However, you can pass a
+     * custom equals function to compare by value for removal, which is useful
+     * when you only have a copy of the object you need removed (e.g. loaded
+     * from server).
+     */
+    remove(item: T, equals?: (a: T, b: T) => boolean): RBush<T>;
+
+    /** Remove all items */
+    clear(): RBush<T>;
+
+    /**
+     * Returns an array of data items (points or rectangles) that the given
+     * bounding box intersects.
+     *
+     * Note that the search method accepts a bounding box in {minX, minY, maxX, maxY}
+     * format regardless of the format specified in the constructor (which only
+     * affects inserted objects).
+     */
+    search(bbox: BBox): T[];
+
+    /** Returns all items of the tree. */
+    all(): T[];
+
+    /**
+     * Returns true if there are any items intersecting the given bounding box,
+     * otherwise false.
+     */
+    collides(bbox: BBox): boolean;
+
+    /**
+     * Export data as JSON object.
+     *
+     * Importing and exporting as JSON allows you to use RBush on both the server
+     * (using Node.js) and the browser combined, e.g. first indexing the data on
+     * the server and and then importing the resulting tree data on the client
+     * for searching.
+     *
+     * Note that the nodeSize option passed to the constructor must be the same
+     * in both trees for export/import to work properly.
+     */
+    toJSON(): any;
+
+    /**
+     * Import previously exported data.
+     *
+     * Importing and exporting as JSON allows you to use RBush on both the server
+     * (using Node.js) and the browser combined, e.g. first indexing the data on
+     * the server and and then importing the resulting tree data on the client
+     * for searching.
+     *
+     * Note that the nodeSize option passed to the constructor must be the same
+     * in both trees for export/import to work properly.
+     */
+    fromJSON(data: any): RBush<T>;
+  }
+
+  interface IRBush {
+    /**
+     * Create a spatial index.
+     *
+     * An optional argument to rbush defines the maximum number of entries in a tree node.
+     * 9 (used by default) is a reasonable choice for most applications. Higher value means\
+     * faster insertion and slower search, and vice versa.
+     */
+    <T extends BBox>(nodeSize?: number): RBush<T>;
+    <T>(nodeSize: number, formatter: string[]): RBush<T>;
+  }
+}
+
+declare module 'rbush' {
+  const temp: rbush.IRBush;
+  export = temp;
+}
diff --git a/react-daterange-picker/react-daterange-picker-tests.tsx b/react-daterange-picker/react-daterange-picker-tests.tsx
new file mode 100644
index 0000000000..98665fddb6
--- /dev/null
+++ b/react-daterange-picker/react-daterange-picker-tests.tsx
@@ -0,0 +1,178 @@
+/// <reference path="react-daterange-picker.d.ts" />
+/// <reference path="../react/react-global.d.ts" />
+
+// Test app from https://github.com/onefinestay/react-daterange-picker/blob/master/example/index.jsx
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as moment from 'moment';
+import 'moment-range';
+import * as DateRangePicker from 'react-daterange-picker';
+
+interface AppProps extends ReactDateRangePicker.Props {
+}
+
+class App extends React.Component<AppProps, any> {
+    constructor(props: AppProps, context: any) {
+        super(props, context);
+
+        this.state = {};
+    }
+
+    handleSelect(value: AppProps, states: any): void {
+        this.setState({value, states});
+    }
+
+    render(): any {
+        return (
+            <div>
+                <DateRangePicker {...this.props}
+                    onSelect={this.handleSelect.bind(this)}
+                    value={this.state.value} />
+                <div>
+                    <input type="text"
+                        value={this.state.value ? this.state.value.start.format('LL') : ""}
+                        readOnly={true}
+                        placeholder="Start date"/>
+                  <input type="text"
+                        value={this.state.value ? this.state.value.end.format('LL') : ""}
+                        readOnly={true}
+                        placeholder="End date" />
+                </div>
+            </div>
+        );
+    }
+}
+
+class DateSinglePicker extends React.Component<AppProps, any> {
+    constructor(props : AppProps, context: any) {
+        super(props, context);
+
+        this.state = {};
+    }
+
+    handleSelect(value: AppProps) {
+        this.setState({value: value});
+    }
+
+    render() {
+        return (
+            <div>
+                <DateRangePicker {...this.props} onSelect={this.handleSelect.bind(this)}
+                  value={this.state.value} />
+                <div>
+                  <input type="text"
+                    value={this.state.value ? this.state.value.format('LL') : ""}
+                    readOnly={true} />
+                </div>
+            </div>
+        );
+    }
+}
+
+export class Main extends React.Component<any, any> {
+
+    render() {
+        const stateDefinitions: ReactDateRangePicker.StateDefinitions = {
+            available: {
+                color: '#ffffff',
+                label: 'Available',
+            },
+            enquire: {
+                color: '#ffd200',
+                label: 'Enquire',
+            },
+            unavailable: {
+                selectable: false,
+                color: '#78818b',
+                label: 'Unavailable',
+            }
+        };
+
+        const dateRanges = [
+            {
+                state: 'enquire',
+                range: moment.range(
+                    moment().add(2, 'weeks').subtract(5, 'days'),
+                    moment().add(2, 'weeks').add(6, 'days')
+                ),
+            },
+            {
+                state: 'unavailable',
+                range: moment.range(
+                    moment().add(3, 'weeks'),
+                    moment().add(3, 'weeks').add(5, 'days')
+                ),
+            },
+        ];
+
+        const initialStart = moment().add(1, 'weeks').startOf('day');
+        const initialEnd = moment().add(1, 'weeks').add(3, 'days').startOf('day');
+        const range = moment.range(initialStart, initialEnd);
+
+        return (
+            <div className="content">
+                <div className="example">
+                    <App
+                        firstOfWeek={1}
+                        numberOfCalendars={2}
+                        selectionType='range'
+                        minimumDate={new Date()}
+                        maximumDate={moment().add(2, 'years').toDate()}
+                        stateDefinitions={stateDefinitions}
+                        dateStates={dateRanges}
+                        defaultState="available"
+                        value={range}
+                        showLegend={true}
+                    />
+                </div>
+
+                <div className="examples">
+                    <h2>Examples</h2>
+
+                    <div className="example">
+                        <h4>Range with no date states</h4>
+                        <App
+                            numberOfCalendars={2}
+                            selectionType="range"
+                            minimumDate={new Date()}
+                        />
+                    </div>
+
+                    <div className="example">
+                        <h4>Range with day-long ranges allowed</h4>
+                        <App
+                            numberOfCalendars={2}
+                            selectionType="range"
+                            singleDateRange={true}
+                            minimumDate={new Date()}
+                        />
+                    </div>
+
+                    <div className="example">
+                        <h4>Range with no minimum date</h4>
+                        <App
+                            numberOfCalendars={2}
+                            selectionType="range"
+                            singleDateRange={true}
+                        />
+                    </div>
+                    <div className="example">
+                        <h4>Single with no date states</h4>
+                        <DateSinglePicker
+                            numberOfCalendars={2}
+                            selectionType="single"
+                            minimumDate={new Date()}
+                        />
+                    </div>
+                </div>
+            </div>
+        );
+    }
+}
+
+const MainFactory = React.createFactory(Main);
+
+ReactDOM.render(
+    MainFactory(),
+    document.getElementById('app')
+);
diff --git a/react-daterange-picker/react-daterange-picker.d.ts b/react-daterange-picker/react-daterange-picker.d.ts
new file mode 100644
index 0000000000..4754e77140
--- /dev/null
+++ b/react-daterange-picker/react-daterange-picker.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for React Daterange Picker v1.1.0
+// Project: https://github.com/onefinestay/react-daterange-picker
+// Definitions by: UNCOVER TRUTH Inc. <https://github.com/uncovertruth/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+/// <reference path="../moment/moment.d.ts" />
+/// <reference path="../moment-range/moment-range.d.ts" />
+
+declare module 'react-daterange-picker' {
+    import DateRangePicker = ReactDateRangePicker.DateRangePicker;
+    export = DateRangePicker;
+}
+
+declare namespace ReactDateRangePicker {
+    import React = __React;
+
+    interface Props extends React.Props<{}> {
+        bemBlock?: string;
+        bemNamespace?: string;
+        dateStates?: DateState[];
+        defaultState?: string;
+        disableNavigation?: boolean;
+        // Use Number Literal Types after TypeScript 2.0 GA released.
+        firstOfWeek?: number; // React.PropTypes.oneOf([0, 1, 2, 3, 4, 5, 6])
+        helpMessage?: string;
+        initialFromValue?: boolean;
+        initialDate?: Date;
+        initialMonth?: number;
+        initialYear?: number;
+        initialRange?: {};
+        maximumDate?: Date;
+        minimumDate?: Date;
+        numberOfCalendars?: number;
+        onHighlightDate?(date: Date): void;
+        onHighlightRange?(date: Date): void;
+        onSelect?(value: Props): void;
+        onSelectStart?(value: moment.Moment): void;
+        paginationArrowComponent?: PaginationArrow;
+        selectedLabel?: string;
+        selectionType?: 'single' |'range';
+        singleDateRange?: boolean;
+        showLegend?: boolean;
+        stateDefinitions?: StateDefinitions;
+        value?: moment.Moment | moment.Range;
+    }
+
+    interface DateState {
+        state: string;
+        range: moment.Range;
+    }
+
+    interface StateDefinitions {
+        [key: string]: StateDefinition;
+    }
+
+    interface StateDefinition {
+        color: string;
+        label: string;
+        selectable?: boolean;
+    }
+
+    interface PaginationArrowProps extends React.Props<{}> {
+        disabled?: boolean;
+        onTrigger?(): void;
+        direction?: 'next' | 'previous';
+    }
+
+    class PaginationArrow extends React.Component<PaginationArrowProps, {}> {
+    }
+
+    class DateRangePicker extends React.Component<Props, {}> {
+    }
+
+    namespace DateRangePicker {
+    }
+}
diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index fb19dca42d..5df21529e6 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -247,7 +247,7 @@ declare namespace ReactRouter {
       isActive: (pathOrLoc: H.LocationDescriptor, indexOnly?: boolean) => boolean
     }
 
-    function withRouter<C extends React.ComponentClass<any>>(component: C): C
+    function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any, any>>(component: C): C
 
     /* utils */
 
diff --git a/react-select/react-select-tests.tsx b/react-select/react-select-tests.tsx
index de45b52d32..3b2ce8b429 100644
--- a/react-select/react-select-tests.tsx
+++ b/react-select/react-select-tests.tsx
@@ -5,7 +5,7 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 
-import { Option, ReactSelectProps, ReactAsyncSelectProps, MenuRendererProps } from "react-select-props";
+import { Option, ReactSelectProps, ReactAsyncSelectProps, ReactCreatableSelectProps, MenuRendererProps } from "react-select-props";
 import Select = require("react-select");
 
 const CustomOption = React.createClass({
@@ -104,7 +104,6 @@ class SelectTest extends React.Component<React.Props<{}>, {}> {
             key: "1",
             options: options,
             optionRenderer: optionRenderer,
-            allowCreate: true,
             autofocus: true,
             autosize: true,
             clearable: true,
@@ -200,3 +199,28 @@ class SelectAsyncTest extends React.Component<React.Props<{}>, {}> {
     }
 
 }
+
+class SelectCreatableTest extends React.Component<React.Props<{}>, {}> {
+
+    render() {
+        const options: Option[] = [{ label: "Foo", value: "bar" }];
+        const onChange = (value: any) => console.log(value);
+
+        const creatableSelectProps: ReactCreatableSelectProps = {
+            name: "test-creatable-select",
+            value: "bar",
+            options: options,
+            onChange: onChange,
+            isOptionUnique: () => { return true; },
+            isValidNewOption: () => { return true; },
+            newOptionCreator: () => { return { label: "NewFoo", value: "newBar" }; },
+            promptTextCreator: () => { return ""; },
+            shouldKeyDownEventCreateNewOption: () => { return true; }
+        };
+
+        return <div>
+            <Select.Creatable {...creatableSelectProps} />
+        </div>
+    }
+
+}
diff --git a/react-select/react-select.d.ts b/react-select/react-select.d.ts
index f58cdafbdb..701d5efc4a 100644
--- a/react-select/react-select.d.ts
+++ b/react-select/react-select.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-select v1.0.0
 // Project: https://github.com/JedWatson/react-select
-// Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet/>, Gilad Gray <https://github.com/giladgray/>
+// Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet/>, Gilad Gray <https://github.com/giladgray/>, Izaak Baker <https://github.com/iebaker/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../react/react.d.ts"/>
@@ -68,12 +68,6 @@ declare namespace ReactSelect {
          * @default 'Add "{label}"?'
          */
         addLabelText?: string;
-        /**
-         * allow new options to be created in multi mode (displays an "Add <option> ?" item
-         * when a value not already in the options array is entered)
-         * @default false
-         */
-        allowCreate?: boolean;
         /**
          * blurs the input element after a selection has been made. Handy for lowering the keyboard on mobile devices.
          * @default false
@@ -202,11 +196,6 @@ declare namespace ReactSelect {
          * field name, for hidden `<input>` tag
          */
         name?: string;
-        /**
-         * factory to create new options when `allowCreate` is true
-         * @default false
-         */
-        newOptionCreator?: (input: string) => Option;
         /**
          * placeholder displayed when there are no matching search results or a falsy value to hide it
          * @default "No results found"
@@ -401,10 +390,41 @@ declare namespace ReactSelect {
         searchingText?: string;
     }
 
+    interface ReactCreatableSelectProps extends ReactSelectProps {
+        /**
+         * Searches for any matching option within the set of options. This function prevents
+         * duplicate options from being created.
+         */
+        isOptionUnique?: (arg: { option: Option, options: Option[], labelKey: string, valueKey: string }) => boolean;
+
+        /**
+         * Determines if the current input text represents a valid option.
+         */
+        isValidNewOption?: (arg: { label: string }) => boolean;
+
+        /**
+         * factory to create new options
+         */
+        newOptionCreator?: (input: string) => Option;
+
+        /**
+         * Creates prompt/placeholder for option text.
+         */
+        promptTextCreator?: (filterText: string) => string;
+
+        /**
+         * Decides if a keyDown event (eg its 'keyCode') should result in the creation of a new option.
+         */
+        shouldKeyDownEventCreateNewOption?: (arg: { keyCode: number }) => boolean;
+    }
+
+    class ReactSelectCreatableClass extends __React.Component<ReactCreatableSelectProps, {}> {
+    }
     class ReactSelectAsyncClass extends __React.Component<ReactAsyncSelectProps, {}> {
     }
     class ReactSelectClass extends __React.Component<ReactSelectProps, {}> {
         static Async: ReactSelectAsyncClass;
+        static Creatable: ReactSelectCreatableClass;
     }
 
 }
@@ -419,6 +439,7 @@ declare module "react-select-props" {
     import MenuRendererProps = ReactSelect.MenuRendererProps;
     import ReactSelectProps = ReactSelect.ReactSelectProps;
     import ReactAsyncSelectProps = ReactSelect.ReactAsyncSelectProps;
+    import ReactCreatableSelectProps = ReactSelect.ReactCreatableSelectProps;
 
-    export { MenuRendererProps, ReactSelectProps, ReactAsyncSelectProps, Option };
+    export { MenuRendererProps, ReactSelectProps, ReactAsyncSelectProps, ReactCreatableSelectProps, Option };
 }
diff --git a/react-virtualized/react-virtualized-tests.tsx b/react-virtualized/react-virtualized-tests.tsx
new file mode 100644
index 0000000000..d3ee9c3590
--- /dev/null
+++ b/react-virtualized/react-virtualized-tests.tsx
@@ -0,0 +1,309 @@
+/// <reference path="react-virtualized.d.ts"/>
+/// <reference path="../react/react.d.ts"/>
+/// <reference path="../react/react-dom.d.ts"/>
+
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+
+import {
+    Collection,
+    FlexTable,
+    FlexColumn,
+    SortDirection,
+    Grid,
+    VirtualScroll,
+    ArrowKeyStepper,
+    AutoSizer,
+    CellMeasurer,
+    ColumnSizer,
+    InfiniteLoader,
+    ScrollSync,
+    WindowScroller,
+} from "react-virtualized";
+
+/*
+ * Collection
+ */
+
+function CollectionTest() {
+    const list = [
+        { name: "Brian Vaughn", x: 13, y: 34, width: 123, size: 234, height: 123 }
+    ];
+
+    // Render your grid
+    ReactDOM.render(
+        <Collection
+            cellCount={list.length}
+            cellRenderer={({ index }) => list[index].name}
+            cellSizeAndPositionGetter={({ index }) => {
+                const datum = list[index];
+                return {
+                    height: datum.height,
+                    width: datum.width,
+                    x: datum.x,
+                    y: datum.y
+                };
+            } }
+            height={300}
+            width={300}
+            />,
+        document.getElementById("example")
+    );
+}
+
+
+function FlexTableTest() {
+    const list = [
+        { name: 'Brian Vaughn', description: 'Software engineer' }
+        // And so on...
+    ];
+
+    // Render your table
+    ReactDOM.render(
+        <FlexTable
+            width={300}
+            height={300}
+            headerHeight={20}
+            rowHeight={30}
+            rowCount={list.length}
+            rowGetter={
+                ({ index }) => list[index]
+            }
+            >
+            <FlexColumn
+                label="Name"
+                dataKey="name"
+                width={100}
+                />
+            <FlexColumn
+                width={200}
+                label="Description"
+                dataKey="description"
+                />
+        </FlexTable>,
+        document.getElementById("example")
+    );
+}
+
+function GridTest() {
+    // Grid data as an array of arrays
+    const list = [
+        ['Brian Vaughn', 'Software Engineer', 'San Jose', 'CA', 95125 /* ... */]
+        // And so on...
+    ];
+
+    // Render your grid
+    ReactDOM.render(
+        <Grid
+            width={300}
+            height={300}
+            columnWidth={100}
+            rowHeight={30}
+            columnCount={list[0].length}
+            rowCount={list.length}
+            cellRenderer={({ columnIndex, isScrolling, rowIndex }) => list[rowIndex][columnIndex]}
+            />,
+        document.getElementById('example')
+    );
+}
+
+function VirtualScrollTest() {
+    // List data as an array of strings
+    const list = [
+        'Brian Vaughn'
+        // And so on...
+    ];
+
+    // Render your list
+    ReactDOM.render(
+        <VirtualScroll
+            width={300}
+            height={300}
+            rowCount={list.length}
+            rowHeight={20}
+            rowRenderer={({ index, isScrolling }) => list[index]}
+            />,
+        document.getElementById('example')
+    );
+}
+
+function ArrowKeyStepperTest() {
+    const columnCount = 12;
+    const rowCount = 3;
+
+    ReactDOM.render(
+        <ArrowKeyStepper columnCount={columnCount} rowCount={rowCount}>
+            {({ onSectionRendered, scrollToColumn, scrollToRow }) => (
+                <Grid
+                    columnCount={columnCount}
+                    onSectionRendered={onSectionRendered}
+                    rowCount={rowCount}
+                    scrollToColumn={scrollToColumn}
+                    scrollToRow={scrollToRow}
+                    />
+            ) }
+        </ArrowKeyStepper>,
+        document.getElementById('example')
+    );
+}
+
+function AutoSizerTest() {
+    // List data as an array of strings
+    const list = [
+        'Brian Vaughn'
+        // And so on...
+    ];
+
+    // Render your list
+    ReactDOM.render(
+        <AutoSizer>
+            {({ height, width }) => (
+                <VirtualScroll
+                    width={width}
+                    height={height}
+                    rowCount={list.length}
+                    rowHeight={20}
+                    rowRenderer={
+                        ({ index }) => list[index] // Could also be a DOM element
+                    }
+                    />
+            ) }
+        </AutoSizer>,
+        document.getElementById('example')
+    );
+}
+
+function CellMeasurerTest() {
+    const columnCount = 12;
+    const rowCount = 3;
+    const cellRenderer = ({ columnIndex, rowIndex }) => `${rowIndex}, ${columnIndex}`;
+    const fixedRowHeight = 42;
+    const height = 12;
+    const width = 12;
+
+    ReactDOM.render(
+        <CellMeasurer
+            cellRenderer={cellRenderer}
+            columnCount={columnCount}
+            height={fixedRowHeight}
+            rowCount={rowCount}
+            >
+            {({ getColumnWidth }) => (
+                <Grid
+                    columnCount={columnCount}
+                    columnWidth={getColumnWidth}
+                    height={height}
+                    cellRenderer={cellRenderer}
+                    rowCount={rowCount}
+                    rowHeight={fixedRowHeight}
+                    width={width}
+                    />
+            ) }
+        </CellMeasurer>,
+        document.getElementById('example')
+    );
+}
+
+function ColumnSizerTest() {
+    ReactDOM.render(
+        <ColumnSizer
+            columnMaxWidth={100}
+            columnMinWidth={50}
+            columnCount={12}
+            width={120}
+            >
+            {({ adjustedWidth, getColumnWidth, registerChild }) => (
+                <Grid
+                    ref={registerChild}
+                    columnWidth={getColumnWidth}
+                    columnCount={12}
+                    height={12}
+                    cellRenderer={() => "test"}
+                    rowHeight={50}
+                    rowCount={12}
+                    width={adjustedWidth}
+                    />
+            ) }
+        </ColumnSizer>,
+        document.getElementById('example')
+    );
+}
+
+function InfiniteLoaderTest() {
+    const list: string[] = [];
+
+    function isRowLoaded({ index }) {
+        return !!list[index];
+    }
+
+    function loadMoreRows({ startIndex, stopIndex }) {
+        return list.push('test');
+    }
+
+    // Render your list
+    ReactDOM.render(
+        <InfiniteLoader
+            isRowLoaded={isRowLoaded}
+            loadMoreRows={loadMoreRows}
+            rowCount={12}
+            >
+            {({ onRowsRendered, registerChild }) => (
+                <VirtualScroll
+                    ref={registerChild}
+                    width={300}
+                    height={200}
+                    onRowsRendered={onRowsRendered}
+                    rowCount={list.length}
+                    rowHeight={20}
+                    rowRenderer={
+                        ({ index }) => list[index] // Could also be a DOM element
+                    }
+                    />
+            ) }
+        </InfiniteLoader>,
+        document.getElementById('example')
+    );
+}
+
+function ScrollSyncTest() {
+    return (
+        <ScrollSync>
+            {({ clientHeight, clientWidth, onScroll, scrollHeight, scrollLeft, scrollTop, scrollWidth }) => (
+                <div className='Table'>
+                    <div className='LeftColumn'>
+                        <VirtualScroll
+                            rowRenderer={() => "test"}
+                            rowCount={42}
+                            height={12}
+                            width={12}
+                            rowHeight={120}
+                            scrollTop={scrollTop}/>
+                        />
+                    </div>
+                    <div className='RightColumn'>
+                        <Grid
+                            onScroll={onScroll}/>
+                    </div>
+                </div>
+            ) }
+        </ScrollSync>
+    );
+}
+
+function WindowScrollerTest() {
+    ReactDOM.render(
+        <WindowScroller>
+            {({ height, isScrolling, scrollTop }) => (
+                <VirtualScroll
+                    autoHeight
+                    height={height}
+                    rowCount={12}
+                    rowHeight={12}
+                    rowRenderer={() => 'test'}
+                    scrollTop={scrollTop}
+                    width={120}/>
+            ) }
+        </WindowScroller>,
+        document.getElementById('example')
+    );
+}
diff --git a/react-virtualized/react-virtualized.d.ts b/react-virtualized/react-virtualized.d.ts
new file mode 100644
index 0000000000..aad19c44a3
--- /dev/null
+++ b/react-virtualized/react-virtualized.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for react-virtualized
+// Project: https://github.com/bvaughn/react-virtualized
+// Definitions by: Ian Ker-Seymer <https://github.com/ianks>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./../react/react.d.ts" />
+
+declare module "react-virtualized" {
+    import * as React from "react";
+
+    /*
+     * Components
+     */
+
+    interface VirtualScrollProps {
+        className?: string;
+        autoHeight?: boolean;
+        estimatedRowSize?: number;
+        height: number;
+        noRowsRenderer?: Function;
+        onRowsRendered?: (info: { overscanStartIndex: number, overscanStopIndex: number, startIndex: number, stopIndex: number }) => void;
+        onScroll?: (info: { clientHeight: number, scrollHeight: number, scrollTop: number }) => void;
+        overscanRowCount?: number;
+        rowHeight: number | ((info: { index: number }) => number);
+        rowRenderer: (info: { index: number, isScrolling: boolean }) => React.ReactNode;
+        rowClassName?: string | ((info: { index: number }) => string);
+        rowCount: number;
+        rowStyle?: React.CSSProperties | ((info: { index: number }) => React.CSSProperties);
+        scrollToAlignment?: string;
+        scrollToIndex?: number;
+        scrollTop?: number;
+        style?: React.CSSProperties;
+        tabIndex?: number;
+        width: number;
+    }
+    export class VirtualScroll extends React.Component<VirtualScrollProps, {}> { }
+
+    type CollectionProps = any;
+    export class Collection extends React.Component<CollectionProps, {}> { }
+
+    type FlexTableProps = any;
+    export class FlexTable extends React.Component<FlexTableProps, {}> { }
+
+    type FlexColumnProps = any;
+    export class FlexColumn extends React.Component<FlexColumnProps, {}> { }
+
+    type SortDirectionProps = any;
+    export class SortDirection extends React.Component<SortDirectionProps, {}> { }
+
+    type GridProps = any;
+    export class Grid extends React.Component<GridProps, {}> { }
+
+
+    /*
+     * Higher-Order Components
+     */
+
+    interface AutoSizerProps {
+        disableHeight?: boolean;
+        disableWidth?: boolean;
+        onResize?: (info: { height: number, width: number }) => any;
+    }
+    export class AutoSizer extends React.Component<AutoSizerProps, {}> { }
+
+    interface ArrowKeyStepperProps {
+        children?: React.StatelessComponent<{
+            onSectionRendered: Function,
+            scrollToColumn: number,
+            scrollToRow: number
+        }>;
+        className?: string;
+        columnCount: number;
+        rowCount: number;
+    }
+    export class ArrowKeyStepper extends React.Component<ArrowKeyStepperProps, {}> { }
+
+    interface CellMeasurerProps {
+        cellRenderer: (info: { columnIndex: number, rowIndex: number }) => React.ReactNode;
+        cellSizeCache?: {
+            clearAllColumnWidths(): void;
+            clearAllRowHeights(): void;
+            clearColumnWidth(index: number): void;
+            clearRowHeight(index: number): void;
+            getColumnWidth(index: number): number;
+            getRowHeight(index: number): number;
+            hasColumnWidth(index: number): boolean;
+            hasRowHeight(index: number): boolean;
+            setColumnWidth(index: number, width: number): void;
+            setRowHeight(index: number, height: number): void;
+        };
+        children?: React.StatelessComponent<{
+            getColumnWidth: () => number,
+            getRowHeight: () => number,
+            resetMeasurements: () => any,
+            resetMeasurementsForColumn: (index: number) => any,
+            resetMeasurementsForRow: (index: number) => any,
+        }>;
+        columnCount: number;
+        container?: React.ReactType;
+        height?: number;
+        rowCount: number;
+        width?: number;
+    }
+    export class CellMeasurer extends React.Component<CellMeasurerProps, {}> { }
+
+    interface ColumnSizerProps {
+        children?: React.StatelessComponent<{ adjustedWidth: number, getColumnWidth: () => number, registerChild: any }>;
+        columnMaxWidth?: number;
+        columnMinWidth?: number;
+        columnCount?: number;
+        width: number;
+    }
+    export class ColumnSizer extends React.Component<ColumnSizerProps, {}> { }
+
+    type InfiniteLoaderProps = any;
+    export class InfiniteLoader extends React.Component<InfiniteLoaderProps, {}> { }
+
+    type ScrollSyncProps = any;
+    export class ScrollSync extends React.Component<ScrollSyncProps, {}> { }
+
+    type WindowScrollerProps = any;
+    export class WindowScroller extends React.Component<WindowScrollerProps, {}> { }
+}
diff --git a/redux-form/redux-form.d.ts b/redux-form/redux-form.d.ts
index e0fd8ead8d..1efd564fae 100644
--- a/redux-form/redux-form.d.ts
+++ b/redux-form/redux-form.d.ts
@@ -11,6 +11,8 @@ declare module 'redux-form' {
   import { Component, SyntheticEvent, FormEventHandler } from 'react';
   import { Dispatch, ActionCreator, Reducer } from 'redux';
 
+  export const actionTypes: {[actionName:string]: string};
+
   export type FieldValue = any;
 
   export type FormData = {[fieldName:string]: FieldValue};
@@ -39,7 +41,7 @@ declare module 'redux-form' {
      * The error for this field if its value is not passing validation. Both
      * synchronous and asynchronous validation errors will be reported here.
      */
-    error?: string[];
+    error?: any;
 
     /**
      * The value for this field as supplied in initialValues to the form.
@@ -163,7 +165,7 @@ declare module 'redux-form' {
      * result from the synchronous validation function, the asynchronous
      * validation, or the rejected promise from onSubmit.
      */
-    error?: string[];
+    error?: any;
 
     /**
      * The form data, in the form { field1: <Object>, field2: <Object> }. The
diff --git a/redux-mock-store/redux-mock-store-tests.ts b/redux-mock-store/redux-mock-store-tests.ts
index 4a6045c288..960591f8fb 100644
--- a/redux-mock-store/redux-mock-store-tests.ts
+++ b/redux-mock-store/redux-mock-store-tests.ts
@@ -1,6 +1,6 @@
 /// <reference path="./redux-mock-store.d.ts" />
 
-import configureStore from 'redux-mock-store';
+import configureStore, {IStore} from 'redux-mock-store';
 
 // Redux store API tests
 // The following test are taken from ../redux/redux-tests.ts
@@ -25,10 +25,11 @@ function loggingMiddleware() {
     };
 }
 
-const storeMock = configureStore([loggingMiddleware]);
+const storeMock = configureStore<number>([loggingMiddleware]);
 const initialState = 0
-let store = storeMock(initialState);
+let store: IStore<number>;
 
+store = storeMock(initialState);
 
 store.subscribe(() => {
     // ...
@@ -40,4 +41,4 @@ store.dispatch({ type: 'INCREMENT' });
 // Additional mock store API tests
 var actions: Array<any> = store.getActions();
 
-store.clearActions();
\ No newline at end of file
+store.clearActions();
diff --git a/redux-mock-store/redux-mock-store.d.ts b/redux-mock-store/redux-mock-store.d.ts
index 770603826a..6cc463e2d1 100644
--- a/redux-mock-store/redux-mock-store.d.ts
+++ b/redux-mock-store/redux-mock-store.d.ts
@@ -10,9 +10,9 @@ declare module 'redux-mock-store' {
 
     function createMockStore<T>(middlewares?:Redux.Middleware[]):mockStore<T>
 
-    type mockStore<T> = (state?:T) => IStore<T>;
+    export type mockStore<T> = (state?:T) => IStore<T>;
 
-    type IStore<T> = {
+    export type IStore<T> = {
         dispatch(action: any):any
         getState():T
         getActions():Object[]
@@ -21,4 +21,4 @@ declare module 'redux-mock-store' {
     }
 
     export default createMockStore
-}
\ No newline at end of file
+}
diff --git a/redux-promise/redux-promise-tests.ts b/redux-promise/redux-promise-tests.ts
index 724f695261..92a672488b 100644
--- a/redux-promise/redux-promise-tests.ts
+++ b/redux-promise/redux-promise-tests.ts
@@ -4,7 +4,7 @@
 
 import {createAction} from 'redux-actions';
 import { createStore, applyMiddleware, PromiseAction } from 'redux';
-import promise from 'redux-promise';
+import promise = require('redux-promise');
 
 declare var userReducer: any;
 
diff --git a/redux-promise/redux-promise.d.ts b/redux-promise/redux-promise.d.ts
index f3fbea7240..7656def908 100644
--- a/redux-promise/redux-promise.d.ts
+++ b/redux-promise/redux-promise.d.ts
@@ -19,5 +19,5 @@ declare namespace ReduxPromise {
 
 declare module "redux-promise" {
 	var promise: ReduxPromise.Promise;
-	export default promise;
-}
\ No newline at end of file
+	export = promise;
+}
diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
index 5a5927284f..e7febe94d3 100644
--- a/request-promise/request-promise.d.ts
+++ b/request-promise/request-promise.d.ts
@@ -23,6 +23,7 @@ declare module 'request-promise' {
             finally<TResult>(handler: () => PromiseLike<TResult>): Promise<any>;
             finally<TResult>(handler: () => TResult): Promise<any>;
             promise(): Promise<any>;
+            cancel(): void;
         }
 
         interface RequestPromiseOptions extends request.CoreOptions {
diff --git a/resolve-from/resolve-from-tests.ts b/resolve-from/resolve-from-tests.ts
index 840a19b861..7c9e8e17f1 100644
--- a/resolve-from/resolve-from-tests.ts
+++ b/resolve-from/resolve-from-tests.ts
@@ -1,6 +1,11 @@
 /// <reference path="resolve-from.d.ts" />
 
-// Much better testing in https://github.com/typed-typings/typed-resolve-from
-if (typeof resolveFrom !== 'function') {
-  throw new Error('resolveFrom is not a function');
-}
+import resolveFrom1 = require('resolve-from');
+import * as resolveFrom2 from 'resolve-from';
+
+let from: string;
+let moduleId: string;
+let result: string;
+
+result = resolveFrom1(from, moduleId);
+result = resolveFrom2(from, moduleId);
diff --git a/resolve-from/resolve-from.d.ts b/resolve-from/resolve-from.d.ts
index a8d0441136..4b8c92a516 100644
--- a/resolve-from/resolve-from.d.ts
+++ b/resolve-from/resolve-from.d.ts
@@ -1,9 +1,15 @@
 // Type definitions for resolve-from
 // Project: https://github.com/sindresorhus/resolve-from
-// Definitions by: unional <https://github.com/unional>
+// Definitions by: unional <https://github.com/unional>, tswaters <https://github.com/tswaters>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare function resolveFrom(fromDir: string, moduleId: string): string;
 
 declare module "resolve-from" {
+
+  function resolveFrom(fromDir: string, moduleId: string): string;
+
+  namespace resolveFrom {
+
+  }
+
   export = resolveFrom;
 }
diff --git a/revalidator/revalidator-tests.ts b/revalidator/revalidator-tests.ts
index b65c9f971b..8c622b3bee 100644
--- a/revalidator/revalidator-tests.ts
+++ b/revalidator/revalidator-tests.ts
@@ -1,3 +1,95 @@
 /// <reference path="./revalidator.d.ts" />
+import revalidator = require('revalidator');
+
+let someObject = {
+  hello: true,
+  there: 'string'
+};
+
+let schema: Revalidator.JSONSchema<typeof someObject> = {
+
+};
+
+revalidator.validate(someObject, {
+  properties: {
+    url: {
+      description: 'the url the object should be stored at',
+      type: 'string',
+      pattern: '^/[^#%&*{}\\:<>?\/+]+$',
+      required: true
+    },
+    challenge: {
+      description: 'a means of protecting data (insufficient for production, used as example)',
+      type: 'string',
+      minLength: 5
+    },
+    body: {
+      description: 'what to store at the url',
+      type: 'any',
+      default: null
+    },
+    obj: {
+      type: 'object',
+      properties: {
+        items: {
+          type: 'object',
+          properties: {
+            title: {
+              type: 'string',
+              maxLength: 140,
+              conditions: {
+                optional: function () {
+                  return !this.published;
+                }
+              }
+            },
+            date: { type: 'string', format: 'date', messages: { format: "must be a valid %{expected} and nothing else" } },
+            body: { type: 'string' },
+            tags: {
+              type: 'array',
+              uniqueItems: true,
+              minItems: 2,
+              items: {
+                type: 'string',
+                pattern: /[a-z ]+/
+              }
+            },
+            tuple: {
+              type: 'array',
+              minItems: 2,
+              maxItems: 2,
+              items: {
+                type: ['string', 'number']
+              }
+            },
+            author: { type: 'string', pattern: /^[\w ]+$/i, required: true, messages: { required: "is essential for survival" } },
+            published: { type: 'boolean', 'default': false },
+            category: { type: 'string' },
+            palindrome: {
+              type: 'string', conform: function (val) {
+                return val == val.split("").reverse().join("");
+              }
+            },
+            name: {
+              type: 'string', default: '', conform: function (val, data) {
+                return (val === data.hello);
+              }
+            }
+          },
+          patternProperties: {
+            '^_': {
+              type: 'boolean', default: false
+            }
+          }
+        }
+      }
+    }
+  }
+}, {
+    validateFormats: true,
+    validateFormatsStrict: false,
+    validateFormatExtensions: true,
+    additionalProperties: false,
+    cast: false
+  }).valid === true;
 
-revalidator.validate(null, null, null);
\ No newline at end of file
diff --git a/revalidator/revalidator.d.ts b/revalidator/revalidator.d.ts
index 63f492e9c3..2c20e9876b 100644
--- a/revalidator/revalidator.d.ts
+++ b/revalidator/revalidator.d.ts
@@ -4,10 +4,27 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module Revalidator {
-    interface RevalidatorStatic {
-        validate(object: any, schema: ISchema, options: any): IReturnMessage;
+
+    interface IOptions {
+        /** Enforce format constraints (default true) */
+        validateFormats?: boolean;
+        /** When validateFormats is true treat unrecognized formats as validation errors (default false) */
+        validateFormatsStrict?: boolean;
+        /** When validateFormats is true also validate formats defined in validate.formatExtensions (default true) */
+        validateFormatExtensions?: boolean;
+        /** When additionalProperties is true allow additional unvisited properties on the object. (default true) */
+        additionalProperties?: boolean;
+        /** Enforce casting of some types (for integers/numbers are only supported) when it's possible, e.g. "42" => 42, but "forty2" => "forty2" for the integer type. */
+        cast?: boolean;
     }
 
+    interface RevalidatorStatic {
+        validate<T>(object: T, schema: JSONSchema<T>, options?: IOptions): IReturnMessage;
+    }
+
+    type Types = 'string' | 'number' | 'integer' | 'array' | 'boolean' | 'object' | 'null' | 'any';
+    type Formats = 'url' | 'email' | 'ip-address' | 'ipv6' | 'date-time' | 'date' | 'time' | 'color' | 'host-name' | 'utc-millisec' | 'regex';
+
     interface IErrrorProperty {
         property: string;
         message: string;
@@ -18,26 +35,59 @@ declare module Revalidator {
         errors: IErrrorProperty[];
     }
 
-    interface ISchema {
-        required?: boolean;
-        type: string;
-        pattern?: any;
-        maxLength?: number;
-        minLength?: number;
-        minimum?: number;
-        maximum?: number;
-        allowEmpty: boolean;
-        exclusiveMinimum: number;
-        exclusiveMaximum?: number;
-        divisibleBy?: number;
-        minItems?: number;
-        maxItems?: number;
-        uniqueItems?: boolean;
-        enum?: any;
-        format?: string;
-        conform?: (data:any) => boolean;
-        depdendencies?: string;
+    interface JSONSchema<T> {
+        properties?: ISchemas<T>;
+    }
 
+    interface ISchemas<T> {
+        [index: string]: ISchema<T>|JSONSchema<T>;
+    }
+
+    interface ISchema<T> {
+        /**The type of value should be equal to the expected value */
+        type: Types|Types[];
+        /**If true, the value should not be undefined */
+        required?: boolean;
+        /**The expected value regex needs to be satisfied by the value */
+        pattern?: RegExp|string;
+        /**The length of value must be greater than or equal to expected value */
+        maxLength?: number;
+        /**Description for this object */
+        description?: string;
+        /**The length of value must be lesser than or equal to expected value */
+        minLength?: number;
+        /**Value must be greater than or equal to the expected value */
+        minimum?: number;
+        /**Value must be lesser than or equal to the expected value */
+        maximum?: number;
+        /**If false, the value must not be an empty string */
+        allowEmpty?: boolean;
+        /**Value must be greater than expected value */
+        exclusiveMinimum?: number;
+        /**Value must be lesser than expected value */
+        exclusiveMaximum?: number;
+        /**Value must be divisible by expected value */
+        divisibleBy?: number;
+        /**Value must contain more than expected number of items */
+        minItems?: number;
+        /**Value must contain fewer than expected number of items */
+        maxItems?: number;
+        /**Value must hold a unique set of values */
+        uniqueItems?: boolean;
+        /**Value must be present in the array of expected values */
+        enum?: any[];
+        /**Custom messages for different constraints */
+        message?: string;
+        /**Custom messages for different constraints */
+        messages?: {[index: string]: string};
+        /**Default value */
+        default?: any;
+        /**Value must be a valid format */
+        format?: Formats;
+        /**Value must conform to constraint denoted by expected value */
+        conform?: (value: any, data?: T) => boolean;
+        /**Value is valid only if the dependent value is valid */
+        dependencies?: string;
     }
 }
 
diff --git a/riot-api-nodejs/riot-api-nodejs.d.ts b/riot-api-nodejs/riot-api-nodejs.d.ts
index 05fb20e81f..83db2c68d9 100644
--- a/riot-api-nodejs/riot-api-nodejs.d.ts
+++ b/riot-api-nodejs/riot-api-nodejs.d.ts
@@ -321,13 +321,13 @@ declare module "riot-api-nodejs" {
             * get league of legends status
             * @param     {RiotGamesAPI.LolStatus.Shard[]}    callback    data callback
             */
-        getSatus(): Promise<RiotGamesAPI.LolStatus.Shard[]>;
+        getStatus(): Promise<RiotGamesAPI.LolStatus.Shard[]>;
         /**
             * get status for a given region
             * @param     {region_e}                        region      region
             * @param     {RiotGamesAPI.LolStatus.Shard}    callback    data callback
             */
-        getSatusByRegion(region: region_e): Promise<RiotGamesAPI.LolStatus.Shard>;
+        getStatusByRegion(region: region_e): Promise<RiotGamesAPI.LolStatus.Shard>;
         /**
             * get match infos for a given match ID
             * @param     {number}                            matchId     Match ID
diff --git a/rpio/rpio-tests.ts b/rpio/rpio-tests.ts
new file mode 100644
index 0000000000..fc0d79a71f
--- /dev/null
+++ b/rpio/rpio-tests.ts
@@ -0,0 +1,105 @@
+/// <reference path="rpio.d.ts"/>
+
+rpio.init({gpiomem: false});    /* Use /dev/mem for i²c/PWM/SPI */
+rpio.init({mapping: 'gpio'});   /* Use the GPIOxx numbering */
+
+/* Configure P11 as input with the internal pulldown resistor enabled */
+rpio.open(11, rpio.INPUT, rpio.PULL_DOWN);
+
+/* Configure P12 as output with the initiate state set high */
+rpio.open(12, rpio.OUTPUT, rpio.HIGH);
+
+/* Configure P13 as output, but leave it in its initial undefined state */
+rpio.open(13, rpio.OUTPUT);
+
+rpio.mode(12, rpio.INPUT);      /* Switch P12 back to input mode */
+
+console.log('Pin 12 = %d', rpio.read(12));
+
+var buf = new Buffer(10000);
+
+/* Read the value of Pin 12 10,000 times in a row, storing the values in buf */
+rpio.readbuf(12, buf);
+
+rpio.write(13, rpio.HIGH);
+
+/* Write 1 0 1 0 1 0 1 0 to Pin 13 */
+var buf = new Buffer(8).fill(rpio.LOW);
+buf[0] = buf[2] = buf[4] = buf[6] = rpio.HIGH;
+rpio.writebuf(13, buf);
+
+var curpad = rpio.readpad(rpio.PAD_GROUP_0_27);
+
+var slew = ((curpad & rpio.PAD_SLEW_UNLIMITED) == rpio.PAD_SLEW_UNLIMITED);
+var hysteresis = ((curpad & rpio.PAD_HYSTERESIS) == rpio.PAD_HYSTERESIS);
+var drive = (curpad & 0x7);
+
+/* Disable input hysteresis but retain other current settings. */
+var control = rpio.readpad(rpio.PAD_GROUP_0_27);
+control &= ~rpio.PAD_HYSTERESIS;
+rpio.writepad(rpio.PAD_GROUP_0_27, control);
+
+rpio.pud(11, rpio.PULL_UP);
+rpio.pud(12, rpio.PULL_DOWN);
+
+function nuke_button(pin: number)
+{
+    console.log('Nuke button on pin %d pressed', pin);
+
+    /* No need to nuke more than once. */
+    rpio.poll(pin, null);
+}
+
+function regular_button(pin: number)
+{
+    /* Watch pin 11 forever. */
+    console.log('Button event on pin %d, is now %d', pin, rpio.read(pin));
+}
+
+/*
+ * Pin 11 watches for both high and low transitions.  Pin 12 only watches for
+ * high transitions (e.g. the nuke button is pushed).
+ */
+rpio.poll(11, regular_button);
+rpio.poll(12, nuke_button, rpio.POLL_HIGH);
+
+rpio.close(11);
+
+rpio.i2cBegin();
+
+rpio.i2cSetSlaveAddress(0x20);
+
+rpio.i2cSetBaudRate(100000);    /* 100kHz */
+rpio.i2cSetClockDivider(2500);  /* 250MHz / 2500 = 100kHz */
+
+var txbuf = new Buffer([0x0b, 0x0e, 0x0e, 0x0f]);
+var rxbuf = new Buffer(32);
+
+rpio.i2cWrite(txbuf);           /* Sends 4 bytes */
+rpio.i2cRead(rxbuf, 16);        /* Reads 16 bytes */
+
+rpio.i2cEnd();
+
+rpio.open(12, rpio.PWM); /* Use pin 12 */
+
+rpio.pwmSetClockDivider(64);    /* Set PWM refresh rate to 300kHz */
+
+rpio.pwmSetRange(12, 1024);
+
+rpio.pwmSetData(12, 512);
+
+rpio.spiBegin();           /* Switch GPIO7-GPIO11 to SPI mode */
+
+rpio.spiSetCSPolarity(0, rpio.HIGH);    /* Set CE0 high to activate */
+
+rpio.spiSetClockDivider(128);   /* Set SPI speed to 1.95MHz */
+
+rpio.spiTransfer(txbuf, rxbuf, txbuf.length);
+
+rpio.spiWrite(txbuf, txbuf.length);
+
+rpio.spiEnd();
+
+rpio.sleep(1);          /* Sleep for n seconds */
+rpio.msleep(1);         /* Sleep for n milliseconds */
+rpio.usleep(1);         /* Sleep for n microseconds */
diff --git a/rpio/rpio.d.ts b/rpio/rpio.d.ts
new file mode 100644
index 0000000000..0bba37b918
--- /dev/null
+++ b/rpio/rpio.d.ts
@@ -0,0 +1,372 @@
+// Type definitions for node-rpio
+// Project: https://github.com/jperkin/node-rpio
+// Definitions by: Dominik Palo <https://github.com/DominikPalo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare var rpio: Rpio;
+
+declare module 'rpio' {
+    export = rpio;
+}
+
+interface Rpio {
+    /**
+     * Initialise the bcm2835 library. This will be called automatically by .open() using the default option values if not called explicitly.
+     * @param options
+     */
+    init(options: RPIO.Options): void;
+
+    /**
+     * Open a pin for input or output. Valid modes are:
+     * INPUT: pin is input (read-only).
+     * OUTPUT: pin is output (read-write).
+     * PWM: configure pin for hardware PWM.
+     *
+     * For input pins, option can be used to configure the internal pullup or pulldown resistors using options as described in the .pud() documentation below.
+     *
+     * For output pins, option defines the initial isMotionDetected of the pin, rather than having to issue a separate .write() call. This can be critical for devices which must have a stable value, rather than relying on the initial floating value when a pin is enabled for output but hasn't yet been configured with a value.
+     * @param pin
+     * @param mode
+     * @param options
+     */
+    open(pin: number, mode: number, options?: number): void;
+
+    /**
+     * Switch a pin that has already been opened in one mode to a different mode.
+     * This is provided primarily for performance reasons, as it avoids some of the setup work done by .open().
+     * @param pin
+     * @param mode
+     */
+    mode(pin: number, mode: number): void;
+
+    /**
+     * Read the current value of pin, returning either 1 (high) or 0 (low).
+     * @param pin
+     */
+    read(pin: number): number;
+
+    /**
+     * Read length bits from pin into buffer as fast as possible. If length isn't specified it defaults to buffer.length.
+     * @param pin
+     * @param buffer
+     * @param length
+     */
+    readbuf(pin: number, buffer: Buffer, length?: number): void;
+
+    /**
+     * Set the specified pin either high or low, using either the HIGH/LOW constants, or simply 1 or 0.
+     * @param pin
+     * @param value
+     */
+    write(pin: number, value: number): void;
+
+    /**
+     * Write length bits to pin from buffer as fast as possible. If length isn't specified it defaults to buffer.length.
+
+     * @param pin
+     * @param buffer
+     * @param length
+     */
+    writebuf(pin: number, buffer: Buffer, length?: number): void;
+
+    /**
+     * Read the current isMotionDetected of the GPIO pad control for the specified GPIO group. On current models of Raspberry Pi there are three groups with corresponding defines:
+     * PAD_GROUP_0_27: GPIO0 - GPIO27. Use this for the main GPIO header.
+     * PAD_GROUP_28_45: GPIO28 - GPIO45. Use this to configure the P5 header.
+     * PAD_GROUP_46_53: GPIO46 - GPIO53. Internal, you probably won't need this.
+     *
+     * The value returned will be a bit mask of the following defines:
+     * PAD_SLEW_UNLIMITED: 0x10. Slew rate unlimited if set.
+     * PAD_HYSTERESIS: 0x08. Hysteresis is enabled if set.
+     *
+     * The bottom three bits determine the drive current:
+     * PAD_DRIVE_2mA: 0b000
+     * PAD_DRIVE_4mA: 0b001
+     * PAD_DRIVE_6mA: 0b010
+     * PAD_DRIVE_8mA: 0b011
+     * PAD_DRIVE_10mA: 0b100
+     * PAD_DRIVE_12mA: 0b101
+     * PAD_DRIVE_14mA: 0b110
+     * PAD_DRIVE_16mA: 0b111
+     *
+     * @note Note that the pad control registers are not available via /dev/gpiomem, so you will need to use .init({gpiomem: false}) and run as root.
+     * @param group
+     */
+    readpad(group: number): number;
+
+    /**
+     * Write control settings to the pad control for group. Uses the same defines as above for .readpad().
+     * @param group
+     * @param control
+     */
+    writepad(group: number, control: number): void;
+
+    /**
+     * Configure the pin's internal pullup or pulldown resistors, using the following isMotionDetected constants:
+     * PULL_OFF: disable configured resistors.
+     * PULL_DOWN: enable the pulldown resistor.
+     * PULL_UP: enable the pullup resistor.
+     *
+     * @param pin
+     * @param state
+     */
+    pud(pin: number, state: number): void;
+
+    /**
+     * Watch pin for changes and execute the callback cb() on events. cb() takes a single argument, the pin which triggered the callback.
+     *
+     * The optional direction argument can be used to watch for specific events:
+     * POLL_LOW: poll for falling edge transitions to low.
+     * POLL_HIGH: poll for rising edge transitions to high.
+     * POLL_BOTH: poll for both transitions (the default).
+     *
+     * Due to hardware/kernel limitations we can only poll for changes, and the event detection only says that an event occurred, not which one. The poll interval is a 1ms setInterval() and transitions could come in between detecting the event and reading the value. Therefore this interface is only useful for events which transition slower than approximately 1kHz.
+     *
+     * To stop watching for pin changes, call .poll() again, setting the callback to null.
+     * @param pin
+     * @param cb
+     * @param direction
+     */
+    poll(pin: number, cb: RPIO.CallbackFunction, direction?: number): void;
+
+    /**
+     * Reset pin to INPUT and clear any pullup/pulldown resistors and poll events.
+     * @param pin
+     */
+    close(pin: number): void;
+
+    // I²C
+
+    /**
+     * Assign pins 3 and 5 to i²c use. Until .i2cEnd() is called they won't be available for GPIO use.
+     *
+     * The pin assignments are:
+     * Pin 3: SDA (Serial Data)
+     * Pin 5: SCL (Serial Clock)
+     */
+    i2cBegin(): void;
+
+    /**
+     * Configure the slave address. This is between 0 - 0x7f, and it can be helpful to
+     * run the i2cdetect program to figure out where your devices are if you are unsure.
+     * @param address
+     */
+    i2cSetSlaveAddress(address: number): void;
+
+    /**
+     * Set the baud rate - directly set the speed in hertz.
+     * @param baudRate
+     */
+    i2cSetBaudRate(baudRate: number): void;
+
+    /**
+     * Read from the i²c slave.
+     * Function takes a buffer and optional length argument, defaulting to the length of the buffer if not specified.
+     * @param buffer
+     * @param length
+     */
+    i2cRead(buffer: Buffer, length?: number): void;
+
+    /**
+     * Write to the i²c slave.
+     * Function takes a buffer and optional length argument, defaulting to the length of the buffer if not specified.
+     * @param biffer
+     * @param length
+     */
+    i2cWrite(biffer: Buffer, length?: number): void;
+
+    /**
+     * Set the baud rate - based on a divisor of the base 250MHz rate.
+     * @param clockDivider
+     */
+    i2cSetClockDivider(clockDivider: number): void;
+
+
+
+
+    /**
+     * Turn off the i²c interface and return the pins to GPIO.
+     */
+    i2cEnd(): void;
+
+    // PWM
+
+    /**
+     * Set the PWM refresh rate.
+     * @param clockDivider: power-of-two divisor of the base 19.2MHz rate, with a maximum value of 4096 (4.6875kHz).
+     */
+    pwmSetClockDivider(clockDivider: number): void;
+
+    /**
+     * Set the PWM range for a pin. This determines the maximum pulse width.
+     * @param pin
+     * @param range
+     */
+    pwmSetRange(pin: number, range: number): void;
+
+    /**
+     * Set the PWM width for a pin.
+     * @param pin
+     * @param data
+     */
+    pwmSetData(pin: number, data: number): void;
+
+    // SPI
+
+    /**
+     * Switch pins 119, 21, 23, 24 and 25 (GPIO7-GPIO11) to SPI mode
+     *
+     *  Pin | Function
+     * -----|----------
+     *   19 |   MOSI
+     *   21 |   MISO
+     *   23 |   SCLK
+     *   24 |   CE0
+     *   25 |   CE1
+     */
+    spiBegin(): void;
+
+    /**
+     * Choose which of the chip select / chip enable pins to control.
+     *
+     *  Value | Pin
+     *  ------|---------------------
+     *    0   | SPI_CE0 (24 / GPIO8)
+     *    1   | SPI_CE1 (25 / GPIO7)
+     *    2   | Both
+     *
+     * @param chip
+     */
+    spiChipSelect(cePin: number): void;
+
+    /**
+     * Commonly chip enable (CE) pins are active low, and this is the default.
+     * If your device's CE pin is active high, use spiSetCSPolarity() to change the polarity.
+     * @param cePin
+     * @param polarity
+     */
+    spiSetCSPolarity(cePin: number, polarity: number): void;
+
+    /**
+     * Set the SPI clock speed with.
+     * @param clockDivider: an even divisor of the base 250MHz rate ranging between 0 and 65536.
+     */
+    spiSetClockDivider(clockDivider: number): void;
+
+    /**
+     * Transfer data. Data is sent and received in 8-bit chunks via buffers which should be the same size.
+     * @param txBuffer
+     * @param rxBuffer
+     * @param txLength
+     */
+    spiTransfer(txBuffer: Buffer, rxBuffer: Buffer, txLength: number): void;
+
+    /**
+     * Send data and do not care about the data coming back.
+     * @param txBuffer
+     * @param txLength
+     */
+    spiWrite(txBuffer: Buffer, txLength: number): void;
+
+    /**
+     * Release the pins back to general purpose use.
+     */
+    spiEnd(): void;
+
+    // Misc
+
+    /**
+     * Sleep for n seconds.
+     * @param n: number of seconds to sleep
+     */
+    sleep(n: number): void;
+
+    /**
+     * Sleep for n milliseconds.
+     * @param n: number of milliseconds to sleep
+     */
+    msleep(n: number): void;
+
+    /**
+     * Sleep for n microseconds.
+     * @param n: number of microseconds to sleep
+     */
+    usleep(n: number): void;
+
+
+    // Constants:
+
+    HIGH: number;
+    LOW: number;
+
+    INPUT: number;
+    OUTPUT: number;
+    PWM: number;
+
+    PULL_OFF: number;
+    PULL_DOWN: number;
+    PULL_UP: number;
+
+    PAD_GROUP_0_27: number;
+    PAD_GROUP_28_45: number;
+    PAD_GROUP_46_53: number;
+
+    PAD_SLEW_UNLIMITED: number;
+    PAD_HYSTERESIS: number;
+
+    PAD_DRIVE_2mA: number;
+    PAD_DRIVE_4mA: number;
+    PAD_DRIVE_6mA: number;
+    PAD_DRIVE_8mA: number;
+    PAD_DRIVE_10mA: number;
+    PAD_DRIVE_12mA: number;
+    PAD_DRIVE_14mA: number;
+    PAD_DRIVE_16mA: number;
+
+    POLL_LOW: number;
+    POLL_HIGH: number;
+    POLL_BOTH: number;
+
+}
+
+declare namespace RPIO {
+
+    interface Options {
+
+        /**
+         * There are two device nodes for GPIO access. The default is /dev/gpiomem which, when configured with gpio group access, allows users in that group to read/write directly to that device. This removes the need to run as root, but is limited to GPIO functions.
+         * For non-GPIO functions (i²c, PWM, SPI) the /dev/mem device is required for full access to the Broadcom peripheral address range and the program needs to be executed as the root user (e.g. via sudo). If you do not explicitly call .init() when using those functions, the library will do it for you with gpiomem: false.
+         * You may also need to use gpiomem: false if you are running on an older Linux kernel which does not support the gpiomem module.
+         * rpio will throw an exception if you try to use one of the non-GPIO functions after already opening with /dev/gpiomem, as well as checking to see if you have the necessary permissions.
+         *
+         * Valid options:
+         * true: use /dev/gpiomem for non-root but GPIO-only access
+         * false: use /dev/mem for full access but requires root
+         */
+        gpiomem?: boolean;
+
+        /**
+         * There are two naming schemes when referring to GPIO pins:
+         * By their physical header location: Pins 1 to 26 (A/B) or Pins 1 to 40 (A+/B+)
+         * Using the Broadcom hardware map: GPIO 0-25 (B rev1), GPIO 2-27 (A/B rev2, A+/B+)
+         *
+         * Confusingly however, the Broadcom GPIO map changes between revisions, so for example P3 maps to GPIO0 on Model B Revision 1 models, but maps to GPIO2 on all later models.
+         * This means the only sane default mapping is the physical layout, so that the same code will work on all models regardless of the underlying GPIO mapping.
+         * If you prefer to use the Broadcom GPIO scheme for whatever reason (e.g. to use the P5 header pins on the Raspberry Pi 1 revision 2.0 model which aren't currently mapped to the physical layout), you can set mapping to gpio to switch to the GPIOxx naming.
+         *
+         * Valid options:
+         * gpio: use the Broadcom GPIOxx naming
+         * physical: use the physical P01-P40 header layou
+         */
+        mapping?: "gpio" | "physical";
+    }
+
+    interface CallbackFunction {
+        /**
+         * @param pin: The pin which triggered the callback.
+         */
+        (pin: number): void;
+    }
+}
diff --git a/samchon-framework/samchon-framework.d.ts b/samchon-framework/samchon-framework.d.ts
index a6d03758dd..70d9dda38f 100644
--- a/samchon-framework/samchon-framework.d.ts
+++ b/samchon-framework/samchon-framework.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Samchon Framework v2.0.0-beta.1
+// Type definitions for Samchon Framework v2.0.0-beta.8
 // Project: https://github.com/samchon/framework
 // Definitions by: Jeongho Nam <http://samchon.org>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -82,19 +82,15 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        protected insert_by_repeating_val(position: std.VectorIterator<T>, n: number, val: T): std.VectorIterator<T>;
+        protected _Insert_by_repeating_val(position: std.VectorIterator<T>, n: number, val: T): std.VectorIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends std.Iterator<U>>(position: std.VectorIterator<T>, begin: InputIterator, end: InputIterator): std.VectorIterator<T>;
-        /**
-         * @inheritdoc
-         */
-        pop_back(): void;
+        protected _Insert_by_range<U extends T, InputIterator extends std.Iterator<U>>(position: std.VectorIterator<T>, begin: InputIterator, end: InputIterator): std.VectorIterator<T>;
         /**
          * @hidden
          */
-        protected erase_by_range(first: std.VectorIterator<T>, last: std.VectorIterator<T>): std.VectorIterator<T>;
+        protected _Erase_by_range(first: std.VectorIterator<T>, last: std.VectorIterator<T>): std.VectorIterator<T>;
         /**
          * @hidden
          */
@@ -110,7 +106,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -126,28 +122,28 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
@@ -176,13 +172,9 @@ declare namespace samchon.library {
      * @reference https://developer.mozilla.org/en-US/docs/Web/API/Event
      * @author Jeongho Nam <http://samchon.org>
      */
-    class BasicEvent implements Event {
-        NONE: number;
-        CAPTURING_PHASE: number;
-        AT_TARGET: number;
-        BUBBLING_PHASE: number;
-        private type_;
-        private target_;
+    class BasicEvent {
+        protected type_: string;
+        protected target_: IEventDispatcher;
         private currentTarget_;
         protected trusted_: boolean;
         protected bubbles_: boolean;
@@ -198,7 +190,6 @@ declare namespace samchon.library {
         /**
          * @inheritdoc
          */
-        preventDefault(): void;
         /**
          * @inheritdoc
          */
@@ -256,22 +247,12 @@ declare namespace samchon.library {
          */
         returnValue: boolean;
     }
-    class ProgressEvent extends library.BasicEvent {
-        static PROGRESS: string;
-        protected numerator_: number;
-        protected denominator_: number;
-        constructor(type: string, numerator: number, denominator: number);
-        numerator: number;
-        denominator: number;
-    }
 }
 declare namespace samchon.collection {
     /**
      * Type of function pointer for listener of {@link CollectionEvent CollectionEvents}.
      */
-    interface CollectionEventListener<T> extends EventListener {
-        (event: CollectionEvent<T>): void;
-    }
+    type CollectionEventListener<T> = (event: CollectionEvent<T>) => void;
 }
 declare namespace samchon.collection {
     /**
@@ -281,11 +262,13 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        private first_;
+        protected first_: std.Iterator<T>;
         /**
          * @hidden
          */
-        private last_;
+        protected last_: std.Iterator<T>;
+        private temporary_container_;
+        private origin_first_;
         /**
          * Initialization Constructor.
          *
@@ -298,9 +281,9 @@ declare namespace samchon.collection {
         constructor(type: "erase", first: std.Iterator<T>, last: std.Iterator<T>);
         constructor(type: "refresh", first: std.Iterator<T>, last: std.Iterator<T>);
         /**
-         * Get associative container.
+         * Get associative target, the container.
          */
-        container: ICollection<T>;
+        target: ICollection<T>;
         /**
          * Get range of the first.
          */
@@ -309,12 +292,19 @@ declare namespace samchon.collection {
          * Get range of the last.
          */
         last: std.Iterator<T>;
+        /**
+         * @inheritdoc
+         */
+        preventDefault(): void;
     }
 }
+/**
+ * @hidden
+ */
 declare namespace samchon.collection.CollectionEvent {
-    const INSERT: string;
-    const ERASE: string;
-    const REFRESH: string;
+    const INSERT: "insert";
+    const ERASE: "erase";
+    const REFRESH: "refresh";
 }
 declare namespace samchon.collection {
     /**
@@ -357,11 +347,11 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        protected insert_by_repeating_val(position: std.DequeIterator<T>, n: number, val: T): std.DequeIterator<T>;
+        protected _Insert_by_repeating_val(position: std.DequeIterator<T>, n: number, val: T): std.DequeIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends std.Iterator<U>>(position: std.DequeIterator<T>, begin: InputIterator, end: InputIterator): std.DequeIterator<T>;
+        protected _Insert_by_range<U extends T, InputIterator extends std.Iterator<U>>(position: std.DequeIterator<T>, begin: InputIterator, end: InputIterator): std.DequeIterator<T>;
         /**
          * @inheritdoc
          */
@@ -369,7 +359,7 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        protected erase_by_range(first: std.DequeIterator<T>, last: std.DequeIterator<T>): std.DequeIterator<T>;
+        protected _Erase_by_range(first: std.DequeIterator<T>, last: std.DequeIterator<T>): std.DequeIterator<T>;
         /**
          * @hidden
          */
@@ -385,7 +375,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -401,28 +391,28 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
@@ -462,11 +452,11 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
@@ -474,7 +464,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -490,31 +480,31 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
     }
 }
 declare namespace samchon.collection {
@@ -544,11 +534,11 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
@@ -556,7 +546,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -572,31 +562,31 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
     }
 }
 declare namespace samchon.collection {
@@ -623,6 +613,14 @@ declare namespace samchon.collection {
          * A chain object taking responsibility of dispatching events.
          */
         private event_dispatcher_;
+        /**
+         * @inheritdoc
+         */
+        protected _Handle_insert(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
+        /**
+         * @inheritdoc
+         */
+        protected _Handle_erase(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
         /**
          * @inheritdoc
          */
@@ -630,7 +628,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -646,28 +644,28 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
@@ -701,11 +699,11 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
+        protected _Handle_insert(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
+        protected _Handle_erase(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
         /**
          * @inheritdoc
          */
@@ -713,7 +711,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -729,28 +727,28 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
@@ -830,32 +828,39 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
     }
+    /**
+     * @hidden
+     */
+    namespace ICollection {
+        function _Dispatch_CollectionEvent<T>(collection: ICollection<T>, type: string, first: std.Iterator<T>, last: std.Iterator<T>): void;
+        function _Dispatch_MapCollectionEvent<Key, T>(collection: ICollection<std.Pair<Key, T>>, type: string, first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+    }
 }
 declare namespace samchon.collection {
     /**
@@ -908,11 +913,11 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        protected insert_by_repeating_val(position: std.ListIterator<T>, n: number, val: T): std.ListIterator<T>;
+        protected _Insert_by_repeating_val(position: std.ListIterator<T>, n: number, val: T): std.ListIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends std.Iterator<U>>(position: std.ListIterator<T>, begin: InputIterator, end: InputIterator): std.ListIterator<T>;
+        protected _Insert_by_range<U extends T, InputIterator extends std.Iterator<U>>(position: std.ListIterator<T>, begin: InputIterator, end: InputIterator): std.ListIterator<T>;
         /**
          * @inheritdoc
          */
@@ -924,7 +929,7 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        protected erase_by_range(first: std.ListIterator<T>, last: std.ListIterator<T>): std.ListIterator<T>;
+        protected _Erase_by_range(first: std.ListIterator<T>, last: std.ListIterator<T>): std.ListIterator<T>;
         /**
          * @hidden
          */
@@ -940,7 +945,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -956,33 +961,46 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
     }
 }
+declare namespace samchon.collection {
+    type MapCollectionEventListener<Key, T> = (event: MapCollectionEvent<Key, T>) => void;
+    class MapCollectionEvent<Key, T> extends CollectionEvent<std.Pair<Key, T>> {
+        /**
+         * @inheritdoc
+         */
+        first: std.MapIterator<Key, T>;
+        /**
+         * @inheritdoc
+         */
+        last: std.MapIterator<Key, T>;
+    }
+}
 declare namespace samchon.collection {
     /**
      * A {@link TreeMap} who can detect element I/O events.
@@ -1017,11 +1035,11 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
@@ -1029,7 +1047,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -1045,31 +1063,31 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
     }
 }
 declare namespace samchon.collection {
@@ -1099,11 +1117,11 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_insert(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
+        protected _Handle_erase(first: std.MapIterator<Key, T>, last: std.MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
@@ -1111,7 +1129,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -1127,31 +1145,31 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        addEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        addEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        addEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        addEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
-        removeEventListener(type: "insert", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "erase", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
-        removeEventListener(type: "refresh", listener: CollectionEventListener<std.Pair<Key, T>>, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
+        removeEventListener(type: "insert", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "erase", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
+        removeEventListener(type: "refresh", listener: MapCollectionEventListener<Key, T>, thisArg: Object): void;
     }
 }
 declare namespace samchon.collection {
@@ -1181,11 +1199,11 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
+        protected _Handle_insert(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
+        protected _Handle_erase(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
         /**
          * @inheritdoc
          */
@@ -1193,7 +1211,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -1209,28 +1227,28 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
@@ -1261,6 +1279,14 @@ declare namespace samchon.collection {
          * A chain object taking responsibility of dispatching events.
          */
         private event_dispatcher_;
+        /**
+         * @inheritdoc
+         */
+        protected _Handle_insert(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
+        /**
+         * @inheritdoc
+         */
+        protected _Handle_erase(first: std.SetIterator<T>, last: std.SetIterator<T>): void;
         /**
          * @inheritdoc
          */
@@ -1268,7 +1294,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -1284,28 +1310,28 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<T>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<T>, thisArg: Object): void;
@@ -1323,8 +1349,8 @@ declare namespace samchon.library {
      *
      * <p> Relationships between XML and XMLList </p>
      * <ul>
-     *	<li> XML contains XMLList from dictionary of XMLList. </li>
-     *  <li> XMLList contains XML from vector of XML. </li>
+     *	<li> XML is <code>std.HashMap<string, XMLList></code> </li>
+     *  <li> XMLList is <code>std.Deque<XML></code> </li>
      * </ul>
      *
      * <h4> Note </h4>
@@ -1337,17 +1363,28 @@ declare namespace samchon.library {
      *	</tr>
      *	<tr>
      *		<td>
-     *			&lt;memberList&gt;<br/>
-     *			&nbsp;&nbsp;&nbsp;&nbsp; &lt;member id='jhnam88' name='Jeongho+Nam' birthdate='1988-03-11' /&gt;<br/>
-     *			&nbsp;&nbsp;&nbsp;&nbsp; &lt;member id='master' name='Administartor' birthdate='2011-07-28' /&gt;<br/>
-     *			&lt;/memberList&gt;
+     * <code>
+     * <memberList>
+     *	<member id='jhnam88' name='Jeongho+Nam' birthdate='1988-03-11' />
+     *	<member id='master' name='Administartor' birthdate='2011-07-28' />
+     * </memberList>
+     * </code>
      *		</td>
      *		<td>
-     *			&lt;member&gt;<br/>
-     *			&nbsp;&nbsp;&nbsp;&nbsp; &lt;id&gt;jhnam88&lt;/id&gt;<br/>
-     *			&nbsp;&nbsp;&nbsp;&nbsp; &lt;name&gt;Jeongho+Nam&lt;/name&gt;<br/>
-     *			&nbsp;&nbsp;&nbsp;&nbsp; &lt;birthdate&gt;1988-03-11&lt;/birthdate&gt;<br/>
-     *			&lt;/member&gt;
+     * <code>
+     * <memberList>
+     *	<member>
+     *		<id>jhnam88</id>
+     *		<name>Jeongho Nam</name>
+     *		<birthdate>1988-03-11</birthdate>
+     *	</member>
+     *	<member>
+     *		<id>master</id>
+     *		<name>Administartor</name>
+     *		<birthdate>2011-07-28</birthdate>
+     *	</member>
+     * </memberList>
+     * </code>
      *		</td>
      *	</tr>
      * </table>
@@ -1363,7 +1400,7 @@ declare namespace samchon.library {
          *  <li> \<<b>price</b> high='1500' low='1300' open='1450' close='1320' /\>: tag => \"price\" </li>
          * </ul>
          */
-        private tag;
+        private tag_;
         /**
          * <p> Value of the XML. </p>
          *
@@ -1372,7 +1409,7 @@ declare namespace samchon.library {
          *	<li> \<price high='1500' low='1300' open='1450' close='1320' /\>: value => null </li>
          * </ul>
          */
-        private value;
+        private value_;
         /**
          * <p> Properties belongs to the XML. </p>
          * <p> A Dictionary of properties accessing each property by its key. </p>
@@ -1385,7 +1422,7 @@ declare namespace samchon.library {
          *					 {\"comment\", \"Hello. My name is Jeongho Nam <http://samchon.org>\"}} </li>
          * </ul>
          */
-        private properties;
+        private property_map_;
         /**
          * <p> Default Constructor. </p>
          *
@@ -1703,11 +1740,11 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        protected insert_by_repeating_val(position: std.DequeIterator<library.XML>, n: number, val: library.XML): std.DequeIterator<library.XML>;
+        protected _Insert_by_repeating_val(position: std.DequeIterator<library.XML>, n: number, val: library.XML): std.DequeIterator<library.XML>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends library.XML, InputIterator extends std.Iterator<U>>(position: std.DequeIterator<library.XML>, begin: InputIterator, end: InputIterator): std.DequeIterator<library.XML>;
+        protected _Insert_by_range<U extends library.XML, InputIterator extends std.Iterator<U>>(position: std.DequeIterator<library.XML>, begin: InputIterator, end: InputIterator): std.DequeIterator<library.XML>;
         /**
          * @inheritdoc
          */
@@ -1715,7 +1752,7 @@ declare namespace samchon.collection {
         /**
          * @hidden
          */
-        protected erase_by_range(first: std.DequeIterator<library.XML>, last: std.DequeIterator<library.XML>): std.DequeIterator<library.XML>;
+        protected _Erase_by_range(first: std.DequeIterator<library.XML>, last: std.DequeIterator<library.XML>): std.DequeIterator<library.XML>;
         /**
          * @hidden
          */
@@ -1731,7 +1768,7 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
@@ -1747,28 +1784,28 @@ declare namespace samchon.collection {
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         addEventListener(type: "insert", listener: CollectionEventListener<library.XML>): void;
         addEventListener(type: "erase", listener: CollectionEventListener<library.XML>): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<library.XML>): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         addEventListener(type: "insert", listener: CollectionEventListener<library.XML>, thisArg: Object): void;
         addEventListener(type: "erase", listener: CollectionEventListener<library.XML>, thisArg: Object): void;
         addEventListener(type: "refresh", listener: CollectionEventListener<library.XML>, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<library.XML>): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<library.XML>): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<library.XML>): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         removeEventListener(type: "insert", listener: CollectionEventListener<library.XML>, thisArg: Object): void;
         removeEventListener(type: "erase", listener: CollectionEventListener<library.XML>, thisArg: Object): void;
         removeEventListener(type: "refresh", listener: CollectionEventListener<library.XML>, thisArg: Object): void;
@@ -1887,6 +1924,7 @@ declare namespace samchon.library {
     }
 }
 declare namespace samchon.library {
+    type BasicEventListener = (event: BasicEvent) => void;
     /**
      * <p> The IEventDispatcher interface defines methods for adding or removing event listeners, checks
      * whether specific types of event listeners are registered, and dispatches events. </p>
@@ -1975,7 +2013,7 @@ declare namespace samchon.library {
          *				 This function must accept an Event object as its only parameter and must return
          *				 nothing.
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         /**
          * <p> Registers an event listener object with an EventDispatcher object so that the listener
          * receives notification of an event. You can register event listeners on all nodes in the display
@@ -2020,7 +2058,7 @@ declare namespace samchon.library {
          *				 nothing.
          * @param thisArg The object to be used as the <b>this</b> object.
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         /**
          * Removes a listener from the EventDispatcher object. If there is no matching listener registered
          * with the EventDispatcher object, a call to this method has no effect.
@@ -2028,7 +2066,7 @@ declare namespace samchon.library {
          * @param type The type of event.
          * @param listener The listener object to remove.
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         /**
          * Removes a listener from the EventDispatcher object. If there is no matching listener registered
          * with the EventDispatcher object, a call to this method has no effect.
@@ -2037,7 +2075,7 @@ declare namespace samchon.library {
          * @param listener The listener object to remove.
          * @param thisArg The object to be used as the <b>this</b> object.
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
     }
     /**
      * <p> Registers an event listener object with an EventDispatcher object so that the listener
@@ -2091,7 +2129,7 @@ declare namespace samchon.library {
         /**
          * Container of listeners.
          */
-        protected event_listeners_: std.HashMap<string, std.HashSet<std.Pair<EventListener, Object>>>;
+        protected event_listeners_: std.HashMap<string, std.HashSet<std.Pair<library.BasicEventListener, Object>>>;
         /**
          * Default Constructor.
          */
@@ -2109,23 +2147,23 @@ declare namespace samchon.library {
         /**
          * @inheritdoc
          */
-        dispatchEvent(event: Event): boolean;
+        dispatchEvent(event: library.BasicEvent): boolean;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener): void;
+        addEventListener(type: string, listener: library.BasicEventListener): void;
         /**
          * @inheritdoc
          */
-        addEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        addEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener): void;
+        removeEventListener(type: string, listener: library.BasicEventListener): void;
         /**
          * @inheritdoc
          */
-        removeEventListener(type: string, listener: EventListener, thisArg: Object): void;
+        removeEventListener(type: string, listener: library.BasicEventListener, thisArg: Object): void;
     }
 }
 declare namespace samchon.library {
@@ -2247,6 +2285,10 @@ declare namespace samchon.library {
          * </p>
          */
         modificationDate: Date;
+        /**
+         * @hidden
+         */
+        _Set_file(val: File): void;
         /**
          * <p> Displays a file-browsing dialog box that lets the user select a file to upload. The dialog box is native
          * to the user's browser system. The user can select a file on the local computer or from other systems, for
@@ -2418,7 +2460,7 @@ declare namespace samchon.library {
         /**
          * Whether each element (Gene) is unique in their GeneArray.
          */
-        private unique;
+        private unique_;
         /**
          * Rate of mutation.
          *
@@ -2432,11 +2474,11 @@ declare namespace samchon.library {
          *	</li>
          * </ul>
          */
-        private mutation_rate;
+        private mutation_rate_;
         /**
          * Number of tournaments in selection.
          */
-        private tournament;
+        private tournament_;
         /**
          * Initialization Constructor.
          *
@@ -2567,7 +2609,7 @@ declare namespace samchon.library {
         /**
          * Genes representing the population.
          */
-        private children;
+        private children_;
         /**
          * <p> A comparison function returns whether left gene is more optimal, greater. </p>
          *
@@ -2586,7 +2628,7 @@ declare namespace samchon.library {
          * <p> If you don't want to follow the rule or want a custom comparison function, you have to realize a
          * comparison function. </p>
          */
-        private compare;
+        private compare_;
         /**
          * <p> Private constructor with population. </p>
          *
@@ -2622,6 +2664,7 @@ declare namespace samchon.library {
          * @param compare A comparison function returns whether left gene is more optimal.
          */
         constructor(geneArray: GeneArray, size: number, compare: (left: GeneArray, right: GeneArray) => boolean);
+        _Get_children(): std.Vector<GeneArray>;
         /**
          * Test fitness of each <i>GeneArray</i> in the {@link population}.
          *
@@ -2924,6 +2967,13 @@ declare namespace samchon.protocol {
          */
         toXML(): library.XML;
     }
+    /**
+     * @hidden
+     */
+    namespace IEntity {
+        function construct(entity: IEntity, xml: library.XML, ...prohibited_names: string[]): void;
+        function toXML(entity: IEntity, ...prohibited_names: string[]): library.XML;
+    }
     /**
      * <p> An entity, a standard data class. </p>
      *
@@ -3104,7 +3154,8 @@ declare namespace samchon.protocol {
         /**
          * Close connection.
          */
-        close(): any;
+        close(): void;
+        isConnected(): boolean;
         sendData(invoke: protocol.Invoke): void;
         replyData(invoke: protocol.Invoke): void;
     }
@@ -3114,19 +3165,20 @@ declare namespace samchon.protocol {
         /**
          * @hidden
          */
-        protected listener: IProtocol;
+        protected listener_: IProtocol;
         /**
          * @inheritdoc
          */
         onClose: Function;
+        protected connected_: boolean;
         /**
          * @hidden
          */
-        private binary_invoke;
+        private binary_invoke_;
         /**
          * @hidden
          */
-        private binary_parameters;
+        private binary_parameters_;
         /**
          * @hidden
          */
@@ -3135,11 +3187,20 @@ declare namespace samchon.protocol {
          * Default Constructor.
          */
         constructor();
+        /**
+         * Construct from <i>listener</i>.
+         *
+         * @param listener An {@link IProtocol} object to listen {@link Invoke} messages.
+         */
         constructor(listener: IProtocol);
         /**
          * @inheritdoc
          */
         abstract close(): void;
+        /**
+         * @inheritdoc
+         */
+        isConnected(): boolean;
         protected is_binary_invoke(): boolean;
         abstract sendData(invoke: Invoke): void;
         replyData(invoke: Invoke): void;
@@ -3148,27 +3209,27 @@ declare namespace samchon.protocol {
     }
 }
 declare namespace samchon.protocol {
-    class Communicator extends CommunicatorBase {
+    abstract class Communicator extends CommunicatorBase {
         /**
          * @hidden
          */
-        protected socket: socket.socket;
+        protected socket_: socket.socket;
         /**
          * @hidden
          */
-        private header_bytes;
+        private header_bytes_;
         /**
          * @hidden
          */
-        private data;
+        private data_;
         /**
          * @hidden
          */
-        private data_index;
+        private data_index_;
         /**
          * @hidden
          */
-        private listening;
+        private listening_;
         /**
          * @inheritdoc
          */
@@ -3223,11 +3284,11 @@ declare namespace samchon.protocol {
      *
      * @author Jeongho Nam <http://samchon.org>
      */
-    class WebCommunicator extends CommunicatorBase {
+    abstract class WebCommunicator extends CommunicatorBase {
         /**
          * Connection driver, a socket for web-socket.
          */
-        protected connection: websocket.connection;
+        protected connection_: websocket.connection;
         /**
          * Close the connection.
          */
@@ -3249,8 +3310,8 @@ declare namespace samchon.protocol {
     }
 }
 declare namespace samchon.protocol {
-    class SharedWorkerCommunicator extends CommunicatorBase {
-        protected port: MessagePort;
+    abstract class SharedWorkerCommunicator extends CommunicatorBase {
+        protected port_: MessagePort;
         close(): void;
         /**
          * @inheritdoc
@@ -3481,12 +3542,12 @@ declare namespace samchon.protocol {
         /**
          * Requested path.
          */
-        private path;
+        private path_;
         /**
          * Session ID, an identifier of the remote client.
          */
-        private session_id;
-        private listening;
+        private session_id_;
+        private listening_;
         /**
          * Initialization Constructor.
          *
@@ -3556,6 +3617,11 @@ declare namespace samchon.protocol {
     }
 }
 declare namespace samchon.protocol {
+    /**
+     * A container of entity, and it's a type of entity, too.
+     *
+     * @author Jeongho Nam <http://samchon.org>
+     */
     interface IEntityGroup<T extends IEntity> extends IEntity, std.base.IContainer<T> {
         /**
          * <p> Construct data of the Entity from an XML object. </p>
@@ -3578,6 +3644,7 @@ declare namespace samchon.protocol {
          *
          * @return A new child Entity belongs to EntityArray.
          */
+        createChild(xml: library.XML): T;
         /**
          * <p> Get iterator to element. </p>
          *
@@ -3644,6 +3711,24 @@ declare namespace samchon.protocol {
          */
         toXML(): library.XML;
     }
+    /**
+     * @hidden
+     */
+    namespace IEntityGroup {
+        /**
+         * @hidden
+         */
+        function construct<T extends IEntity>(entityGroup: IEntityGroup<T>, xml: library.XML, ...prohibited_names: string[]): void;
+        /**
+         * @hidden
+         */
+        function toXML<T extends IEntity>(entityGroup: IEntityGroup<T>, ...prohibited_names: string[]): library.XML;
+        function has<T extends IEntity>(entityGroup: IEntityGroup<T>, key: any): boolean;
+        function count<T extends IEntity>(entityGroup: IEntityGroup<T>, key: any): number;
+        function get<T extends IEntity>(entityGroup: IEntityGroup<T>, key: any): T;
+    }
+}
+declare namespace samchon.protocol {
     /**
      * @inheritdoc
      */
@@ -3653,22 +3738,13 @@ declare namespace samchon.protocol {
          */
         construct(xml: library.XML): void;
         /**
-         * <p> Factory method of a child Entity. </p>
-         *
-         * <p> EntityArray::createChild() is a factory method creating a new child Entity which is belonged
-         * to the EntityArray. This method is called by EntityArray::construct(). The children construction
-         * methods Entity::construct() will be called by abstract method of the EntityArray::construct(). </p>
-         *
-         * @return A new child Entity belongs to EntityArray.
+         * @inheritdoc
          */
-        protected abstract createChild(xml: library.XML): T;
+        abstract createChild(xml: library.XML): T;
         /**
          * @inheritdoc
          */
         key(): any;
-        /**
-         * @inheritdoc
-         */
         /**
          * @inheritdoc
          */
@@ -3694,6 +3770,8 @@ declare namespace samchon.protocol {
          */
         toXML(): library.XML;
     }
+}
+declare namespace samchon.protocol {
     /**
      * @inheritdoc
      */
@@ -3703,22 +3781,13 @@ declare namespace samchon.protocol {
          */
         construct(xml: library.XML): void;
         /**
-         * <p> Factory method of a child Entity. </p>
-         *
-         * <p> EntityArray::createChild() is a factory method creating a new child Entity which is belonged
-         * to the EntityArray. This method is called by EntityArray::construct(). The children construction
-         * methods Entity::construct() will be called by abstract method of the EntityArray::construct(). </p>
-         *
-         * @return A new child Entity belongs to EntityArray.
+         * @inheritdoc
          */
-        protected abstract createChild(xml: library.XML): T;
+        abstract createChild(xml: library.XML): T;
         /**
          * @inheritdoc
          */
         key(): any;
-        /**
-         * @inheritdoc
-         */
         /**
          * @inheritdoc
          */
@@ -3744,6 +3813,8 @@ declare namespace samchon.protocol {
          */
         toXML(): library.XML;
     }
+}
+declare namespace samchon.protocol {
     /**
      * @inheritdoc
      */
@@ -3753,22 +3824,13 @@ declare namespace samchon.protocol {
          */
         construct(xml: library.XML): void;
         /**
-         * <p> Factory method of a child Entity. </p>
-         *
-         * <p> EntityArray::createChild() is a factory method creating a new child Entity which is belonged
-         * to the EntityArray. This method is called by EntityArray::construct(). The children construction
-         * methods Entity::construct() will be called by abstract method of the EntityArray::construct(). </p>
-         *
-         * @return A new child Entity belongs to EntityArray.
+         * @inheritdoc
          */
-        protected abstract createChild(xml: library.XML): T;
+        abstract createChild(xml: library.XML): T;
         /**
          * @inheritdoc
          */
         key(): any;
-        /**
-         * @inheritdoc
-         */
         /**
          * @inheritdoc
          */
@@ -3801,6 +3863,8 @@ declare namespace samchon.protocol {
      */
     interface IEntityCollection<T extends IEntity> extends IEntityGroup<T>, collection.ICollection<T> {
     }
+}
+declare namespace samchon.protocol {
     /**
      * @inheritdoc
      */
@@ -3810,22 +3874,13 @@ declare namespace samchon.protocol {
          */
         construct(xml: library.XML): void;
         /**
-         * <p> Factory method of a child Entity. </p>
-         *
-         * <p> EntityArray::createChild() is a factory method creating a new child Entity which is belonged
-         * to the EntityArray. This method is called by EntityArray::construct(). The children construction
-         * methods Entity::construct() will be called by abstract method of the EntityArray::construct(). </p>
-         *
-         * @return A new child Entity belongs to EntityArray.
+         * @inheritdoc
          */
-        protected abstract createChild(xml: library.XML): T;
+        abstract createChild(xml: library.XML): T;
         /**
          * @inheritdoc
          */
         key(): any;
-        /**
-         * @inheritdoc
-         */
         /**
          * @inheritdoc
          */
@@ -3851,6 +3906,8 @@ declare namespace samchon.protocol {
          */
         toXML(): library.XML;
     }
+}
+declare namespace samchon.protocol {
     /**
      * @inheritdoc
      */
@@ -3860,22 +3917,13 @@ declare namespace samchon.protocol {
          */
         construct(xml: library.XML): void;
         /**
-         * <p> Factory method of a child Entity. </p>
-         *
-         * <p> EntityArray::createChild() is a factory method creating a new child Entity which is belonged
-         * to the EntityArray. This method is called by EntityArray::construct(). The children construction
-         * methods Entity::construct() will be called by abstract method of the EntityArray::construct(). </p>
-         *
-         * @return A new child Entity belongs to EntityArray.
+         * @inheritdoc
          */
-        protected abstract createChild(xml: library.XML): T;
+        abstract createChild(xml: library.XML): T;
         /**
          * @inheritdoc
          */
         key(): any;
-        /**
-         * @inheritdoc
-         */
         /**
          * @inheritdoc
          */
@@ -3901,6 +3949,8 @@ declare namespace samchon.protocol {
          */
         toXML(): library.XML;
     }
+}
+declare namespace samchon.protocol {
     /**
      * @inheritdoc
      */
@@ -3910,22 +3960,13 @@ declare namespace samchon.protocol {
          */
         construct(xml: library.XML): void;
         /**
-         * <p> Factory method of a child Entity. </p>
-         *
-         * <p> EntityArray::createChild() is a factory method creating a new child Entity which is belonged
-         * to the EntityArray. This method is called by EntityArray::construct(). The children construction
-         * methods Entity::construct() will be called by abstract method of the EntityArray::construct(). </p>
-         *
-         * @return A new child Entity belongs to EntityArray.
+         * @inheritdoc
          */
-        protected abstract createChild(xml: library.XML): T;
+        abstract createChild(xml: library.XML): T;
         /**
          * @inheritdoc
          */
         key(): any;
-        /**
-         * @inheritdoc
-         */
         /**
          * @inheritdoc
          */
@@ -4232,7 +4273,7 @@ declare namespace samchon.protocol {
         /**
          * <p> Listener, represent function's name. </p>
          */
-        protected listener: string;
+        private listener;
         /**
          * Default Constructor.
          */
@@ -4254,7 +4295,7 @@ declare namespace samchon.protocol {
         /**
          * @inheritdoc
          */
-        protected createChild(xml: library.XML): InvokeParameter;
+        createChild(xml: library.XML): InvokeParameter;
         /**
          * Get listener.
          */
@@ -4322,10 +4363,10 @@ declare namespace samchon.protocol {
          * @inheritdoc
          */
         construct(xml: library.XML): void;
-        setValue(value: number): any;
-        setValue(value: string): any;
-        setValue(value: library.XML): any;
-        setValue(value: Uint8Array): any;
+        setValue(value: number): void;
+        setValue(value: string): void;
+        setValue(value: library.XML): void;
+        setValue(value: Uint8Array): void;
         /**
          * @inheritdoc
          */
@@ -4365,25 +4406,31 @@ declare namespace samchon.protocol {
         /**
          *
          */
-        private startTime;
+        private start_time_;
         /**
          *
          */
-        private endTime;
+        private end_time_;
         /**
          * Default Constructor.
          */
         constructor();
         constructor(invoke: Invoke);
         construct(xml: library.XML): void;
-        notifyEnd(): void;
+        complete(): void;
         key(): number;
         getUID(): number;
         getListener(): string;
         getStartTime(): Date;
         getEndTime(): Date;
         computeElapsedTime(): number;
+        /**
+         * @inheritdoc
+         */
         TAG(): string;
+        /**
+         * @inheritdoc
+         */
         toXML(): library.XML;
         toInvoke(): Invoke;
     }
@@ -4525,15 +4572,15 @@ declare namespace samchon.protocol {
         /**
          * A server handler.
          */
-        private http_server;
+        private http_server_;
         /**
          * Sequence number for issuing session id.
          */
-        private sequence;
+        private sequence_;
         /**
          * @hidden
          */
-        private my_port;
+        private my_port_;
         /**
          * Default Constructor.
          */
@@ -4685,7 +4732,7 @@ declare namespace samchon.protocol {
      * @author Jeongho Nam <http://samchon.org>
      */
     class ServerBase extends Server implements IServerBase {
-        private target;
+        private target_;
         constructor(target: IServer);
         addClient(driver: IClientDriver): void;
     }
@@ -4730,7 +4777,7 @@ declare namespace samchon.protocol {
      * @author Jeongho Nam <http://samchon.org>
      */
     class WebServerBase extends WebServer implements IServerBase {
-        private target;
+        private target_;
         constructor(target: IServer);
         addClient(driver: IClientDriver): void;
     }
@@ -4776,7 +4823,7 @@ declare namespace samchon.protocol {
      * @author Jeongho Nam <http://samchon.org>
      */
     class SharedWorkerServerBase extends SharedWorkerServer implements IServerBase {
-        private target;
+        private target_;
         constructor(target: IServer);
         addClient(driver: IClientDriver): void;
     }
@@ -4849,13 +4896,13 @@ declare namespace samchon.protocol {
          *
          * <p> Note that, {@link socket} is only used in web-browser environment. </p>
          */
-        private browser_socket;
+        private browser_socket_;
         /**
          * <p> A driver for server connection. </p>
          *
          * <p> Note that, {@link node_client} is only used in NodeJS environment. </p>
          */
-        private node_client;
+        private node_client_;
         /**
          * @inheritdoc
          */
@@ -4889,11 +4936,17 @@ declare namespace samchon.protocol {
     }
 }
 declare namespace samchon.protocol {
+    /**
+     * @hidden
+     */
     namespace socket {
         type socket = any;
         type server = any;
         type http_server = any;
     }
+    /**
+     * @hidden
+     */
     namespace websocket {
         type connection = any;
         type request = any;
@@ -4902,14 +4955,42 @@ declare namespace samchon.protocol {
         type client = any;
     }
 }
+declare namespace samchon.protocol.distributed {
+    class DSInvokeHistory extends InvokeHistory {
+        private system_;
+        private role_;
+        /**
+         * Construct from a DistributedSystem.
+         *
+         * @param system
+         */
+        constructor(system: DistributedSystem);
+        /**
+         * Initilizer Constructor.
+         *
+         * @param system
+         * @param role
+         * @param invoke
+         */
+        constructor(system: DistributedSystem, role: DistributedSystemRole, invoke: Invoke);
+        /**
+         * @inheritdoc
+         */
+        construct(xml: library.XML): void;
+        getSystem(): DistributedSystem;
+        getRole(): DistributedSystemRole;
+        /**
+         * @inheritdoc
+         */
+        toXML(): library.XML;
+    }
+}
 declare namespace samchon.protocol.external {
     /**
-     * <p> An external system driver. </p>
+     * <p> A role of an external system. </p>
      *
-     * <p> The {@link ExternalSystem} class represents an external system, connected and interact with this system.
-     * {@link ExternalSystem} takes full charge of network communication with external system have connected.
-     * Replied {@link Invoke messages} from the external system is shifted to and processed in, children elements of this
-     * class, {@link ExternalSystemRole} objects. </p>
+     * <p> The {@link ExternalSystemRole} class represents a role, <i>what to do</i> in an {@link ExternalSystem}.
+     * Extends this class and writes some methods related to the role. </p>
      *
      * <p> <a href="http://samchon.github.io/framework/images/design/ts_class_diagram/protocol_external_system.png"
      *		  target="_blank">
@@ -4917,9 +4998,9 @@ declare namespace samchon.protocol.external {
      *		 style="max-width: 100%" />
      * </a> </p>
      *
-     * <h4> Bridge & Proxy Pattern </h4>
-     * <p> The {@link ExternalSystem} class can be a <i>bridge</i> for <i>logical proxy</i>. In framework within user,
-     * which {@link ExternalSystem external system} is connected with {@link ExternalSystemArray this system}, it's not
+     * <h4> Proxy Pattern </h4>
+     * <p> The {@link ExternalSystemRole} class can be an <i>logical proxy</i>. In framework within user, which
+     * {@link ExternalSystem external system} is connected with {@link ExternalSystemArray this system}, it's not
      * important. Only interested in user's perspective is <i>which can be done</i>. </p>
      *
      * <p> By using the <i>logical proxy</i>, user dont't need to know which {@link ExternalSystemRole role} is belonged
@@ -4936,197 +5017,81 @@ declare namespace samchon.protocol.external {
      *		{@link ExternalSystemRole.sendData ExternalSystemRole.sendData()}. Then, the message will be sent to the
      *		external system.
      *	</li>
-     *	<li> Those strategy is called <i>Bridge Pattern</i> and <i>Proxy Pattern</i>. </li>
+     *	<li> Those strategy is called <i>Proxy Pattern</i>. </li>
      * </ul>
      *
      * @author Jeongho Nam <http://samchon.org>
      */
-    abstract class ExternalSystem extends EntityDequeCollection<ExternalSystemRole> implements IProtocol {
+    abstract class ExternalSystemRole extends Entity implements IProtocol {
         /**
-         * A network communicator with external system.
+         * An {@link ExternalSystem external system} containing this {@link ExternalSystemRole role}.
          */
+        private system;
         /**
-         * A network communicator with external system.
-         */
-        protected communicator: ICommunicator;
-        /**
-         * The name represents external system have connected.
+         * <p> A name, represents and identifies this {@link ExternalSystemRole role}. </p>
+         *
+         * <p> This {@link name} is an identifier represents this {@link ExternalSystemRole role}. This {@link name} is
+         * used in {@link ExternalSystemArray.getRole} and {@link ExternalSystem.get}, as a key elements. Thus, this
+         * {@link name} should be unique in an {@link ExternalSystemArray}.
          */
         protected name: string;
         /**
-         * Default Constructor.
-         */
-        constructor();
-        /**
-         * Construct from an IClientDriver object.
+         * Constructor from a system.
          *
-         * @param driver
+         * @param system An external system containing this role.
          */
-        constructor(driver: IClientDriver);
+        constructor(system: ExternalSystem);
         /**
-         * Default Destructor.
-         */
-        destructor(): void;
-        /**
-         * Identifier of {@link ExternalSystem} is its {@link name}.
+         * Identifier of {@link ExternalSystemRole} is its {@link name}.
          */
         key(): string;
         /**
-         * Get {@link name}.
+         * Get external system, this role is belonged to.
+         */
+        getSystem(): ExternalSystem;
+        /**
+         * Get name, who represents and identifies this role.
          */
         getName(): string;
-        close(): void;
         /**
-         * Send {@link Invoke} message to external system.
+         * Send an {@link Invoke} message to the external system via {@link system}.
          *
-         * @param invoke An {@link Invoke} message to send.
+         * @param invoke An {@link Invoke} message to send to the external system.
          */
         sendData(invoke: Invoke): void;
         /**
-         * Handle an {@Invoke} message have received.
+         * <p> Handle replied {@link Invoke message} from the {@link system external system} belonged to. </p>
          *
-         * @param invoke An {@link Invoke} message have received.
+         * <p> This {@link replyData replyData()} will call a member method named following {@link Invoke.listener}.
+         * in the <i>invoke</i>. </p>
+         *
+         * @param invoke An {@link Invoke} message received from the {@link system external system}.
          */
         replyData(invoke: Invoke): void;
         /**
-         * Tag name of the {@link ExternalSytem} in {@link XML}.
-         *
-         * @return <i>system</i>.
-         */
-        TAG(): string;
-        /**
-         * Tag name of {@link ExternalSystemRole children elements} belonged to the {@link ExternalSytem} in {@link XML}.
+         * Tag name of the {@link ExternalSytemRole} in {@link XML}.
          *
          * @return <i>role</i>.
          */
-        CHILD_TAG(): string;
-        /**
-         * @inheritdoc
-         */
-        toXML(): library.XML;
-        /**
-         * @hidden
-         */
-        private communicator_;
-        /**
-         * @hidden
-         */
-        private external_system_array_;
-        /**
-         * @hidden
-         */
-        private erasing_;
-        /**
-         * @hidden
-         */
-        private external_system_array;
-        /**
-         * @hidden
-         */
-        private handle_close();
-    }
-}
-declare namespace samchon.protocol.parallel {
-    /**
-     * <p> An external parallel system driver. </p>
-     *
-     *
-     *
-     * @author Jeongho Nam <http://samchon.org>
-     */
-    abstract class ParallelSystem extends external.ExternalSystem {
-        /**
-         * A manager containing this {@link ParallelSystem} object.
-         */
-        private systemArray;
-        /**
-         * A list of {@link Invoke} messages on process.
-         *
-         * @see {@link performance}
-         */
-        private progress_list;
-        /**
-         * A list of {@link Invoke} messages had processed.
-         *
-         * @see {@link performance}
-         */
-        private history_list;
-        /**
-         * <p> Performance index. </p>
-         *
-         * <p> A performance index that indicates how much fast the connected parallel system is. </p>
-         *
-         * <p> If this {@link ParallelSystem parallel system} hasn't any {@link Invoke} message
-         * {@link history_list had handled}, then the {@link performance performance index} will be 1, which means
-         * default and average value between all {@link ParallelSystem} instances (belonged to a same
-         * {@link ParallelSystemArray} object). </p>
-         *
-         * <p> You can specify this {@link performance} by yourself, but notice that, if the
-         * {@link performance performance index} is higher then other {@link ParallelSystem} objects, then this
-         * {@link ParallelSystem parallel system} will ordered to handle more processes than other {@link ParallelSystem}
-         * objects. Otherwise, the {@link performance performance index) is lower than others, of course, less processes
-         * will be delivered. </p>
-         *
-         * <p> This {@link performance index} is always re-calculated whenever {@link ParallelSystemArray} calls one of
-         * them below. </p>
-         *
-         * <ul>
-         *	<li> {@link ParallelSystemArray.sendSegmentData ParallelSystemArray.sendSegmentData()} </li>
-         *	<li> {@link ParallelSystemArray.sendPieceData ParallelSystemArray.sendPieceData()} </li>
-         * </ul>
-         *
-         * <p> If this class is a type of {@link DistributedSystem}, a derived class from the {@link ParallelSystem},
-         * then {@link DistributedSystemRole.sendData DistributedSystem.sendData()} also cause the re-calculation. </p>
-         *
-         * @see {@link progress_list}, {@link history_list}
-         */
-        protected performance: number;
-        /**
-         * Construct from a {@link ParallelSystemArray}.
-         *
-         * @param systemArray A manager containing this {@link ParallelSystem} object.
-         * @param communicator A communicator who takes full charge of network communication with the external
-         *					   parallel system.
-         */
-        constructor(systemArray: ParallelSystemArray, communicator?: ICommunicator);
-        /**
-         * Get manager of this object, {@link systemArray}.
-         *
-         * @return A manager containing this {@link ParallelSystem} object.
-         */
-        getSystemArray(): ParallelSystemArray;
-        /**
-         * Get {@link performant performance index}.
-         *
-         * A performance index that indicates how much fast the connected parallel system is.
-         */
-        getPerformance(): number;
-        /**
-         * Send an {@link Invoke} message with index of segmentation.
-         *
-         * @param invoke An invoke message requesting parallel process.
-         * @param first Initial piece's index in a section.
-         * @param last Final piece's index in a section. The ranged used is [<i>first</i>, <i>last</i>), which contains
-         *			   all the pieces' indices between <i>first</i> and <i>last</i>, including the piece pointed by index
-         *			   <i>first</i>, but not the piece pointed by the index <i>last</i>.
-         *
-         * @see {@link ParallelSystemArray.sendPieceData}
-         */
-        private send_piece_data(invoke, first, last);
-        /**
-         *
-         *
-         * @param xml
-         *
-         * @see {@link ParallelSystemArray.notify_end}
-         */
-        private report_invoke_history(xml);
+        TAG(): string;
     }
 }
 declare namespace samchon.protocol.distributed {
-    abstract class DistributedSystem extends parallel.ParallelSystem {
+    abstract class DistributedSystemRole extends external.ExternalSystemRole {
+        private system_array_;
+        private progress_list_;
+        private history_list_;
+        protected performance: number;
+        constructor(systemArray: DistributedSystemArray);
+        getSystemArray(): DistributedSystemArray;
+        getPerformance(): number;
+        sendData(invoke: protocol.Invoke): void;
+        _Report_history(history: DSInvokeHistory): void;
     }
 }
+/**
+ * [[include: https://raw.githubusercontent.com/samchon/framework/master/handbook/TypeScript-Protocol-External_System.md]]
+ */
 declare namespace samchon.protocol.external {
     /**
      * <p> An array and manager of {@link ExternalSystem external systems}. </p>
@@ -5175,23 +5140,15 @@ declare namespace samchon.protocol.external {
      *
      * @author Jeongho Nam <http://samchon.org>
      */
-    abstract class ExternalSystemArray extends EntityArrayCollection<ExternalSystem> implements IProtocol {
+    abstract class ExternalSystemArray extends EntityDequeCollection<ExternalSystem> implements IProtocol {
         /**
          * Default Constructor.
          */
         constructor();
-        /**
-         * @hidden
-         */
-        private handle_system_insert(event);
         /**
          * @hidden
          */
         private handle_system_erase(event);
-        /**
-         * @hidden
-         */
-        protected handle_system_close(system: ExternalSystem): void;
         /**
          * Test whether this system array has the role.
          *
@@ -5244,13 +5201,25 @@ declare namespace samchon.protocol.parallel {
      */
     abstract class ParallelSystemArray extends external.ExternalSystemArray {
         /**
-         * @see {@link ParallelSystem.progress_list}, {@link ParallelSystem.history_list}
+         * @hidden
          */
-        private history_sequence;
+        private history_sequence_;
         /**
          * Default Constructor.
          */
         constructor();
+        /**
+         * @inheritdoc
+         */
+        at(index: number): ParallelSystem;
+        /**
+         * @hidden
+         */
+        _Fetch_history_sequence(): number;
+        /**
+         * @hidden
+         */
+        _Set_history_sequence(val: number): void;
         /**
          *
          * @param invoke An invoke message requesting parallel process.
@@ -5272,27 +5241,145 @@ declare namespace samchon.protocol.parallel {
          * @param history
          *
          * @return Whether the processes with same uid are all fininsed.
-         *
-         * @see {@link ParallelSystem.report_invoke_history}, {@link normalize_performance}
          */
-        protected notify_end(history: PRInvokeHistory): boolean;
+        _Complete_history(history: InvokeHistory): boolean;
         /**
-         * @see {@link ParallelSystem.performance}
+         * @hidden
          */
         private normalize_performance();
     }
 }
 declare namespace samchon.protocol.distributed {
     abstract class DistributedSystemArray extends parallel.ParallelSystemArray {
-        protected roles: std.HashMap<string, DistributedSystemRole>;
+        /**
+         * @hidden
+         */
+        private role_map_;
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        construct(xml: library.XML): void;
+        abstract createRole(xml: library.XML): DistributedSystemRole;
+        /**
+         * @inheritdoc
+         */
+        at(index: number): DistributedSystem;
+        getRoleMap(): std.HashMap<string, DistributedSystemRole>;
+        /**
+         * @inheritdoc
+         */
+        hasRole(name: string): boolean;
+        /**
+         * @inheritdoc
+         */
+        getRole(name: string): DistributedSystemRole;
+        insertRole(role: DistributedSystemRole): void;
+        eraseRole(name: string): void;
+        toXML(): library.XML;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    abstract class DistributedClientArray extends DistributedSystemArray implements external.IExternalClientArray {
+        /**
+         * A subrogator of {@link IServer server}'s role instead of this {@link ExternalClientArray}.
+         */
+        private server_base_;
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        /**
+         * <p> Factory method creating {@link IServerBase} object. </p>
+         *
+         * <p> This method {@link createServerBase createServerBase()} determines which protocol is used in this server,
+         * {@link ExternalClientArray}. If the protocol is determined, then {@link ExternalSystem external clients} who
+         * may connect to {@link ExternalClientArray this server} must follow the specified protocol. </p>
+         *
+         * <p> Creates and returns one of them: </p>
+         * <ul>
+         *	<li> {@link ServerBase} </li>
+         *	<li> {@link WebServerBase} </li>
+         *	<li> {@link SharedWorkerServerBase} </li>
+         * </ul>
+         *
+         * @return A new {@link IServerBase} object.
+         */
+        protected abstract createServerBase(): IServerBase;
+        addClient(driver: IClientDriver): void;
+        createChild(xml: library.XML): DistributedSystem;
+        protected abstract createExternalClient(driver: IClientDriver): DistributedSystem;
+        /**
+         * @inheritdoc
+         */
+        open(port: number): void;
+        /**
+         * @inheritdoc
+         */
+        close(): void;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    abstract class DistributedSystemArrayMediator extends DistributedSystemArray {
+        private mediator_;
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        protected abstract createMediator(): parallel.MediatorSystem;
+        protected startMediator(): void;
+        getMediator(): parallel.MediatorSystem;
+        _Complete_history(history: parallel.PRInvokeHistory): boolean;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    abstract class DistributedClientArrayMediator extends DistributedSystemArrayMediator implements external.IExternalClientArray {
+        /**
+         * A subrogator of {@link IServer server}'s role instead of this {@link ExternalClientArray}.
+         */
+        private server_base_;
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        /**
+         * <p> Factory method creating {@link IServerBase} object. </p>
+         *
+         * <p> This method {@link createServerBase createServerBase()} determines which protocol is used in this server,
+         * {@link ExternalClientArray}. If the protocol is determined, then {@link ExternalSystem external clients} who
+         * may connect to {@link ExternalClientArray this server} must follow the specified protocol. </p>
+         *
+         * <p> Creates and returns one of them: </p>
+         * <ul>
+         *	<li> {@link ServerBase} </li>
+         *	<li> {@link WebServerBase} </li>
+         *	<li> {@link SharedWorkerServerBase} </li>
+         * </ul>
+         *
+         * @return A new {@link IServerBase} object.
+         */
+        protected abstract createServerBase(): IServerBase;
+        addClient(driver: IClientDriver): void;
+        createChild(xml: library.XML): DistributedSystem;
+        protected abstract createExternalClient(driver: IClientDriver): DistributedSystem;
+        /**
+         * @inheritdoc
+         */
+        open(port: number): void;
+        /**
+         * @inheritdoc
+         */
+        close(): void;
     }
 }
 declare namespace samchon.protocol.external {
     /**
-     * <p> A role of an external system. </p>
+     * <p> An external system driver. </p>
      *
-     * <p> The {@link ExternalSystemRole} class represents a role, <i>what to do</i> in an {@link ExternalSystem}.
-     * Extends this class and writes some methods related to the role. </p>
+     * <p> The {@link ExternalSystem} class represents an external system, connected and interact with this system.
+     * {@link ExternalSystem} takes full charge of network communication with external system have connected.
+     * Replied {@link Invoke messages} from the external system is shifted to and processed in, children elements of this
+     * class, {@link ExternalSystemRole} objects. </p>
      *
      * <p> <a href="http://samchon.github.io/framework/images/design/ts_class_diagram/protocol_external_system.png"
      *		  target="_blank">
@@ -5300,9 +5387,9 @@ declare namespace samchon.protocol.external {
      *		 style="max-width: 100%" />
      * </a> </p>
      *
-     * <h4> Proxy Pattern </h4>
-     * <p> The {@link ExternalSystemRole} class can be an <i>logical proxy</i>. In framework within user, which
-     * {@link ExternalSystem external system} is connected with {@link ExternalSystemArray this system}, it's not
+     * <h4> Bridge & Proxy Pattern </h4>
+     * <p> The {@link ExternalSystem} class can be a <i>bridge</i> for <i>logical proxy</i>. In framework within user,
+     * which {@link ExternalSystem external system} is connected with {@link ExternalSystemArray this system}, it's not
      * important. Only interested in user's perspective is <i>which can be done</i>. </p>
      *
      * <p> By using the <i>logical proxy</i>, user dont't need to know which {@link ExternalSystemRole role} is belonged
@@ -5319,68 +5406,249 @@ declare namespace samchon.protocol.external {
      *		{@link ExternalSystemRole.sendData ExternalSystemRole.sendData()}. Then, the message will be sent to the
      *		external system.
      *	</li>
-     *	<li> Those strategy is called <i>Proxy Pattern</i>. </li>
+     *	<li> Those strategy is called <i>Bridge Pattern</i> and <i>Proxy Pattern</i>. </li>
      * </ul>
      *
      * @author Jeongho Nam <http://samchon.org>
      */
-    abstract class ExternalSystemRole extends Entity implements IProtocol {
+    abstract class ExternalSystem extends EntityDequeCollection<ExternalSystemRole> implements IProtocol {
         /**
-         * An {@link ExternalSystem external system} containing this {@link ExternalSystemRole role}.
+         * The name represents external system have connected.
          */
-        private system;
+        protected name: string;
         /**
-         * <p> A name, represents and identifies this {@link ExternalSystemRole role}. </p>
-         *
-         * <p> This {@link name} is an identifier represents this {@link ExternalSystemRole role}. This {@link name} is
-         * used in {@link ExternalSystemArray.getRole} and {@link ExternalSystem.get}, as a key elements. Thus, this
-         * {@link name} should be unique in an {@link ExternalSystemArray}.
+         * @hidden
          */
-        private name;
+        private system_array_;
         /**
-         * Constructor from a system.
-         *
-         * @param system An external system containing this role.
+         * @hidden
          */
-        constructor(system: ExternalSystem);
+        private communicator_;
+        constructor(systemArray: ExternalSystemArray);
+        constructor(systemArray: ExternalSystemArray, communicator: IClientDriver);
         /**
-         * Identifier of {@link ExternalSystemRole} is its {@link name}.
+         * Default Destructor.
+         */
+        destructor(): void;
+        /**
+         * @hidden
+         */
+        private handle_close();
+        getSystemArray(): ExternalSystemArray;
+        /**
+         * Identifier of {@link ExternalSystem} is its {@link name}.
          */
         key(): string;
         /**
-         * Get external system, this role is belonged to.
-         */
-        getSystem(): ExternalSystem;
-        /**
-         * Get name, who represents and identifies this role.
+         * Get {@link name}.
          */
         getName(): string;
+        protected communicator: protocol.ICommunicator;
+        close(): void;
         /**
-         * Send an {@link Invoke} message to the external system via {@link system}.
+         * Send {@link Invoke} message to external system.
          *
-         * @param invoke An {@link Invoke} message to send to the external system.
+         * @param invoke An {@link Invoke} message to send.
          */
         sendData(invoke: Invoke): void;
         /**
-         * <p> Handle replied {@link Invoke message} from the {@link system external system} belonged to. </p>
+         * Handle an {@Invoke} message has received.
          *
-         * <p> This {@link replyData replyData()} will call a member method named following {@link Invoke.listener}.
-         * in the <i>invoke</i>. </p>
-         *
-         * @param invoke An {@link Invoke} message received from the {@link system external system}.
+         * @param invoke An {@link Invoke} message have received.
          */
         replyData(invoke: Invoke): void;
         /**
-         * Tag name of the {@link ExternalSytemRole} in {@link XML}.
+         * Tag name of the {@link ExternalSytem} in {@link XML}.
+         *
+         * @return <i>system</i>.
+         */
+        TAG(): string;
+        /**
+         * Tag name of {@link ExternalSystemRole children elements} belonged to the {@link ExternalSytem} in {@link XML}.
          *
          * @return <i>role</i>.
          */
-        TAG(): string;
+        CHILD_TAG(): string;
+    }
+}
+declare namespace samchon.protocol.parallel {
+    /**
+     * <p> An external parallel system driver. </p>
+     *
+     *
+     *
+     * @author Jeongho Nam <http://samchon.org>
+     */
+    abstract class ParallelSystem extends external.ExternalSystem {
+        /**
+         * @hidden
+         */
+        private progress_list_;
+        /**
+         * @hidden
+         */
+        private history_list_;
+        /**
+         * <p> Performance index. </p>
+         *
+         * <p> A performance index that indicates how much fast the connected parallel system is. </p>
+         *
+         * <p> If this {@link ParallelSystem parallel system} hasn't any {@link Invoke} message had handled, then the
+         * {@link performance performance index} will be 1, which means default and average value between all
+         * {@link ParallelSystem} instances (belonged to a same {@link ParallelSystemArray} object). </p>
+         *
+         * <p> You can specify this {@link performance} by yourself, but notice that, if the
+         * {@link performance performance index} is higher then other {@link ParallelSystem} objects, then this
+         * {@link ParallelSystem parallel system} will ordered to handle more processes than other
+         * {@link ParallelSystem} objects. Otherwise, the {@link performance performance index) is lower than others,
+         * of course, less processes will be delivered. </p>
+         *
+         * <p> This {@link performance index} is always re-calculated whenever {@link ParallelSystemArray} calls one of
+         * them below. </p>
+         *
+         * <ul>
+         *	<li> {@link ParallelSystemArray.sendSegmentData ParallelSystemArray.sendSegmentData()} </li>
+         *	<li> {@link ParallelSystemArray.sendPieceData ParallelSystemArray.sendPieceData()} </li>
+         * </ul>
+         *
+         * <p> If this class is a type of {@link DistributedSystem} derived class from the {@link ParallelSystem},
+         * then {@link DistributedSystemRole.sendData DistributedSystemRole.sendData()} also cause the re-calculation.
+         * </p>
+         */
+        protected performance: number;
+        constructor(systemArray: ParallelSystemArray);
+        constructor(systemArray: ParallelSystemArray, communicator: IClientDriver);
+        destructor(): void;
+        /**
+         * Get manager of this object, {@link systemArray}.
+         *
+         * @return A manager containing this {@link ParallelSystem} object.
+         */
+        getSystemArray(): ParallelSystemArray;
+        /**
+         * Get {@link performant performance index}.
+         *
+         * A performance index that indicates how much fast the connected parallel system is.
+         */
+        getPerformance(): number;
+        _Get_progress_list(): std.HashMap<number, std.Pair<Invoke, InvokeHistory>>;
+        _Get_history_list(): std.HashMap<number, InvokeHistory>;
+        _Set_performance(val: number): void;
+        /**
+         * @hidden
+         */
+        _Send_piece_data(invoke: Invoke, first: number, last: number): void;
+        /**
+         * @hidden
+         */
+        private _replyData(invoke);
+        /**
+         *
+         *
+         * @param xml
+         *
+         * @see {@link ParallelSystemArray.notify_complete}
+         */
+        protected _Report_history(xml: library.XML): void;
     }
 }
 declare namespace samchon.protocol.distributed {
-    abstract class DistributedSystemRole extends external.ExternalSystemRole {
-        private systems;
+    abstract class DistributedSystem extends parallel.ParallelSystem {
+        destructor(): void;
+        createChild(xml: library.XML): external.ExternalSystemRole;
+        /**
+         * Get manager of this object.
+         *
+         * @return A manager containing this {@link DistributedSystem} objects.
+         */
+        getSystemArray(): DistributedSystemArray;
+        /**
+         * @inheritdoc
+         */
+        has(key: string): boolean;
+        /**
+         * @inheritdoc
+         */
+        get(key: string): DistributedSystemRole;
+        replyData(invoke: protocol.Invoke): void;
+        protected _Report_history(xml: library.XML): void;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    interface IDistributedServer extends DistributedSystem, external.IExternalServer {
+        /**
+         * @inheritdoc
+         */
+        getSystemArray(): DistributedSystemArray;
+        /**
+         * @inheritdoc
+         */
+        has(key: string): boolean;
+        /**
+         * @inheritdoc
+         */
+        get(key: string): DistributedSystemRole;
+    }
+    abstract class DistributedServer extends DistributedSystem implements external.IExternalServer {
+        protected ip: string;
+        protected port: number;
+        constructor(systemArray: DistributedSystemArray);
+        protected abstract createServerConnector(): IServerConnector;
+        connect(): void;
+        getIP(): string;
+        getPort(): number;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    abstract class DistributedServerArray extends DistributedSystemArray implements external.IExternalServerArray {
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        /**
+         * @inheritdoc
+         */
+        connect(): void;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    abstract class DistributedServerArrayMediator extends DistributedSystemArrayMediator implements external.IExternalServerArray {
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        /**
+         * @inheritdoc
+         */
+        connect(): void;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    abstract class DistributedServerClientArray extends DistributedClientArray implements external.IExternalServerClientArray {
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        createChild(xml: library.XML): DistributedSystem;
+        protected abstract createExternalServer(xml: library.XML): IDistributedServer;
+        /**
+         * @inheritdoc
+         */
+        connect(): void;
+    }
+}
+declare namespace samchon.protocol.distributed {
+    abstract class DistributedServerClientArrayMediator extends DistributedClientArrayMediator implements external.IExternalServerClientArray {
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        createChild(xml: library.XML): DistributedSystem;
+        protected abstract createExternalServer(xml: library.XML): IDistributedServer;
+        /**
+         * @inheritdoc
+         */
+        connect(): void;
     }
 }
 declare namespace samchon.protocol.external {
@@ -5454,7 +5722,7 @@ declare namespace samchon.protocol.external {
         /**
          * A subrogator of {@link IServer server}'s role instead of this {@link ExternalClientArray}.
          */
-        private server_base;
+        private server_base_;
         /**
          * Default Constructor.
          */
@@ -5482,7 +5750,7 @@ declare namespace samchon.protocol.external {
          *
          * @return null.
          */
-        protected createChild(xml: library.XML): ExternalSystem;
+        createChild(xml: library.XML): ExternalSystem;
         /**
          * Factory method creating {@link ExternalSystem} object.
          *
@@ -5528,18 +5796,7 @@ declare namespace samchon.protocol.external {
      * @author Jeongho Nam <http://samchon.org>
      */
     interface IExternalServer extends ExternalSystem {
-        /**
-         * Connect to the external system.
-         */
         connect(): void;
-        /**
-         * Get ip address.
-         */
-        getIP(): string;
-        /**
-         * Get port number.
-         */
-        getPort(): number;
     }
     /**
      * <p> An external server driver. </p>
@@ -5591,7 +5848,7 @@ declare namespace samchon.protocol.external {
         /**
          * Default Constructor.
          */
-        constructor();
+        constructor(systemArray: ExternalSystemArray);
         /**
          * Factory method creating server connector.
          */
@@ -5779,7 +6036,7 @@ declare namespace samchon.protocol.external {
          *
          * @return A new child Entity via {@link createExternalServer createExternalServer()}.
          */
-        protected createChild(xml: library.XML): ExternalSystem;
+        createChild(xml: library.XML): ExternalSystem;
         /**
          * Factory method creating an {@link IExternalServer} object.
          *
@@ -5795,33 +6052,34 @@ declare namespace samchon.protocol.external {
     }
 }
 declare namespace samchon.protocol.slave {
-    abstract class SlaveSystem extends external.ExternalSystem {
+    abstract class SlaveSystem implements protocol.IProtocol {
+        protected communicator_: ICommunicator;
         /**
          * Default Constructor.
          */
         constructor();
+        sendData(invoke: Invoke): void;
+        protected _replyData(invoke: Invoke): void;
         replyData(invoke: Invoke): void;
     }
 }
-declare namespace samchon.protocol.external {
+declare namespace samchon.protocol.parallel {
     abstract class MediatorSystem extends slave.SlaveSystem {
-        private system_array;
-        private progress_list;
-        constructor(systemArray: ExternalSystemArray);
+        private mediator_;
+        private progress_list_;
+        constructor(systemArray: ParallelSystemArrayMediator | distributed.DistributedSystemArrayMediator);
         abstract start(): void;
-        /**
-         * @hidden
-         */
-        protected createChild(xml: library.XML): ExternalSystemRole;
-        private notify_end(uid);
+        getMediator(): ParallelSystemArrayMediator | distributed.DistributedSystemArrayMediator;
+        _Complete_history(uid: number): void;
+        protected _replyData(invoke: Invoke): void;
         replyData(invoke: protocol.Invoke): void;
     }
 }
-declare namespace samchon.protocol.external {
-    class MediatorServer extends MediatorSystem implements IServer {
-        private server_base;
+declare namespace samchon.protocol.parallel {
+    class MediatorServer extends MediatorSystem implements slave.ISlaveServer {
+        private server_base_;
         private port;
-        constructor(systemArray: ExternalSystemArray, port: number);
+        constructor(systemArray: ParallelSystemArrayMediator, port: number);
         protected createServerBase(): IServerBase;
         addClient(driver: IClientDriver): void;
         start(): void;
@@ -5829,17 +6087,23 @@ declare namespace samchon.protocol.external {
         close(): void;
     }
     class MediatorWebServer extends MediatorServer {
+        /**
+         * @inheritdoc
+         */
         protected createServerBase(): IServerBase;
     }
     class MediatorSharedWorkerServer extends MediatorServer {
+        /**
+         * @inheritdoc
+         */
         protected createServerBase(): IServerBase;
     }
 }
-declare namespace samchon.protocol.external {
-    class MediatorClient extends MediatorSystem implements IExternalServer {
+declare namespace samchon.protocol.parallel {
+    class MediatorClient extends MediatorSystem implements slave.ISlaveClient {
         protected ip: string;
         protected port: number;
-        constructor(systemArray: ExternalSystemArray, ip: string, port: number);
+        constructor(systemArray: ParallelSystemArrayMediator, ip: string, port: number);
         protected createServerConnector(): IServerConnector;
         getIP(): string;
         getPort(): number;
@@ -5881,6 +6145,8 @@ declare namespace samchon.protocol.parallel {
         constructor(invoke: Invoke);
         getFirst(): number;
         getLast(): number;
+        _Set_first(val: number): void;
+        _Set_last(val: number): void;
         /**
          * Compute number of allocated pieces.
          */
@@ -5892,7 +6158,7 @@ declare namespace samchon.protocol.parallel {
         /**
          * A subrogator of {@link IServer server}'s role instead of this {@link ExternalClientArray}.
          */
-        private server_base;
+        private server_base_;
         /**
          * Default Constructor.
          */
@@ -5915,7 +6181,7 @@ declare namespace samchon.protocol.parallel {
          */
         protected abstract createServerBase(): IServerBase;
         addClient(driver: IClientDriver): void;
-        protected createChild(xml: library.XML): ParallelSystem;
+        createChild(xml: library.XML): ParallelSystem;
         protected abstract createExternalClient(driver: IClientDriver): ParallelSystem;
         /**
          * @inheritdoc
@@ -5929,16 +6195,15 @@ declare namespace samchon.protocol.parallel {
 }
 declare namespace samchon.protocol.parallel {
     abstract class ParallelSystemArrayMediator extends ParallelSystemArray {
-        protected mediator: external.MediatorSystem;
+        private mediator_;
         /**
          * Default Constructor.
          */
         constructor();
-        protected abstract createMediator(): external.MediatorSystem;
+        protected abstract createMediator(): MediatorSystem;
         protected start_mediator(): void;
-        sendData(invoke: protocol.Invoke): void;
-        sendPieceData(invoke: protocol.Invoke, first: number, last: number): void;
-        protected notify_end(history: PRInvokeHistory): boolean;
+        getMediator(): MediatorSystem;
+        _Complete_history(history: PRInvokeHistory): boolean;
     }
 }
 declare namespace samchon.protocol.parallel {
@@ -5946,7 +6211,7 @@ declare namespace samchon.protocol.parallel {
         /**
          * A subrogator of {@link IServer server}'s role instead of this {@link ExternalClientArray}.
          */
-        private server_base;
+        private server_base_;
         /**
          * Default Constructor.
          */
@@ -5969,7 +6234,7 @@ declare namespace samchon.protocol.parallel {
          */
         protected abstract createServerBase(): IServerBase;
         addClient(driver: IClientDriver): void;
-        protected createChild(xml: library.XML): ParallelSystem;
+        createChild(xml: library.XML): ParallelSystem;
         protected abstract createExternalClient(driver: IClientDriver): ParallelSystem;
         /**
          * @inheritdoc
@@ -5982,9 +6247,13 @@ declare namespace samchon.protocol.parallel {
     }
 }
 declare namespace samchon.protocol.parallel {
-    interface IParallelServer extends ParallelSystem, external.IExternalServer {
+    interface IParallelServer extends external.IExternalServer, ParallelSystem {
+        /**
+         * @inheritdoc
+         */
+        getSystemArray(): ParallelSystemArray;
     }
-    abstract class ParallelServer extends ParallelSystem implements IParallelServer {
+    abstract class ParallelServer extends ParallelSystem implements external.IExternalServer {
         protected ip: string;
         protected port: number;
         constructor(systemArray: ParallelSystemArray);
@@ -6003,6 +6272,9 @@ declare namespace samchon.protocol.parallel {
 declare namespace samchon.protocol.parallel {
     abstract class ParallelServerArrayMediator extends ParallelSystemArrayMediator implements external.IExternalServerArray {
         constructor();
+        /**
+         * @inheritdoc
+         */
         connect(): void;
     }
 }
@@ -6012,7 +6284,7 @@ declare namespace samchon.protocol.parallel {
          * Default Constructor.
          */
         constructor();
-        protected createChild(xml: library.XML): ParallelSystem;
+        createChild(xml: library.XML): ParallelSystem;
         protected abstract createExternalServer(xml: library.XML): IParallelServer;
         connect(): void;
     }
@@ -6023,7 +6295,7 @@ declare namespace samchon.protocol.parallel {
          * Default Constructor.
          */
         constructor();
-        protected createChild(xml: library.XML): ParallelSystem;
+        createChild(xml: library.XML): ParallelSystem;
         protected abstract createExternalServer(xml: library.XML): IParallelServer;
         /**
          * @inheritdoc
@@ -6033,10 +6305,10 @@ declare namespace samchon.protocol.parallel {
 }
 declare namespace samchon.protocol.service {
     abstract class Client implements protocol.IProtocol {
-        private user;
-        private service;
-        private driver;
-        private no;
+        private user_;
+        private service_;
+        private communicator_;
+        private no_;
         /**
          * Construct from an User and WebClientDriver.
          */
@@ -6045,6 +6317,8 @@ declare namespace samchon.protocol.service {
         close(): void;
         getUser(): User;
         getService(): Service;
+        getNo(): number;
+        _Set_no(val: number): void;
         sendData(invoke: protocol.Invoke): void;
         replyData(invoke: protocol.Invoke): void;
         protected changeService(path: string): void;
@@ -6052,8 +6326,8 @@ declare namespace samchon.protocol.service {
 }
 declare namespace samchon.protocol.service {
     abstract class Server extends protocol.WebServer implements IProtocol {
-        private session_map;
-        private account_map;
+        private session_map_;
+        private account_map_;
         /**
          * Default Constructor.
          */
@@ -6066,16 +6340,20 @@ declare namespace samchon.protocol.service {
         protected abstract createUser(): User;
         has(account: string): boolean;
         get(account: string): User;
+        /**
+         * @hidden
+         */
+        _Get_account_map(): std.HashMap<string, User>;
         sendData(invoke: protocol.Invoke): void;
         replyData(invoke: protocol.Invoke): void;
         addClient(driver: WebClientDriver): void;
-        private erase_user(user);
+        _Erase_user(user: User): void;
     }
 }
 declare namespace samchon.protocol.service {
     abstract class Service implements protocol.IProtocol {
-        private client;
-        private path;
+        private client_;
+        private path_;
         /**
          * Default Constructor.
          */
@@ -6095,39 +6373,75 @@ declare namespace samchon.protocol.service {
 }
 declare namespace samchon.protocol.service {
     abstract class User extends collection.HashMapCollection<number, Client> implements protocol.IProtocol {
-        private server;
-        private session_id;
-        private sequence;
-        private account_id;
-        private authority;
+        private server_;
+        private session_id_;
+        private sequence_;
+        private account_id_;
+        private authority_;
         /**
          * Construct from a Server.
          */
         constructor(server: Server);
         protected abstract createClient(driver: WebClientDriver): Client;
+        /**
+         * @hidden
+         */
+        _Create_child(driver: WebClientDriver): Client;
+        /**
+         * @hidden
+         */
         private handle_erase_client(event);
         getServer(): Server;
         getAccountID(): string;
         getAuthority(): number;
         setAccount(id: string, authority: number): void;
+        /**
+         * @hidden
+         */
+        _Get_session_id(): string;
+        /**
+         * @hidden
+         */
+        _Fetch_sequence(): number;
+        /**
+         * @hidden
+         */
+        _Set_session_id(val: string): void;
         sendData(invoke: protocol.Invoke): void;
         replyData(invoke: protocol.Invoke): void;
     }
 }
 declare namespace samchon.protocol.slave {
-    abstract class SlaveClient extends SlaveSystem {
+    interface ISlaveClient extends SlaveSystem {
+        connect(ip: string, port: number): void;
+    }
+    abstract class SlaveClient extends SlaveSystem implements ISlaveClient {
+        /**
+         * Default Constructor.
+         */
         constructor();
+        /**
+         * @inheritdoc
+         */
         protected abstract createServerConnector(): IServerConnector;
+        /**
+         * @inheritdoc
+         */
         connect(ip: string, port: number): void;
     }
 }
 declare namespace samchon.protocol.slave {
-    abstract class SlaveServer extends SlaveSystem implements IServer {
-        private server_base;
+    interface ISlaveServer extends SlaveSystem, IServer {
+    }
+    abstract class SlaveServer extends SlaveSystem implements ISlaveServer {
+        private server_base_;
         constructor();
         protected abstract createServerBase(): IServerBase;
-        addClient(driver: IClientDriver): void;
         open(port: number): void;
         close(): void;
+        addClient(driver: IClientDriver): void;
     }
 }
+declare namespace samchon.test {
+    function test_collection(): void;
+}
diff --git a/scrollreveal/scrollreveal-tests.ts b/scrollreveal/scrollreveal-tests.ts
new file mode 100644
index 0000000000..f0b205763d
--- /dev/null
+++ b/scrollreveal/scrollreveal-tests.ts
@@ -0,0 +1,74 @@
+/// <reference path="scrollreveal.d.ts" />
+
+//Tests from https://github.com/jlmakes/scrollreveal.js
+
+//1.2
+var sr = ScrollReveal();
+sr.reveal('.foo');
+sr.reveal('.bar');
+
+//1.3
+sr = ScrollReveal().reveal('.foo, .bar');
+
+//2.1
+sr = ScrollReveal({ reset: true });
+sr.reveal('.foo', { duration: 200 });
+
+//3.1
+sr = ScrollReveal({ duration: 2000 });
+sr.reveal('.box', 50);
+
+sr = ScrollReveal();
+sr.reveal('.box', { duration: 2000 }, 50);
+
+//3.2
+var fooReveal  = {
+  delay    : 200,
+  distance : '90px',
+  easing   : 'ease-in-out',
+  rotate   : { z: 10 },
+  scale    : 1.1
+};
+
+sr = ScrollReveal();
+sr.reveal('.foo', fooReveal);
+sr.reveal('#chocolate', { delay: 500, scale: 0.9 });
+
+//3.3
+sr.reveal(document.getElementById('foo'));
+sr.reveal(document.querySelectorAll('.bar'));
+
+//3.4
+sr = ScrollReveal();
+var fooContainer = document.getElementById('fooContainer');
+sr.reveal('.foo', { container: fooContainer });
+sr.reveal('.bar', { container: '#barContainer' });
+
+//3.5
+
+fooContainer = document.getElementById('fooContainer');
+
+sr = ScrollReveal();
+sr.reveal('.foo', { container: fooContainer });
+var xmlhttp = new XMLHttpRequest();
+xmlhttp.onreadystatechange = function() {
+  if (xmlhttp.readyState == XMLHttpRequest.DONE) {
+    if (xmlhttp.status == 200) {
+
+      // Turn our response into HTML...
+      var content = document.createElement('div');
+      content.innerHTML = xmlhttp.responseText;
+
+      // Add each element to the DOM...
+      for (var i = 0; i < content.childNodes.length; i++) {
+        fooContainer.appendChild(content.childNodes[ i ]);
+      };
+
+      // Finally!
+      sr.sync();
+    }
+  }
+}
+
+xmlhttp.open('GET', 'ajax.html', true);
+xmlhttp.send();
\ No newline at end of file
diff --git a/scrollreveal/scrollreveal.d.ts b/scrollreveal/scrollreveal.d.ts
new file mode 100644
index 0000000000..d1478c8243
--- /dev/null
+++ b/scrollreveal/scrollreveal.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for ScrollReveal
+// Project: https://github.com/jlmakes/scrollreveal.js
+// Definitions by: David Pires <https://github.com/Davidblkx>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace scrollReveal {
+    interface ScrollRevealRotateObject {
+        x?: number;
+        y?: number;
+        z?: number;
+    }
+
+    interface ScrollRevealPositionObject {
+        top?: number;
+        right?: number;
+        bottom?: number;
+        left?: number;
+    }
+
+    interface ScrollRevealObjectOptions {
+        origin ? : string;
+        distance ? : string;
+        duration ? : number;
+        delay ? : number;
+        rotate ? : ScrollRevealRotateObject;
+        opacity ? : number;
+        scale ? : number;
+        easing ? : string;
+        container ? : any;
+        mobile ? : boolean;
+        reset ? : boolean;
+        useDelay ? : string;
+        viewFactor ? : number;
+        viewOffset ? : ScrollRevealPositionObject;
+        beforeReveal ? (domEl: HTMLElement): void;
+        afterReveal ? (domEl: HTMLElement): void;
+        beforeReset ? (domEl: HTMLElement): void;
+        afterReset ? (domEl: HTMLElement): void;
+        beforeReveal ? (domEl: NodeListOf<Element>): void;
+        afterReveal ? (domEl: NodeListOf<Element>): void;
+        beforeReset ? (domEl: NodeListOf<Element>): void;
+        afterReset ? (domEl: NodeListOf<Element>): void;
+    }
+
+
+    interface ScrollRevealObject {
+        (): ScrollRevealObject;
+        (options: ScrollRevealObjectOptions): ScrollRevealObject;
+        reveal(selector: string): ScrollRevealObject;
+        reveal(selector: string, interval: number): ScrollRevealObject;
+        reveal(selector: string, options: ScrollRevealObjectOptions): ScrollRevealObject;
+        reveal(selector: string, options: ScrollRevealObjectOptions, interval: number): ScrollRevealObject;
+        
+        reveal(selector: HTMLElement): ScrollRevealObject;
+        reveal(selector: HTMLElement, interval: number): ScrollRevealObject;
+        reveal(selector: HTMLElement, options: ScrollRevealObjectOptions): ScrollRevealObject;
+        reveal(selector: HTMLElement, options: ScrollRevealObjectOptions, interval: number): ScrollRevealObject;
+
+        reveal(selector: NodeListOf<Element>): ScrollRevealObject;
+        reveal(selector: NodeListOf<Element>, interval: number): ScrollRevealObject;
+        reveal(selector: NodeListOf<Element>, options: ScrollRevealObjectOptions): ScrollRevealObject;
+        reveal(selector: NodeListOf<Element>, options: ScrollRevealObjectOptions, interval: number): ScrollRevealObject;
+
+        sync(): void;
+    }
+}
+
+declare var ScrollReveal: scrollReveal.ScrollRevealObject;
\ No newline at end of file
diff --git a/segment-analytics/segment-analytics.d.ts b/segment-analytics/segment-analytics.d.ts
index a474c668f7..0163568a14 100644
--- a/segment-analytics/segment-analytics.d.ts
+++ b/segment-analytics/segment-analytics.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Andrew Fong <https://github.com/fongandrew>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+declare interface JQuery {}
 
 declare namespace SegmentAnalytics {
 
diff --git a/selenium-webdriver/selenium-webdriver-2.53.1-tests.ts b/selenium-webdriver/selenium-webdriver-2.53.1-tests.ts
new file mode 100644
index 0000000000..77c68bb58d
--- /dev/null
+++ b/selenium-webdriver/selenium-webdriver-2.53.1-tests.ts
@@ -0,0 +1,1144 @@
+/// <reference path="selenium-webdriver-2.53.1.d.ts" />
+
+function TestChromeDriver() {
+    var driver: chrome.Driver = new chrome.Driver();
+    driver = new chrome.Driver(webdriver.Capabilities.chrome());
+    driver = new chrome.Driver(webdriver.Capabilities.chrome(), new remote.DriverService('executable', new chrome.Options()), new webdriver.promise.ControlFlow());
+
+    var baseDriver: webdriver.WebDriver = driver;
+}
+
+function TestChromeOptions() {
+    var options: chrome.Options = new chrome.Options();
+    options = chrome.Options.fromCapabilities(webdriver.Capabilities.chrome());
+
+    options = options.addArguments("a", "b", "c");
+    options = options.addExtensions("a", "b", "c");
+    options = options.excludeSwitches("a", "b", "c");
+    options = options.detachDriver(true);
+    options = options.setChromeBinaryPath("path");
+    options = options.setChromeLogFile("logfile");
+    options = options.setLocalState("state");
+    options = options.androidActivity("com.example.Activity");
+    options = options.androidDeviceSerial("emulator-5554");
+    options = options.androidChrome();
+    options = options.androidPackage("com.android.chrome");
+    options = options.androidProcess("com.android.chrome");
+    options = options.androidUseRunningApp(true);
+    options = options.setLoggingPrefs(new webdriver.logging.Preferences());
+    options = options.setPerfLoggingPrefs({enableNetwork: true, enablePage: true, enableTimeline: true, tracingCategories: "category", bufferUsageReportingInterval: 1000});
+    options = options.setProxy({ proxyType: "proxyType" });
+    options = options.setUserPreferences("preferences");
+    var capabilities: webdriver.Capabilities = options.toCapabilities();
+    capabilities = options.toCapabilities(webdriver.Capabilities.chrome());
+}
+
+function TestServiceBuilder() {
+    var builder: chrome.ServiceBuilder = new chrome.ServiceBuilder();
+    builder = new chrome.ServiceBuilder("exe");
+
+    var anything: any = builder.build();
+    builder = builder.usingPort(8080);
+    builder = builder.setAdbPort(5037);
+    builder = builder.loggingTo("path");
+    builder = builder.enableVerboseLogging();
+    builder = builder.setNumHttpThreads(5);
+    builder = builder.setUrlBasePath("path");
+    builder = builder.setStdio("config");
+    builder = builder.setStdio(["A", "B"]);
+    builder = builder.withEnvironment({ "A": "a", "B": "b" });
+}
+
+function TestChromeModule() {
+    var service: any = chrome.getDefaultService();
+    chrome.setDefaultService(new remote.DriverService('executable', new chrome.Options()));
+}
+
+function TestBinary() {
+    var binary: firefox.Binary = new firefox.Binary();
+    binary = new firefox.Binary("exe");
+
+    binary.addArguments("A", "B", "C");
+    var promise: webdriver.promise.Promise<void> = binary.kill();
+    binary.launch("profile").then(function (result: any) { });
+}
+
+function TestFirefoxDriver() {
+    var driver: firefox.Driver = new firefox.Driver();
+    driver = new firefox.Driver(webdriver.Capabilities.firefox());
+    driver = new firefox.Driver(webdriver.Capabilities.firefox(), new webdriver.promise.ControlFlow());
+
+    var baseDriver: webdriver.WebDriver = driver;
+}
+
+function TestFirefoxOptions() {
+    var options: firefox.Options = new firefox.Options();
+
+    options = options.setBinary("binary");
+    options = options.setBinary(new firefox.Binary());
+    options = options.setLoggingPreferences(new webdriver.logging.Preferences());
+    options = options.setProfile("profile");
+    options = options.setProfile(new firefox.Profile());
+    options = options.setProxy({ proxyType: "proxy" });
+    var capabilities: webdriver.Capabilities = options.toCapabilities();
+}
+
+function TestFirefoxProfile() {
+    var profile: firefox.Profile = new firefox.Profile();
+    profile = new firefox.Profile("dir");
+
+    var bool: boolean = profile.acceptUntrustedCerts();
+    profile.addExtension("ext");
+    bool = profile.assumeUntrustedCertIssuer();
+    profile.encode().then(function (prof: string) { });
+    var num: number = profile.getPort();
+    var anything: any = profile.getPreference("key");
+    bool = profile.nativeEventsEnabled();
+    profile.setAcceptUntrustedCerts(true);
+    profile.setAssumeUntrustedCertIssuer(true);
+    profile.setNativeEventsEnabled(true);
+    profile.setPort(8080);
+    profile.setPreference("key", "value");
+    profile.setPreference("key", 5);
+    profile.setPreference("key", true);
+    var stringPromise: webdriver.promise.Promise<string> = profile.writeToDisk();
+    stringPromise = profile.writeToDisk(true);
+}
+
+function TestExecutors() {
+    var exec: webdriver.Executor = executors.createExecutor("url");
+    var promise: webdriver.promise.Promise<string>;
+    exec = executors.createExecutor(promise);
+}
+
+function TestBuilder() {
+    var builder: webdriver.Builder = new webdriver.Builder();
+
+    var driver: webdriver.WebDriver = builder.build();
+    builder = builder.forBrowser('name');
+    builder = builder.forBrowser('name', 'version');
+    builder = builder.forBrowser('name', 'version', 'platform');
+
+    var cap: webdriver.Capabilities = builder.getCapabilities();
+    var str:string = builder.getServerUrl();
+
+    builder = builder.setAlertBehavior('behavior');
+    builder = builder.setChromeOptions(new chrome.Options());
+    builder = builder.setControlFlow(new webdriver.promise.ControlFlow());
+    builder = builder.setEnableNativeEvents(true);
+    builder = builder.setFirefoxOptions(new firefox.Options());
+    builder = builder.setLoggingPrefs(new webdriver.logging.Preferences());
+    builder = builder.setLoggingPrefs({ "key": "value" });
+    builder = builder.setProxy({ proxyType: 'type' });
+    builder = builder.setScrollBehavior(1);
+    builder = builder.usingServer('http://someserver');
+    builder = builder.withCapabilities(new webdriver.Capabilities());
+    builder = builder.withCapabilities({ something: true });
+}
+
+function TestActionSequence() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var sequence: webdriver.ActionSequence = new webdriver.ActionSequence(driver);
+    var element: webdriver.WebElement = new webdriver.WebElement(driver, 'elementId');
+    var promise: webdriver.promise.Promise<string>;
+    element = new webdriver.WebElement(driver, promise);
+
+    // Click
+    sequence = sequence.click();
+    sequence = sequence.click(webdriver.Button.LEFT);
+    sequence = sequence.click(element);
+    sequence = sequence.click(element, webdriver.Button.LEFT);
+
+    // DoubleClick
+    sequence = sequence.doubleClick();
+    sequence = sequence.doubleClick(webdriver.Button.LEFT);
+    sequence = sequence.doubleClick(element);
+    sequence = sequence.doubleClick(element, webdriver.Button.LEFT);
+
+    // DragAndDrop
+    sequence = sequence.dragAndDrop(element, element);
+    sequence = sequence.dragAndDrop(element, {x: 1, y: 2});
+
+    // KeyDown
+    sequence = sequence.keyDown(webdriver.Key.ADD);
+
+    // KeyUp
+    sequence = sequence.keyUp(webdriver.Key.ADD);
+
+    // MouseDown
+    sequence = sequence.mouseDown();
+    sequence = sequence.mouseDown(webdriver.Button.LEFT);
+    sequence = sequence.mouseDown(element);
+    sequence = sequence.mouseDown(element, webdriver.Button.LEFT);
+
+    // MouseMove
+    sequence = sequence.mouseMove(element);
+    sequence = sequence.mouseMove({x: 1, y: 1});
+    sequence = sequence.mouseMove(element, {x: 1, y: 2});
+
+    // MouseUp
+    sequence = sequence.mouseUp();
+    sequence = sequence.mouseUp(webdriver.Button.LEFT);
+    sequence = sequence.mouseUp(element);
+    sequence = sequence.mouseUp(element, webdriver.Button.LEFT);
+
+    // SendKeys
+    sequence = sequence.sendKeys("A", "B", "C");
+
+    sequence.perform().then(function () { });
+}
+
+function TestTouchSequence() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+    var element: webdriver.WebElement = new webdriver.WebElement(driver, 'elementId');
+
+    var sequence: webdriver.TouchSequence = new webdriver.TouchSequence(driver);
+
+    sequence = sequence.tap(element);
+    sequence = sequence.doubleTap(element);
+    sequence = sequence.longPress(element);
+    sequence = sequence.tapAndHold({ x: 100, y: 100 });
+    sequence = sequence.move({ x: 100, y: 100 });
+    sequence = sequence.release({ x: 100, y: 100 });
+    sequence = sequence.scroll({ x: 100, y: 100 });
+    sequence = sequence.scrollFromElement(element, { x: 100, y: 100 });
+    sequence = sequence.flick({ xspeed: 100, yspeed: 100 });
+    sequence = sequence.flickElement(element, { x: 100, y: 100 }, 100);
+
+    sequence.perform().then(function () { });
+}
+
+function TestAlert() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var alert: webdriver.Alert = driver.switchTo().alert();
+
+    alert.accept().then(function () { });
+    alert.dismiss().then(function () { });
+    alert.getText().then(function (text: string) { });
+    alert.sendKeys("ABC").then(function () { });
+}
+
+function TestBrowser() {
+    var browser: string;
+
+    browser = webdriver.Browser.ANDROID;
+    browser = webdriver.Browser.CHROME;
+    browser = webdriver.Browser.FIREFOX;
+    browser = webdriver.Browser.HTMLUNIT;
+    browser = webdriver.Browser.INTERNET_EXPLORER;
+    browser = webdriver.Browser.IPAD;
+    browser = webdriver.Browser.IPHONE;
+    browser = webdriver.Browser.OPERA;
+    browser = webdriver.Browser.PHANTOM_JS;
+    browser = webdriver.Browser.SAFARI;
+}
+
+function TestButton() {
+    var button: number;
+
+    button = webdriver.Button.LEFT;
+    button = webdriver.Button.MIDDLE;
+    button = webdriver.Button.RIGHT;
+}
+
+function TestCapabilities() {
+    var capabilities: webdriver.Capabilities = new webdriver.Capabilities();
+    capabilities = new webdriver.Capabilities(webdriver.Capabilities.chrome());
+    var objCapabilities: any = {};
+    objCapabilities[webdriver.Capability.BROWSER_NAME] = webdriver.Browser.PHANTOM_JS;
+    capabilities = new webdriver.Capabilities(objCapabilities);
+
+    var anything: any = capabilities.get(webdriver.Capability.SECURE_SSL);
+    var check: boolean = capabilities.has(webdriver.Capability.SECURE_SSL);
+    capabilities = capabilities.merge(capabilities);
+    capabilities = capabilities.merge(objCapabilities);
+    capabilities = capabilities.set(webdriver.Capability.VERSION, { abc: 'def' });
+    capabilities = capabilities.set(webdriver.Capability.VERSION, null);
+    capabilities = capabilities.setLoggingPrefs(new webdriver.logging.Preferences());
+    capabilities = capabilities.setLoggingPrefs({ "key": "value" });
+    capabilities = capabilities.setProxy({ proxyType: 'Type' });
+    capabilities = capabilities.setEnableNativeEvents(true);
+    capabilities = capabilities.setScrollBehavior(1);
+    capabilities = capabilities.setAlertBehavior('accept');
+
+    anything = capabilities.toJSON();
+
+    capabilities = webdriver.Capabilities.android();
+    capabilities = webdriver.Capabilities.chrome();
+    capabilities = webdriver.Capabilities.firefox();
+    capabilities = webdriver.Capabilities.htmlunit();
+    capabilities = webdriver.Capabilities.htmlunitwithjs();
+    capabilities = webdriver.Capabilities.ie();
+    capabilities = webdriver.Capabilities.ipad();
+    capabilities = webdriver.Capabilities.iphone();
+    capabilities = webdriver.Capabilities.opera();
+    capabilities = webdriver.Capabilities.phantomjs();
+    capabilities = webdriver.Capabilities.safari();
+}
+
+function TestCapability() {
+    var capability: string;
+
+    capability = webdriver.Capability.ACCEPT_SSL_CERTS;
+    capability = webdriver.Capability.BROWSER_NAME;
+    capability = webdriver.Capability.ELEMENT_SCROLL_BEHAVIOR;
+    capability = webdriver.Capability.HANDLES_ALERTS;
+    capability = webdriver.Capability.LOGGING_PREFS;
+    capability = webdriver.Capability.NATIVE_EVENTS;
+    capability = webdriver.Capability.PLATFORM;
+    capability = webdriver.Capability.PROXY;
+    capability = webdriver.Capability.ROTATABLE;
+    capability = webdriver.Capability.SECURE_SSL;
+    capability = webdriver.Capability.SUPPORTS_APPLICATION_CACHE;
+    capability = webdriver.Capability.SUPPORTS_CSS_SELECTORS;
+    capability = webdriver.Capability.SUPPORTS_JAVASCRIPT;
+    capability = webdriver.Capability.SUPPORTS_LOCATION_CONTEXT;
+    capability = webdriver.Capability.TAKES_SCREENSHOT;
+    capability = webdriver.Capability.UNEXPECTED_ALERT_BEHAVIOR;
+    capability = webdriver.Capability.VERSION;
+}
+
+function TestCommand() {
+    var command: webdriver.Command = new webdriver.Command(webdriver.CommandName.ADD_COOKIE);
+
+    var name: string = command.getName();
+    var param: any = command.getParameter("param");
+
+    var params: any = command.getParameters();
+
+    command = command.setParameter("param", 123);
+    command = command.setParameters({ param: 123 });
+}
+
+function TestDeferredExecutor() {
+    var promise: webdriver.promise.Promise<webdriver.Executor>;
+    var executor: webdriver.DeferredExecutor = new webdriver.DeferredExecutor(promise);
+}
+
+function TestCommandName() {
+    var command: string;
+
+    command = webdriver.CommandName.ACCEPT_ALERT;
+    command = webdriver.CommandName.ADD_COOKIE;
+    command = webdriver.CommandName.CLEAR_APP_CACHE;
+    command = webdriver.CommandName.CLEAR_ELEMENT;
+    command = webdriver.CommandName.CLEAR_LOCAL_STORAGE;
+    command = webdriver.CommandName.CLEAR_SESSION_STORAGE;
+    command = webdriver.CommandName.CLICK;
+    command = webdriver.CommandName.CLICK_ELEMENT;
+    command = webdriver.CommandName.CLOSE;
+    command = webdriver.CommandName.DELETE_ALL_COOKIES;
+    command = webdriver.CommandName.DELETE_COOKIE;
+    command = webdriver.CommandName.DESCRIBE_SESSION;
+    command = webdriver.CommandName.DISMISS_ALERT;
+    command = webdriver.CommandName.DOUBLE_CLICK;
+    command = webdriver.CommandName.ELEMENT_EQUALS;
+    command = webdriver.CommandName.EXECUTE_ASYNC_SCRIPT;
+    command = webdriver.CommandName.EXECUTE_SCRIPT;
+    command = webdriver.CommandName.EXECUTE_SQL;
+    command = webdriver.CommandName.FIND_CHILD_ELEMENT;
+    command = webdriver.CommandName.FIND_CHILD_ELEMENTS;
+    command = webdriver.CommandName.FIND_ELEMENT;
+    command = webdriver.CommandName.FIND_ELEMENTS;
+    command = webdriver.CommandName.GET;
+    command = webdriver.CommandName.GET_ACTIVE_ELEMENT;
+    command = webdriver.CommandName.GET_ALERT_TEXT;
+    command = webdriver.CommandName.GET_ALL_COOKIES;
+    command = webdriver.CommandName.GET_APP_CACHE;
+    command = webdriver.CommandName.GET_APP_CACHE_STATUS;
+    command = webdriver.CommandName.GET_AVAILABLE_LOG_TYPES;
+    command = webdriver.CommandName.GET_COOKIE;
+    command = webdriver.CommandName.GET_CURRENT_URL;
+    command = webdriver.CommandName.GET_CURRENT_WINDOW_HANDLE;
+    command = webdriver.CommandName.GET_ELEMENT_ATTRIBUTE;
+    command = webdriver.CommandName.GET_ELEMENT_LOCATION;
+    command = webdriver.CommandName.GET_ELEMENT_LOCATION_IN_VIEW;
+    command = webdriver.CommandName.GET_ELEMENT_SIZE;
+    command = webdriver.CommandName.GET_ELEMENT_TAG_NAME;
+    command = webdriver.CommandName.GET_ELEMENT_TEXT;
+    command = webdriver.CommandName.GET_ELEMENT_VALUE_OF_CSS_PROPERTY;
+    command = webdriver.CommandName.GET_LOCAL_STORAGE_ITEM;
+    command = webdriver.CommandName.GET_LOCAL_STORAGE_KEYS;
+    command = webdriver.CommandName.GET_LOCAL_STORAGE_SIZE;
+    command = webdriver.CommandName.GET_LOCATION;
+    command = webdriver.CommandName.GET_LOG;
+    command = webdriver.CommandName.GET_PAGE_SOURCE;
+    command = webdriver.CommandName.GET_SCREEN_ORIENTATION;
+    command = webdriver.CommandName.GET_SERVER_STATUS;
+    command = webdriver.CommandName.GET_SESSION_LOGS;
+    command = webdriver.CommandName.GET_SESSION_STORAGE_ITEM;
+    command = webdriver.CommandName.GET_SESSION_STORAGE_KEYS;
+    command = webdriver.CommandName.GET_SESSION_STORAGE_SIZE;
+    command = webdriver.CommandName.GET_SESSIONS;
+    command = webdriver.CommandName.GET_TITLE;
+    command = webdriver.CommandName.GET_WINDOW_HANDLES;
+    command = webdriver.CommandName.GET_WINDOW_POSITION;
+    command = webdriver.CommandName.GET_WINDOW_SIZE;
+    command = webdriver.CommandName.GO_BACK;
+    command = webdriver.CommandName.GO_FORWARD;
+    command = webdriver.CommandName.IMPLICITLY_WAIT;
+    command = webdriver.CommandName.IS_BROWSER_ONLINE;
+    command = webdriver.CommandName.IS_ELEMENT_DISPLAYED;
+    command = webdriver.CommandName.IS_ELEMENT_ENABLED;
+    command = webdriver.CommandName.IS_ELEMENT_SELECTED;
+    command = webdriver.CommandName.MAXIMIZE_WINDOW;
+    command = webdriver.CommandName.MOUSE_DOWN;
+    command = webdriver.CommandName.MOUSE_UP;
+    command = webdriver.CommandName.MOVE_TO;
+    command = webdriver.CommandName.NEW_SESSION;
+    command = webdriver.CommandName.QUIT;
+    command = webdriver.CommandName.REFRESH;
+    command = webdriver.CommandName.REMOVE_LOCAL_STORAGE_ITEM;
+    command = webdriver.CommandName.REMOVE_SESSION_STORAGE_ITEM;
+    command = webdriver.CommandName.SCREENSHOT;
+    command = webdriver.CommandName.SEND_KEYS_TO_ACTIVE_ELEMENT;
+    command = webdriver.CommandName.SEND_KEYS_TO_ELEMENT;
+    command = webdriver.CommandName.SET_ALERT_TEXT;
+    command = webdriver.CommandName.SET_BROWSER_ONLINE;
+    command = webdriver.CommandName.SET_LOCAL_STORAGE_ITEM;
+    command = webdriver.CommandName.SET_LOCATION;
+    command = webdriver.CommandName.SET_SCREEN_ORIENTATION;
+    command = webdriver.CommandName.SET_SCRIPT_TIMEOUT;
+    command = webdriver.CommandName.SET_SESSION_STORAGE_ITEM;
+    command = webdriver.CommandName.SET_TIMEOUT;
+    command = webdriver.CommandName.SET_WINDOW_POSITION;
+    command = webdriver.CommandName.SET_WINDOW_SIZE;
+    command = webdriver.CommandName.SUBMIT_ELEMENT;
+    command = webdriver.CommandName.SWITCH_TO_FRAME;
+    command = webdriver.CommandName.SWITCH_TO_WINDOW;
+    command = webdriver.CommandName.TOUCH_DOUBLE_TAP;
+    command = webdriver.CommandName.TOUCH_DOWN;
+    command = webdriver.CommandName.TOUCH_FLICK;
+    command = webdriver.CommandName.TOUCH_LONG_PRESS;
+    command = webdriver.CommandName.TOUCH_MOVE;
+    command = webdriver.CommandName.TOUCH_SCROLL;
+    command = webdriver.CommandName.TOUCH_SINGLE_TAP;
+    command = webdriver.CommandName.TOUCH_UP;
+}
+
+function TestEventEmitter() {
+    var emitter: webdriver.EventEmitter = new webdriver.EventEmitter();
+
+    var callback = function (a: number, b: number, c: number) {};
+
+    emitter = emitter.addListener('ABC', callback);
+    emitter = emitter.addListener('ABC', callback, this);
+
+    emitter.emit('ABC', 1, 2, 3);
+
+    var listeners = emitter.listeners('ABC');
+    if (listeners[0].oneshot) {
+        listeners[0].fn.apply(listeners[0].scope);
+    }
+    var length: number = listeners.length;
+    var listenerInfo = listeners[0];
+    if (listenerInfo.oneshot) {
+        listenerInfo.fn.apply(listenerInfo.scope, [1, 2, 3]);
+    }
+
+    emitter = emitter.on('ABC', callback);
+    emitter = emitter.on('ABC', callback, this);
+
+    emitter = emitter.once('ABC', callback);
+    emitter = emitter.once('ABC', callback, this);
+
+    emitter = emitter.removeListener('ABC', callback);
+
+    emitter.removeAllListeners('ABC');
+    emitter.removeAllListeners();
+}
+
+function TestKey() {
+    var key: webdriver.Key;
+
+    key = webdriver.Key.ADD;
+    key = webdriver.Key.ALT;
+    key = webdriver.Key.ARROW_DOWN;
+    key = webdriver.Key.ARROW_LEFT;
+    key = webdriver.Key.ARROW_RIGHT;
+    key = webdriver.Key.ARROW_UP;
+    key = webdriver.Key.BACK_SPACE;
+    key = webdriver.Key.CANCEL;
+    key = webdriver.Key.CLEAR;
+    key = webdriver.Key.COMMAND;
+    key = webdriver.Key.CONTROL;
+    key = webdriver.Key.DECIMAL;
+    key = webdriver.Key.DELETE;
+    key = webdriver.Key.DIVIDE;
+    key = webdriver.Key.DOWN;
+    key = webdriver.Key.END;
+    key = webdriver.Key.ENTER;
+    key = webdriver.Key.EQUALS;
+    key = webdriver.Key.ESCAPE;
+    key = webdriver.Key.F1;
+    key = webdriver.Key.F2;
+    key = webdriver.Key.F3;
+    key = webdriver.Key.F4;
+    key = webdriver.Key.F5;
+    key = webdriver.Key.F6;
+    key = webdriver.Key.F7;
+    key = webdriver.Key.F8;
+    key = webdriver.Key.F9;
+    key = webdriver.Key.F10;
+    key = webdriver.Key.F11;
+    key = webdriver.Key.F12;
+    key = webdriver.Key.HELP;
+    key = webdriver.Key.HOME;
+    key = webdriver.Key.INSERT;
+    key = webdriver.Key.LEFT;
+    key = webdriver.Key.META;
+    key = webdriver.Key.MULTIPLY;
+    key = webdriver.Key.NULL;
+    key = webdriver.Key.NUMPAD0;
+    key = webdriver.Key.NUMPAD1;
+    key = webdriver.Key.NUMPAD2;
+    key = webdriver.Key.NUMPAD3;
+    key = webdriver.Key.NUMPAD4;
+    key = webdriver.Key.NUMPAD5;
+    key = webdriver.Key.NUMPAD6;
+    key = webdriver.Key.NUMPAD7;
+    key = webdriver.Key.NUMPAD8;
+    key = webdriver.Key.NUMPAD9;
+    key = webdriver.Key.PAGE_DOWN;
+    key = webdriver.Key.PAGE_UP;
+    key = webdriver.Key.PAUSE;
+    key = webdriver.Key.RETURN;
+    key = webdriver.Key.RIGHT;
+    key = webdriver.Key.SEMICOLON;
+    key = webdriver.Key.SEPARATOR;
+    key = webdriver.Key.SHIFT;
+    key = webdriver.Key.SPACE;
+    key = webdriver.Key.SUBTRACT;
+    key = webdriver.Key.TAB;
+    key = webdriver.Key.UP;
+}
+
+function TestBy() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var locator: webdriver.By = new webdriver.By('class name', 'class');
+
+    var str: string = locator.toString();
+
+    locator = webdriver.By.className('class');
+    locator = webdriver.By.css('css');
+    locator = webdriver.By.id('id');
+    locator = webdriver.By.linkText('link');
+    locator = webdriver.By.name('name');
+    locator = webdriver.By.partialLinkText('text');
+    locator = webdriver.By.tagName('tag');
+    locator = webdriver.By.xpath('xpath');
+
+    // Can import "By" without import declarations
+    var By = webdriver.By;
+
+    var locatorHash: webdriver.ByHash;
+    locatorHash = { className: 'class' };
+    locatorHash = { css: 'css' };
+    locatorHash = { id: 'id' };
+    locatorHash = { linkText: 'link' };
+    locatorHash = { name: 'name' };
+    locatorHash = { partialLinkText: 'text' };
+    locatorHash = { tagName: 'tag' };
+    locatorHash = { xpath: 'xpath' };
+
+    webdriver.By.js('script', 1, 2, 3)(driver).then(function (abc: number) { });
+}
+
+function TestSession() {
+    var session: webdriver.Session = new webdriver.Session('ABC', webdriver.Capabilities.android());
+    var capabilitiesObj: any = {};
+    capabilitiesObj[webdriver.Capability.BROWSER_NAME] = webdriver.Browser.ANDROID;
+    capabilitiesObj[webdriver.Capability.PLATFORM] = 'ANDROID';
+    session = new webdriver.Session('ABC', capabilitiesObj);
+
+    var capabilities: webdriver.Capabilities = session.getCapabilities();
+    var capability: any = session.getCapability(webdriver.Capability.BROWSER_NAME);
+    var id: string = session.getId();
+    var data: string = session.toJSON();
+}
+
+function TestUnhandledAlertError() {
+    var someFunc = function (error: webdriver.UnhandledAlertError) {
+        var baseError: Error = error;
+        var str: string = error.getAlertText();
+        str = error.toString();
+    }
+}
+
+function TestWebDriverFileDetector() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
+
+    fileDetector.handleFile(driver, 'path/to/file').then(function(path: string) {});
+}
+
+function TestWebDriverLogs() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var logs: webdriver.Logs = new webdriver.Logs(driver);
+
+    logs.get(webdriver.logging.Type.BROWSER).then(function (entries: webdriver.logging.Entry[]) { });;
+    logs.getAvailableLogTypes().then(function (types: string[]) { });
+}
+
+function TestWebDriverNavigation() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var navigation: webdriver.Navigation = new webdriver.Navigation(driver);
+
+    navigation.back().then(function () { });
+    navigation.forward().then(function () { });
+    navigation.refresh().then(function () { });
+    navigation.to('http://google.com').then(function () { });
+}
+
+function TestWebDriverOptions() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var options: webdriver.Options = new webdriver.Options(driver);
+    var promise: webdriver.promise.Promise<void>;
+
+    // Add Cookie
+    promise = options.addCookie('name', 'value');
+    promise = options.addCookie('name', 'value', 'path');
+    promise = options.addCookie('name', 'value', 'path', 'domain');
+    promise = options.addCookie('name', 'value', 'path', 'domain', true);
+    promise = options.addCookie('name', 'value', 'path', 'domain', true, 123);
+    promise = options.addCookie('name', 'value', 'path', 'domain', true, Date.now());
+
+    promise = options.deleteAllCookies();
+    promise = options.deleteCookie('name');
+    options.getCookie('name').then(function (cookies: webdriver.IWebDriverOptionsCookie) { });
+    options.getCookies().then(function (cookies: webdriver.IWebDriverOptionsCookie[]) { });
+
+    var logs: webdriver.Logs = options.logs();
+    var timeouts: webdriver.Timeouts = options.timeouts();
+    var window: webdriver.Window = options.window();
+}
+
+function TestWebDriverTargetLocator() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var locator: webdriver.TargetLocator = new webdriver.TargetLocator(driver);
+    var promise: webdriver.promise.Promise<void>;
+
+    var element: webdriver.WebElement = locator.activeElement();
+    var alert: webdriver.Alert = locator.alert();
+    promise = locator.defaultContent();
+    promise = locator.frame(1);
+    promise = locator.window('nameOrHandle');
+}
+
+function TestWebDriverTimeouts() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var timeouts: webdriver.Timeouts = new webdriver.Timeouts(driver);
+    var promise: webdriver.promise.Promise<void>;
+
+    promise = timeouts.implicitlyWait(123);
+    promise = timeouts.pageLoadTimeout(123);
+    promise = timeouts.setScriptTimeout(123);
+}
+
+function TestWebDriverWindow() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var window: webdriver.Window = new webdriver.Window(driver);
+    var locationPromise: webdriver.promise.Promise<webdriver.ILocation>;
+    var sizePromise: webdriver.promise.Promise<webdriver.ISize>;
+    var voidPromise: webdriver.promise.Promise<void>;
+
+    locationPromise = window.getPosition();
+    sizePromise = window.getSize();
+    voidPromise = window.maximize();
+    voidPromise = window.setPosition(12, 34);
+    voidPromise = window.setSize(12, 34);
+}
+
+function TestWebDriver() {
+    var session: webdriver.Session = new webdriver.Session('ABC', webdriver.Capabilities.android());
+    var sessionPromise: webdriver.promise.Promise<webdriver.Session>;
+    var executor: webdriver.Executor = executors.createExecutor("http://someserver");
+    var flow: webdriver.promise.ControlFlow = new webdriver.promise.ControlFlow();
+    var driver: webdriver.WebDriver = new webdriver.WebDriver(session, executor);
+    driver = new webdriver.WebDriver(session, executor, flow);
+    driver = new webdriver.WebDriver(sessionPromise, executor);
+    driver = new webdriver.WebDriver(sessionPromise, executor, flow);
+
+    var voidPromise: webdriver.promise.Promise<void>;
+    var stringPromise: webdriver.promise.Promise<string>;
+    var booleanPromise: webdriver.promise.Promise<boolean>;
+
+    var actions: webdriver.ActionSequence = driver.actions();
+    var touchActions: webdriver.TouchSequence = driver.touchActions();
+
+    // call
+    stringPromise = driver.call<string>(function(){ return 'value'; });
+    stringPromise = driver.call<string>(function(){ return stringPromise; });
+    stringPromise = driver.call<string>(function(){ var d: any = this; return 'value'; }, driver);
+    stringPromise = driver.call<string>(function(a: number){ return 'value'; }, driver, 1);
+
+    voidPromise = driver.close();
+    flow = driver.controlFlow();
+
+    // executeAsyncScript
+    stringPromise = driver.executeAsyncScript<string>('function(){}');
+    stringPromise = driver.executeAsyncScript<string>('function(){}', 1, 2, 3);
+    stringPromise = driver.executeAsyncScript<string>(function(){});
+    stringPromise = driver.executeAsyncScript<string>(function(a: number){}, 1);
+
+    // executeScript
+    stringPromise = driver.executeScript<string>('function(){}');
+    stringPromise = driver.executeScript<string>('function(){}', 1, 2, 3);
+    stringPromise = driver.executeScript<string>(function(){});
+    stringPromise = driver.executeScript<string>(function(a: number){}, 1);
+
+    // findElement
+    var element: webdriver.WebElement;
+    element = driver.findElement(webdriver.By.id('ABC'));
+    element = driver.findElement(webdriver.By.js('function(){}'));
+
+    // findElements
+    driver.findElements(webdriver.By.className('ABC')).then(function (elements: webdriver.WebElement[]) { });
+    driver.findElements(webdriver.By.js('function(){}')).then(function (elements: webdriver.WebElement[]) { });
+
+    voidPromise = driver.get('http://www.google.com');
+    driver.getAllWindowHandles().then(function (handles: string[]) { });
+    driver.getCapabilities().then(function (caps: webdriver.Capabilities) { });
+    stringPromise = driver.getCurrentUrl();
+    stringPromise = driver.getPageSource()
+    driver.getSession().then(function (session: webdriver.Session) { });;
+    stringPromise = driver.getTitle();
+    stringPromise = driver.getWindowHandle();
+
+    booleanPromise = driver.isElementPresent(webdriver.By.className('ABC'));
+    booleanPromise = driver.isElementPresent(webdriver.By.js('function(){}'));
+
+    var options: webdriver.Options = driver.manage();
+    var navigation: webdriver.Navigation = driver.navigate();
+    var locator: webdriver.TargetLocator = driver.switchTo();
+
+    var fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
+    driver.setFileDetector(fileDetector);
+
+    voidPromise = driver.quit();
+    voidPromise = driver.schedule<void>(new webdriver.Command(webdriver.CommandName.CLICK), 'ABC');
+    voidPromise = driver.sleep(123);
+    stringPromise = driver.takeScreenshot();
+
+    var booleanCondition: webdriver.until.Condition<boolean>;
+    booleanPromise = driver.wait(booleanPromise);
+    booleanPromise = driver.wait(booleanCondition);
+    booleanPromise = driver.wait(function(driver: webdriver.WebDriver) { return true; });
+    booleanPromise = driver.wait(booleanPromise, 123);
+    booleanPromise = driver.wait(booleanPromise, 123, 'Message');
+
+    driver = webdriver.WebDriver.attachToSession(executor, 'ABC');
+    driver = webdriver.WebDriver.createSession(executor, webdriver.Capabilities.android());
+}
+
+function TestSerializable() {
+    var serializable: webdriver.Serializable<string>;
+    var serial: string|webdriver.promise.IThenable<string> = serializable.serialize();
+}
+
+function TestWebElement() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var promise: webdriver.promise.Promise<string>;
+    var element: webdriver.WebElement;
+
+    element = new webdriver.WebElement(driver, 'elementId');
+    element = new webdriver.WebElement(driver, promise);
+
+    var voidPromise: webdriver.promise.Promise<void>;
+    var stringPromise: webdriver.promise.Promise<string>;
+    var booleanPromise: webdriver.promise.Promise<boolean>;
+
+    voidPromise = element.clear();
+    voidPromise = element.click();
+
+    element = element.findElement(webdriver.By.id('ABC'));
+    element.findElements(webdriver.By.className('ABC')).then(function (elements: webdriver.WebElement[]) { });
+    booleanPromise = element.isElementPresent(webdriver.By.className('ABC'));
+
+    stringPromise = element.getAttribute('class');
+    stringPromise = element.getCssValue('display');
+    driver = element.getDriver();
+    stringPromise = element.getInnerHtml();
+    element.getLocation().then(function (location: webdriver.ILocation) { });
+    stringPromise = element.getOuterHtml();
+    element.getSize().then(function (size: webdriver.ISize) { });
+    stringPromise = element.getTagName();
+    stringPromise = element.getText();
+    booleanPromise = element.isDisplayed();
+    booleanPromise = element.isEnabled();
+    booleanPromise = element.isSelected();
+    voidPromise = element.sendKeys('A', 'B', 'C');
+    voidPromise = element.sendKeys(stringPromise, stringPromise, stringPromise);
+    voidPromise = element.submit();
+    element.getId().then(function (id: string) { });
+    element.getRawId().then(function (id: string) { });
+    element.serialize().then(function (id: webdriver.IWebElementId) { });
+
+    booleanPromise = webdriver.WebElement.equals(element, new webdriver.WebElement(driver, 'elementId'));
+}
+
+function TestWebElementPromise() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var elementPromise: webdriver.WebElementPromise = driver.findElement(webdriver.By.id('id'));
+
+    elementPromise.cancel();
+    elementPromise.cancel('reason');
+
+    var bool: boolean = elementPromise.isPending();
+
+    elementPromise.then();
+    elementPromise.then(function (element: webdriver.WebElement) { });
+    elementPromise.then(function (element: webdriver.WebElement) { }, function (error: any) { });
+    elementPromise.then(function (element: webdriver.WebElement) { return "foo"; }, function (error: any) { }).then(function (result: string) { });
+
+    elementPromise.thenCatch(function (error: any) { }).then(function (value: any) { });
+
+    elementPromise.thenFinally(function () { });
+}
+
+function TestLogging() {
+    var preferences: webdriver.logging.Preferences = new webdriver.logging.Preferences();
+    preferences.setLevel(webdriver.logging.Type.BROWSER, webdriver.logging.Level.ALL);
+    var prefs: any = preferences.toJSON();
+
+    var level: webdriver.logging.Level = webdriver.logging.getLevel('OFF');
+    level = webdriver.logging.getLevel(1);
+
+    level = webdriver.logging.Level.ALL;
+    level = webdriver.logging.Level.DEBUG;
+    level = webdriver.logging.Level.INFO;
+    level = webdriver.logging.Level.OFF;
+    level = webdriver.logging.Level.SEVERE;
+    level = webdriver.logging.Level.WARNING;
+
+    var name: string = level.name();
+    var value: number = level.value();
+
+    var type: webdriver.logging.Type;
+    type = webdriver.logging.Type.BROWSER;
+    type = webdriver.logging.Type.CLIENT;
+    type = webdriver.logging.Type.DRIVER;
+    type = webdriver.logging.Type.PERFORMANCE;
+    type = webdriver.logging.Type.SERVER;
+}
+
+function TestLoggingEntry() {
+    var entry: webdriver.logging.Entry;
+
+    entry = new webdriver.logging.Entry(webdriver.logging.Level.ALL, 'ABC');
+    entry = new webdriver.logging.Entry('ALL', 'ABC');
+    entry = new webdriver.logging.Entry(webdriver.logging.Level.ALL, 'ABC', 123);
+    entry = new webdriver.logging.Entry('ALL', 'ABC', 123);
+    entry = new webdriver.logging.Entry(webdriver.logging.Level.ALL, 'ABC', 123, webdriver.logging.Type.BROWSER);
+    entry = new webdriver.logging.Entry('ALL', 'ABC', 123, webdriver.logging.Type.BROWSER);
+
+    var entryObj: any = entry.toJSON();
+
+    var message: string = entry.message;
+    var timestamp: number = entry.timestamp;
+    var type: string = entry.type;
+}
+
+function TestPromiseModule() {
+    var cancellationError: webdriver.promise.CancellationError = new webdriver.promise.CancellationError();
+    cancellationError = new webdriver.promise.CancellationError("message");
+    var str: string = cancellationError.message;
+    str = cancellationError.name;
+
+    var stringPromise: webdriver.promise.Promise<string>;
+    var numberPromise: webdriver.promise.Promise<number>;
+    var booleanPromise: webdriver.promise.Promise<boolean>;
+    var voidPromise: webdriver.promise.Promise<void>;
+
+    webdriver.promise.all([stringPromise]).then(function (values: string[]) { });
+
+    webdriver.promise.asap('abc', function(value: any){ return true; });
+    webdriver.promise.asap('abc', function(value: any){}, function(err: any) { return 'ABC'; });
+
+    stringPromise = webdriver.promise.checkedNodeCall<string>(function(err: any, value: any) { return 'abc'; });
+
+    webdriver.promise.consume(function () {
+        return 5;
+    }).then(function (value: number) { });
+    webdriver.promise.consume(function () {
+        return 5;
+    }, this).then(function (value: number) { });
+    webdriver.promise.consume(function (a: number, b: number, c: number) {
+        return 5;
+    }, this, 1, 2, 3).then(function (value: number) { });
+
+    var numbersPromise: webdriver.promise.Promise<number[]> = webdriver.promise.filter([1, 2, 3], function (element: number, type: any, index: number, arr: number[]) {
+        return true;
+    });
+    numbersPromise = webdriver.promise.filter([1, 2, 3], function (element: number, type: any, index: number, arr: number[]) {
+        return true;
+    }, this);
+    numbersPromise = webdriver.promise.filter(numbersPromise, function (element: number, type: any, index: number, arr: number[]) {
+        return true;
+    });
+    numbersPromise = webdriver.promise.filter(numbersPromise, function (element: number, type: any, index: number, arr: number[]) {
+        return true;
+    }, this);
+
+    numbersPromise = webdriver.promise.map([1, 2, 3], function (el: number, type: any, index: number, arr: number[]) {
+        return true;
+    });
+    numbersPromise = webdriver.promise.map([1, 2, 3], function (el: number, type: any, index: number, arr: number[]) {
+        return true;
+    }, this);
+    numbersPromise = webdriver.promise.map(numbersPromise, function (el: number, type: any, index: number, arr: number[]) {
+        return true;
+    });
+    numbersPromise = webdriver.promise.map(numbersPromise, function (el: number, type: any, index: number, arr: number[]) {
+        return true;
+    }, this);
+
+    var flow: webdriver.promise.ControlFlow = webdriver.promise.controlFlow();
+
+    stringPromise = webdriver.promise.createFlow<string>(function(newFlow: webdriver.promise.ControlFlow) { return 'ABC' });
+
+    var deferred: webdriver.promise.Deferred<string>;
+    deferred = webdriver.promise.defer();
+    deferred = webdriver.promise.defer();
+
+    stringPromise = deferred.promise;
+
+    deferred.fulfill('ABC');
+    deferred.reject('error');
+
+    voidPromise = webdriver.promise.delayed(123);
+
+    voidPromise = webdriver.promise.fulfilled<void>();
+    stringPromise = webdriver.promise.fulfilled('abc');
+
+    stringPromise = webdriver.promise.fullyResolved('abc');
+
+    var bool: boolean = webdriver.promise.isGenerator(function () { });
+    var isPromise: boolean = webdriver.promise.isPromise('ABC');
+
+    stringPromise = webdriver.promise.rejected('{a: 123}');
+
+    webdriver.promise.setDefaultFlow(new webdriver.promise.ControlFlow());
+
+    numberPromise = webdriver.promise.when('abc', function(value: any) { return 123; }, function(err: Error) { return 123; });
+}
+
+function TestUntilModule() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var conditionB: webdriver.until.Condition<boolean> = new webdriver.until.Condition<boolean>('message', function (driver: webdriver.WebDriver) { return true; });
+    var conditionBBase: webdriver.until.Condition<boolean> = conditionB;
+    var conditionWebElement: webdriver.until.Condition<webdriver.WebElement>;
+    var conditionWebElements: webdriver.until.Condition<webdriver.WebElement[]>;
+
+    conditionB = webdriver.until.ableToSwitchToFrame(5);
+    var conditionAlert: webdriver.until.Condition<webdriver.Alert> = webdriver.until.alertIsPresent();
+    var el: webdriver.WebElement = driver.findElement(webdriver.By.id('id'));
+    conditionB = webdriver.until.elementIsDisabled(el);
+    conditionB = webdriver.until.elementIsEnabled(el);
+    conditionB = webdriver.until.elementIsNotSelected(el);
+    conditionB = webdriver.until.elementIsNotVisible(el);
+    conditionB = webdriver.until.elementIsSelected(el);
+    conditionB = webdriver.until.elementIsVisible(el);
+    conditionB = webdriver.until.elementTextContains(el, 'text');
+    conditionB = webdriver.until.elementTextIs(el, 'text');
+    conditionB = webdriver.until.elementTextMatches(el, /text/);
+    conditionB = webdriver.until.stalenessOf(el);
+    conditionB = webdriver.until.titleContains('text');
+    conditionB = webdriver.until.titleIs('text');
+    conditionB = webdriver.until.titleMatches(/text/);
+
+    conditionWebElement = webdriver.until.elementLocated(webdriver.By.id('id'));
+    conditionWebElements = webdriver.until.elementsLocated(webdriver.By.className('class'));
+}
+
+function TestControlFlow() {
+    var flow: webdriver.promise.ControlFlow;
+    flow = new webdriver.promise.ControlFlow();
+
+    var emitter: webdriver.EventEmitter = flow;
+
+    var eventType: string;
+
+    eventType = webdriver.promise.ControlFlow.EventType.IDLE;
+    eventType = webdriver.promise.ControlFlow.EventType.RESET;
+    eventType = webdriver.promise.ControlFlow.EventType.SCHEDULE_TASK;
+    eventType = webdriver.promise.ControlFlow.EventType.UNCAUGHT_EXCEPTION;
+
+    var stringPromise: webdriver.promise.Promise<string>;
+    stringPromise = flow.execute(function() { return 'value'; });
+    stringPromise = flow.execute(function() { return stringPromise; });
+    stringPromise = flow.execute(function() { return stringPromise; }, 'Description');
+
+    var schedule: string;
+    schedule = flow.toString();
+    schedule = flow.getSchedule();
+    schedule = flow.getSchedule(true);
+
+    flow.reset();
+
+    var voidPromise: webdriver.promise.Promise<void> = flow.timeout(123);
+    voidPromise = flow.timeout(123, 'Description');
+
+    stringPromise = flow.wait(stringPromise);
+
+    voidPromise = flow.wait<void>(function() { return true; });
+    voidPromise = flow.wait<void>(function() { return true; }, 123);
+    voidPromise = flow.wait<void>(function() { return stringPromise; }, 123, 'Timeout Message');
+}
+
+function TestDeferred() {
+    var deferred: webdriver.promise.Deferred<string>;
+
+    deferred = new webdriver.promise.Deferred<string>();
+    deferred = new webdriver.promise.Deferred<string>(new webdriver.promise.ControlFlow());
+
+    var promise: webdriver.promise.Promise<string> = deferred.promise;
+
+    deferred.errback(new Error('Error'));
+    deferred.errback('Error');
+    deferred.fulfill('abc');
+    deferred.reject(new Error('Error'));
+    deferred.reject('Error');
+    deferred.removeAll();
+}
+
+function TestPromiseClass() {
+    var controlFlow: webdriver.promise.ControlFlow;
+    var promise: webdriver.promise.Promise<string>;
+    promise = new webdriver.promise.Promise<string>(function(
+          onFulfilled: (value: string)=>void,
+          onRejected: ()=>void) { });
+    promise = new webdriver.promise.Promise<string>(function(
+          onFulfilled: (value: webdriver.promise.Promise<string>)=>void,
+          onRejected: ()=>void) { });
+    promise = new webdriver.promise.Promise<string>(function(
+          onFulfilled: (value: string)=>void,
+          onRejected: ()=>void) { }, controlFlow);
+
+    promise.cancel('Abort');
+
+    var isPending: boolean = promise.isPending();
+
+    promise = promise.then();
+    promise = promise.then(function( a: string ) { return 'cde'; });
+    promise = promise.then(function( a: string ) { return 'cde'; }, function( e: any) {});
+    promise = promise.then(function( a: string ) { return 'cde'; }, function (e: any) { return 123; });
+
+    promise = promise.thenCatch(function (error: any) { });
+
+    promise.thenFinally(function () { });
+}
+
+function TestThenableClass() {
+    var thenable: webdriver.promise.Promise<string> = new webdriver.promise.Promise<string>();
+
+    thenable.cancel('Abort');
+
+    var isPending: boolean = thenable.isPending();
+
+    thenable = thenable.then(function (a: string) { return 'cde'; });
+    thenable = thenable.then(function (a: string) { return 'cde'; }, function (e: any) { });
+    thenable = thenable.then(function (a: string) { return 'cde'; }, function (e: any) { return 123; });
+
+    thenable = thenable.thenCatch(function (error: any) { });
+
+    thenable.thenFinally(function () { });
+}
+
+function TestErrorCode() {
+    var errorCode: number;
+
+    errorCode = new webdriver.error.ElementNotSelectableError().code();
+    errorCode = new webdriver.error.ElementNotVisibleError().code();
+    errorCode = new webdriver.error.InvalidArgumentError().code();
+    errorCode = new webdriver.error.InvalidCookieDomainError().code();
+    errorCode = new webdriver.error.InvalidElementCoordinatesError().code();
+    errorCode = new webdriver.error.InvalidElementStateError().code();
+    errorCode = new webdriver.error.InvalidSelectorError().code();
+    errorCode = new webdriver.error.NoSuchSessionError().code();
+    errorCode = new webdriver.error.JavascriptError().code();
+    errorCode = new webdriver.error.MoveTargetOutOfBoundsError().code();
+    errorCode = new webdriver.error.NoSuchAlertError().code();
+    errorCode = new webdriver.error.NoSuchElementError().code();
+    errorCode = new webdriver.error.NoSuchFrameError().code();
+    errorCode = new webdriver.error.NoSuchWindowError().code();
+    errorCode = new webdriver.error.ScriptTimeoutError().code();
+    errorCode = new webdriver.error.SessionNotCreatedError().code();
+    errorCode = new webdriver.error.StaleElementReferenceError().code();
+    errorCode = new webdriver.error.TimeoutError().code();
+    errorCode = new webdriver.error.UnableToSetCookieError().code();
+    errorCode = new webdriver.error.UnableToCaptureScreenError().code();
+    errorCode = new webdriver.error.UnexpectedAlertOpenError().code();
+    errorCode = new webdriver.error.UnknownCommandError().code();
+    errorCode = new webdriver.error.UnknownMethodError().code();
+    errorCode = new webdriver.error.UnsupportedOperationError().code();
+}
+
+function TestTestingModule() {
+    testing.before(function () {
+    });
+
+    testing.beforeEach(function () {
+    });
+
+    testing.describe("My test suite", function () {
+        testing.it("My test", function () {
+        });
+
+        testing.iit("My exclusive test.", function () {
+        });
+
+    });
+
+    testing.xdescribe("My disabled suite", function () {
+        testing.xit("My disabled test.", function () {
+        });
+    });
+
+    testing.after(function () {
+    });
+
+    testing.afterEach(function () {
+    });
+}
diff --git a/selenium-webdriver/selenium-webdriver-2.53.1.d.ts b/selenium-webdriver/selenium-webdriver-2.53.1.d.ts
new file mode 100644
index 0000000000..a6e419755d
--- /dev/null
+++ b/selenium-webdriver/selenium-webdriver-2.53.1.d.ts
@@ -0,0 +1,6459 @@
+// Type definitions for Selenium WebDriverJS 2.53.1
+// Project: https://github.com/SeleniumHQ/selenium/tree/master/javascript/node/selenium-webdriver
+// Definitions by: Bill Armstrong <https://github.com/BillArmstrong>, Yuki Kokubun <https://github.com/Kuniwak>, Craig Nishina <https://github.com/cnishina>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace chrome {
+    /**
+     * Creates a new WebDriver client for Chrome.
+     *
+     * @extends {webdriver.WebDriver}
+     */
+    class Driver extends webdriver.WebDriver {
+        /**
+         * @param {(webdriver.Capabilities|Options)=} opt_config The configuration
+         *     options.
+         * @param {remote.DriverService=} opt_service The session to use; will use
+         *     the {@link getDefaultService default service} by default.
+         * @param {webdriver.promise.ControlFlow=} opt_flow The control flow to use, or
+         *     {@code null} to use the currently active flow.
+         * @constructor
+         */
+        constructor(opt_config?: Options|webdriver.Capabilities, opt_service?: remote.DriverService, opt_flow?: webdriver.promise.ControlFlow);
+    }
+
+    interface IOptionsValues {
+        args: string[];
+        binary?: string;
+        detach: boolean;
+        extensions: string[];
+        localState?: any;
+        logFile?: string;
+        prefs?: any;
+    }
+
+    interface IPerfLoggingPrefs {
+      enableNetwork: boolean;
+      enablePage: boolean;
+      enableTimeline: boolean;
+      tracingCategories: string;
+      bufferUsageReportingInterval: number;
+    }
+
+    /**
+     * Class for managing ChromeDriver specific options.
+     */
+    class Options {
+        /**
+         * @constructor
+         */
+        constructor();
+
+        /**
+         * Extracts the ChromeDriver specific options from the given capabilities
+         * object.
+         * @param {!webdriver.Capabilities} capabilities The capabilities object.
+         * @return {!Options} The ChromeDriver options.
+         */
+        static fromCapabilities(capabilities: webdriver.Capabilities): Options;
+
+
+        /**
+         * Add additional command line arguments to use when launching the Chrome
+         * browser.  Each argument may be specified with or without the "--" prefix
+         * (e.g. "--foo" and "foo"). Arguments with an associated value should be
+         * delimited by an "=": "foo=bar".
+         * @param {...(string|!Array.<string>)} var_args The arguments to add.
+         * @return {!Options} A self reference.
+         */
+        addArguments(...var_args: string[]): Options;
+
+
+        /**
+         * List of Chrome command line switches to exclude that ChromeDriver by default
+         * passes when starting Chrome.  Do not prefix switches with "--".
+         *
+         * @param {...(string|!Array<string>)} var_args The switches to exclude.
+         * @return {!Options} A self reference.
+         */
+        excludeSwitches(...var_args: string[]): Options;
+
+
+        /**
+         * Add additional extensions to install when launching Chrome. Each extension
+         * should be specified as the path to the packed CRX file, or a Buffer for an
+         * extension.
+         * @param {...(string|!Buffer|!Array.<(string|!Buffer)>)} var_args The
+         *     extensions to add.
+         * @return {!Options} A self reference.
+         */
+        addExtensions(...var_args: any[]): Options;
+
+
+        /**
+         * Sets the path to the Chrome binary to use. On Mac OS X, this path should
+         * reference the actual Chrome executable, not just the application binary
+         * (e.g. "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome").
+         *
+         * The binary path be absolute or relative to the chromedriver server
+         * executable, but it must exist on the machine that will launch Chrome.
+         *
+         * @param {string} path The path to the Chrome binary to use.
+         * @return {!Options} A self reference.
+         */
+        setChromeBinaryPath(path: string): Options;
+
+
+        /**
+         * Sets whether to leave the started Chrome browser running if the controlling
+         * ChromeDriver service is killed before {@link webdriver.WebDriver#quit()} is
+         * called.
+         * @param {boolean} detach Whether to leave the browser running if the
+         *     chromedriver service is killed before the session.
+         * @return {!Options} A self reference.
+         */
+        detachDriver(detach: boolean): Options;
+
+
+        /**
+         * Sets the user preferences for Chrome's user profile. See the "Preferences"
+         * file in Chrome's user data directory for examples.
+         * @param {!Object} prefs Dictionary of user preferences to use.
+         * @return {!Options} A self reference.
+         */
+        setUserPreferences(prefs: any): Options;
+
+
+        /**
+         * Sets the logging preferences for the new session.
+         * @param {!webdriver.logging.Preferences} prefs The logging preferences.
+         * @return {!Options} A self reference.
+         */
+        setLoggingPrefs(prefs: webdriver.logging.Preferences): Options;
+
+        /**
+         * Sets the performance logging preferences. Options include:
+         *
+         * - `enableNetwork`: Whether or not to collect events from Network domain.
+         * - `enablePage`: Whether or not to collect events from Page domain.
+         * - `enableTimeline`: Whether or not to collect events from Timeline domain.
+         *     Note: when tracing is enabled, Timeline domain is implicitly disabled,
+         *     unless `enableTimeline` is explicitly set to true.
+         * - `tracingCategories`: A comma-separated string of Chrome tracing categories
+         *     for which trace events should be collected. An unspecified or empty
+         *     string disables tracing.
+         * - `bufferUsageReportingInterval`: The requested number of milliseconds
+         *     between DevTools trace buffer usage events. For example, if 1000, then
+         *     once per second, DevTools will report how full the trace buffer is. If a
+         *     report indicates the buffer usage is 100%, a warning will be issued.
+         *
+         * @param {{enableNetwork: boolean,
+         *          enablePage: boolean,
+         *          enableTimeline: boolean,
+         *          tracingCategories: string,
+         *          bufferUsageReportingInterval: number}} prefs The performance
+         *     logging preferences.
+         * @return {!Options} A self reference.
+         */
+        setPerfLoggingPrefs(prefs: IPerfLoggingPrefs): Options;
+
+
+        /**
+         * Sets preferences for the "Local State" file in Chrome's user data
+         * directory.
+         * @param {!Object} state Dictionary of local state preferences.
+         * @return {!Options} A self reference.
+         */
+        setLocalState(state: any): Options;
+
+
+        /**
+         * Sets the name of the activity hosting a Chrome-based Android WebView. This
+         * option must be set to connect to an [Android WebView](
+         * https://sites.google.com/a/chromium.org/chromedriver/getting-started/getting-started---android)
+         *
+         * @param {string} name The activity name.
+         * @return {!Options} A self reference.
+         */
+        androidActivity(name: string): Options;
+
+
+        /**
+         * Sets the device serial number to connect to via ADB. If not specified, the
+         * ChromeDriver will select an unused device at random. An error will be
+         * returned if all devices already have active sessions.
+         *
+         * @param {string} serial The device serial number to connect to.
+         * @return {!Options} A self reference.
+         */
+        androidDeviceSerial(serial: string): Options;
+
+
+        /**
+         * Configures the ChromeDriver to launch Chrome on Android via adb. This
+         * function is shorthand for
+         * {@link #androidPackage options.androidPackage('com.android.chrome')}.
+         * @return {!Options} A self reference.
+         */
+        androidChrome(): Options;
+
+
+        /**
+         * Sets the package name of the Chrome or WebView app.
+         *
+         * @param {?string} pkg The package to connect to, or `null` to disable Android
+         *     and switch back to using desktop Chrome.
+         * @return {!Options} A self reference.
+         */
+        androidPackage(pkg: string): Options;
+
+
+        /**
+         * Sets the process name of the Activity hosting the WebView (as given by `ps`).
+         * If not specified, the process name is assumed to be the same as
+         * {@link #androidPackage}.
+         *
+         * @param {string} processName The main activity name.
+         * @return {!Options} A self reference.
+         */
+        androidProcess(processName: string): Options;
+
+
+        /**
+         * Sets whether to connect to an already-running instead of the specified
+         * {@linkplain #androidProcess app} instead of launching the app with a clean
+         * data directory.
+         *
+         * @param {boolean} useRunning Whether to connect to a running instance.
+         * @return {!Options} A self reference.
+         */
+        androidUseRunningApp(useRunning: boolean): Options;
+
+
+        /**
+         * Sets the path to Chrome's log file. This path should exist on the machine
+         * that will launch Chrome.
+         * @param {string} path Path to the log file to use.
+         * @return {!Options} A self reference.
+         */
+        setChromeLogFile(path: string): Options;
+
+
+        /**
+           * Sets the directory to store Chrome minidumps in. This option is only
+           * supported when ChromeDriver is running on Linux.
+           * @param {string} path The directory path.
+           * @return {!Options} A self reference.
+           */
+        setChromeMinidumpPath(path: string): Options;
+
+
+        /**
+         * Configures Chrome to emulate a mobile device. For more information, refer
+         * to the ChromeDriver project page on [mobile emulation][em]. Configuration
+         * options include:
+         *
+         * - `deviceName`: The name of a pre-configured [emulated device][devem]
+         * - `width`: screen width, in pixels
+         * - `height`: screen height, in pixels
+         * - `pixelRatio`: screen pixel ratio
+         *
+         * __Example 1: Using a Pre-configured Device__
+         *
+         *     let options = new chrome.Options().setMobileEmulation(
+         *         {deviceName: 'Google Nexus 5'});
+         *
+         *     let driver = new chrome.Driver(options);
+         *
+         * __Example 2: Using Custom Screen Configuration__
+         *
+         *     let options = new chrome.Options().setMobileEmulation({
+         *         width: 360,
+         *         height: 640,
+         *         pixelRatio: 3.0
+         *     });
+         *
+         *     let driver = new chrome.Driver(options);
+         *
+         *
+         * [em]: https://sites.google.com/a/chromium.org/chromedriver/mobile-emulation
+         * [devem]: https://developer.chrome.com/devtools/docs/device-mode
+         *
+         * @param {?({deviceName: string}|
+         *           {width: number, height: number, pixelRatio: number})} config The
+         *     mobile emulation configuration, or `null` to disable emulation.
+         * @return {!Options} A self reference.
+         */
+        setMobileEmulation(config: any): Options;
+
+        /**
+         * Sets the proxy settings for the new session.
+         * @param {webdriver.ProxyConfig} proxy The proxy configuration to use.
+         * @return {!Options} A self reference.
+         */
+        setProxy(proxy: webdriver.ProxyConfig): Options;
+
+
+        /**
+         * Converts this options instance to a {@link webdriver.Capabilities} object.
+         * @param {webdriver.Capabilities=} opt_capabilities The capabilities to merge
+         *     these options into, if any.
+         * @return {!webdriver.Capabilities} The capabilities.
+         */
+        toCapabilities(opt_capabilities?: webdriver.Capabilities): webdriver.Capabilities;
+    }
+
+    /**
+     * Creates {@link remote.DriverService} instances that manage a ChromeDriver
+     * server.
+     */
+    class ServiceBuilder {
+        /**
+         * @param {string=} opt_exe Path to the server executable to use. If omitted,
+         *     the builder will attempt to locate the chromedriver on the current
+         *     PATH.
+         * @throws {Error} If provided executable does not exist, or the chromedriver
+         *     cannot be found on the PATH.
+         * @constructor
+         */
+        constructor(opt_exe?: string);
+
+        /**
+         * Sets the port to start the ChromeDriver on.
+         * @param {number} port The port to use, or 0 for any free port.
+         * @return {!ServiceBuilder} A self reference.
+         * @throws {Error} If the port is invalid.
+         */
+        usingPort(port: number): ServiceBuilder;
+
+
+        /**
+         * Sets which port adb is listening to. _The ChromeDriver will connect to adb
+         * if an {@linkplain Options#androidPackage Android session} is requested, but
+         * adb **must** be started beforehand._
+         *
+         * @param {number} port Which port adb is running on.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        setAdbPort(port: number): ServiceBuilder;
+
+
+        /**
+         * Sets the path of the log file the driver should log to. If a log file is
+         * not specified, the driver will log to stderr.
+         * @param {string} path Path of the log file to use.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        loggingTo(path: string): ServiceBuilder;
+
+
+        /**
+         * Enables verbose logging.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        enableVerboseLogging(): ServiceBuilder;
+
+
+        /**
+         * Sets the number of threads the driver should use to manage HTTP requests.
+         * By default, the driver will use 4 threads.
+         * @param {number} n The number of threads to use.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        setNumHttpThreads(n: number): ServiceBuilder;
+
+
+        /**
+         * Sets the base path for WebDriver REST commands (e.g. "/wd/hub").
+         * By default, the driver will accept commands relative to "/".
+         * @param {string} path The base path to use.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        setUrlBasePath(path: string): ServiceBuilder;
+
+
+        /**
+         * Defines the stdio configuration for the driver service. See
+         * {@code child_process.spawn} for more information.
+         * @param {(string|!Array.<string|number|!Stream|null|undefined>)} config The
+         *     configuration to use.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        setStdio(config: string|Array<string|number|any>): ServiceBuilder;
+
+
+        /**
+         * Defines the environment to start the server under. This settings will be
+         * inherited by every browser session started by the server.
+         * @param {!Object.<string, string>} env The environment to use.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        withEnvironment(env: { [key: string]: string }): ServiceBuilder;
+
+
+        /**
+         * Creates a new DriverService using this instance's current configuration.
+         * @return {remote.DriverService} A new driver service using this instance's
+         *     current configuration.
+         * @throws {Error} If the driver exectuable was not specified and a default
+         *     could not be found on the current PATH.
+         */
+        build(): remote.DriverService;
+    }
+
+    /**
+     * Returns the default ChromeDriver service. If such a service has not been
+     * configured, one will be constructed using the default configuration for
+     * a ChromeDriver executable found on the system PATH.
+     * @return {!remote.DriverService} The default ChromeDriver service.
+     */
+    function getDefaultService(): remote.DriverService;
+
+    /**
+     * Sets the default service to use for new ChromeDriver instances.
+     * @param {!remote.DriverService} service The service to use.
+     * @throws {Error} If the default service is currently running.
+     */
+    function setDefaultService(service: remote.DriverService): void;
+}
+
+declare namespace edge {
+
+    class Driver extends webdriver.WebDriver {
+      /**
+       * @param {(capabilities.Capabilities|Options)=} opt_config The configuration
+       *     options.
+       * @param {remote.DriverService=} opt_service The session to use; will use
+       *     the {@linkplain #getDefaultService default service} by default.
+       * @param {promise.ControlFlow=} opt_flow The control flow to use, or
+       *     {@code null} to use the currently active flow.
+       */
+      constructor(opt_config?: webdriver.Capabilities|Options, opt_service?: remote.DriverService, opt_flow?: webdriver.promise.ControlFlow);
+
+      /**
+       * This function is a no-op as file detectors are not supported by this
+       * implementation.
+       * @override
+       */
+      setFileDetector(): void;
+    }
+
+    /**
+     * Class for managing MicrosoftEdgeDriver specific options.
+     */
+    class Options {
+
+      /**
+       * Extracts the MicrosoftEdgeDriver specific options from the given
+       * capabilities object.
+       * @param {!capabilities.Capabilities} caps The capabilities object.
+       * @return {!Options} The MicrosoftEdgeDriver options.
+       */
+      static fromCapabilities(cap: webdriver.Capabilities): Options;
+
+      /**
+       * Sets the proxy settings for the new session.
+       * @param {capabilities.ProxyConfig} proxy The proxy configuration to use.
+       * @return {!Options} A self reference.
+       */
+      setProxy(proxy: webdriver.ProxyConfig): Options;
+
+      /**
+       * Sets the page load strategy for Edge.
+       * Supported values are "normal", "eager", and "none";
+       *
+       * @param {string} pageLoadStrategy The page load strategy to use.
+       * @return {!Options} A self reference.
+       */
+      setPageLoadStrategy(pageLoadStrategy: string): Options;
+
+      /**
+       * Converts this options instance to a {@link capabilities.Capabilities}
+       * object.
+       * @param {capabilities.Capabilities=} opt_capabilities The capabilities to
+       *     merge these options into, if any.
+       * @return {!capabilities.Capabilities} The capabilities.
+       */
+      toCapabilities(opt_capabilities: webdriver.Capabilities): webdriver.Capabilities;
+    }
+
+    /**
+     * Creates {@link remote.DriverService} instances that manage a
+     * MicrosoftEdgeDriver server in a child process.
+     */
+    class ServiceBuilder {
+      /**
+       * @param {string=} opt_exe Path to the server executable to use. If omitted,
+       *   the builder will attempt to locate the MicrosoftEdgeDriver on the current
+       *   PATH.
+       * @throws {Error} If provided executable does not exist, or the
+       *   MicrosoftEdgeDriver cannot be found on the PATH.
+       */
+      constructor(opt_exe?: string);
+
+      /**
+       * Defines the stdio configuration for the driver service. See
+       * {@code child_process.spawn} for more information.
+       * @param {(string|!Array.<string|number|!stream.Stream|null|undefined>)}
+       *     config The configuration to use.
+       * @return {!ServiceBuilder} A self reference.
+       */
+      setStdio(config: string|Array<string|number|any>): ServiceBuilder;
+
+      /**
+       * Sets the port to start the MicrosoftEdgeDriver on.
+       * @param {number} port The port to use, or 0 for any free port.
+       * @return {!ServiceBuilder} A self reference.
+       * @throws {Error} If the port is invalid.
+       */
+      usingPort(port: number): ServiceBuilder;
+
+      /**
+       * Defines the environment to start the server under. This settings will be
+       * inherited by every browser session started by the server.
+       * @param {!Object.<string, string>} env The environment to use.
+       * @return {!ServiceBuilder} A self reference.
+       */
+      withEnvironment(env: Object): ServiceBuilder;
+
+      /**
+       * Creates a new DriverService using this instance's current configuration.
+       * @return {!remote.DriverService} A new driver service using this instance's
+       *     current configuration.
+       * @throws {Error} If the driver exectuable was not specified and a default
+       *     could not be found on the current PATH.
+       */
+      build(): remote.DriverService;
+    }
+
+    /**
+     * Returns the default MicrosoftEdgeDriver service. If such a service has
+     * not been configured, one will be constructed using the default configuration
+     * for an MicrosoftEdgeDriver executable found on the system PATH.
+     * @return {!remote.DriverService} The default MicrosoftEdgeDriver service.
+     */
+    function getDefaultService(): remote.DriverService;
+
+    /**
+     * Sets the default service to use for new MicrosoftEdgeDriver instances.
+     * @param {!remote.DriverService} service The service to use.
+     * @throws {Error} If the default service is currently running.
+     */
+    function setDefaultService(service: remote.DriverService): void;
+}
+
+declare namespace executors {
+    /**
+     * Creates a command executor that uses WebDriver's JSON wire protocol.
+     * @param {(string|!promise.Promise<string>)} url The server's URL,
+     *     or a promise that will resolve to that URL.
+     * @param {?string=} opt_proxy (optional) The URL of the HTTP proxy for the
+     *     client to use.
+     * @returns {!./lib/command.Executor} The new command executor.
+     */
+    function createExecutor(url: string|webdriver.promise.Promise<string>, opt_agent?: string, opt_proxy?: string): webdriver.Executor;
+}
+
+declare namespace firefox {
+  /**
+   * Manages a Firefox subprocess configured for use with WebDriver.
+   */
+  class Binary {
+      /**
+       * @param {string=} opt_exe Path to the Firefox binary to use. If not
+       *     specified, will attempt to locate Firefox on the current system.
+       * @constructor
+       */
+      constructor(opt_exe?: string);
+
+      /**
+       * Add arguments to the command line used to start Firefox.
+       * @param {...(string|!Array.<string>)} var_args Either the arguments to add as
+       *     varargs, or the arguments as an array.
+       */
+      addArguments(...var_args: string[]): void;
+
+
+      /**
+       * Launches Firefox and eturns a promise that will be fulfilled when the process
+       * terminates.
+       * @param {string} profile Path to the profile directory to use.
+       * @return {!promise.Promise.<!exec.Result>} A promise for the process result.
+       * @throws {Error} If this instance has already been started.
+       */
+      launch(profile: string): webdriver.promise.Promise<any>;
+
+
+      /**
+       * Kills the managed Firefox process.
+       * @return {!promise.Promise} A promise for when the process has terminated.
+       */
+      kill(): webdriver.promise.Promise<void>;
+  }
+
+  /**
+   * Models a Firefox proifle directory for use with the FirefoxDriver. The
+   * {@code Proifle} directory uses an in-memory model until {@link #writeToDisk}
+   * is called.
+   */
+  class Profile {
+      /**
+       * @param {string=} opt_dir Path to an existing Firefox profile directory to
+       *     use a template for this profile. If not specified, a blank profile will
+       *     be used.
+       * @constructor
+       */
+      constructor(opt_dir?: string);
+
+      /**
+       * Registers an extension to be included with this profile.
+       * @param {string} extension Path to the extension to include, as either an
+       *     unpacked extension directory or the path to a xpi file.
+       */
+      addExtension(extension: string): void;
+
+
+      /**
+       * Sets a desired preference for this profile.
+       * @param {string} key The preference key.
+       * @param {(string|number|boolean)} value The preference value.
+       * @throws {Error} If attempting to set a frozen preference.
+       */
+      setPreference(key: string, value: string): void;
+      setPreference(key: string, value: number): void;
+      setPreference(key: string, value: boolean): void;
+
+
+      /**
+       * Returns the currently configured value of a profile preference. This does
+       * not include any defaults defined in the profile's template directory user.js
+       * file (if a template were specified on construction).
+       * @param {string} key The desired preference.
+       * @return {(string|number|boolean|undefined)} The current value of the
+       *     requested preference.
+       */
+      getPreference(key: string): any;
+
+
+      /**
+       * @return {number} The port this profile is currently configured to use, or
+       *     0 if the port will be selected at random when the profile is written
+       *     to disk.
+       */
+      getPort(): number;
+
+
+      /**
+       * Sets the port to use for the WebDriver extension loaded by this profile.
+       * @param {number} port The desired port, or 0 to use any free port.
+       */
+      setPort(port: number): void;
+
+
+      /**
+       * @return {boolean} Whether the FirefoxDriver is configured to automatically
+       *     accept untrusted SSL certificates.
+       */
+      acceptUntrustedCerts(): boolean;
+
+
+      /**
+       * Sets whether the FirefoxDriver should automatically accept untrusted SSL
+       * certificates.
+       * @param {boolean} value .
+       */
+      setAcceptUntrustedCerts(value: boolean): void;
+
+
+      /**
+       * Sets whether to assume untrusted certificates come from untrusted issuers.
+       * @param {boolean} value .
+       */
+      setAssumeUntrustedCertIssuer(value: boolean): void;
+
+
+      /**
+       * @return {boolean} Whether to assume untrusted certs come from untrusted
+       *     issuers.
+       */
+      assumeUntrustedCertIssuer(): boolean;
+
+
+      /**
+       * Sets whether to use native events with this profile.
+       * @param {boolean} enabled .
+       */
+      setNativeEventsEnabled(enabled: boolean): void;
+
+
+      /**
+       * Returns whether native events are enabled in this profile.
+       * @return {boolean} .
+       */
+      nativeEventsEnabled(): boolean;
+
+
+      /**
+       * Writes this profile to disk.
+       * @param {boolean=} opt_excludeWebDriverExt Whether to exclude the WebDriver
+       *     extension from the generated profile. Used to reduce the size of an
+       *     {@link #encode() encoded profile} since the server will always install
+       *     the extension itself.
+       * @return {!promise.Promise.<string>} A promise for the path to the new
+       *     profile directory.
+       */
+      writeToDisk(opt_excludeWebDriverExt?: boolean): webdriver.promise.Promise<string>;
+
+
+      /**
+       * Encodes this profile as a zipped, base64 encoded directory.
+       * @return {!promise.Promise.<string>} A promise for the encoded profile.
+       */
+      encode(): webdriver.promise.Promise<string>;
+  }
+
+  /**
+   * Configuration options for the FirefoxDriver.
+   */
+  class Options {
+    /**
+     * Sets the profile to use. The profile may be specified as a
+     * {@link Profile} object or as the path to an existing Firefox profile to use
+     * as a template.
+     *
+     * @param {(string|!Profile)} profile The profile to use.
+     * @return {!Options} A self reference.
+     */
+    setProfile(profile: string|any): Options;
+
+    /**
+     * Sets the binary to use. The binary may be specified as the path to a Firefox
+     * executable, or as a {@link Binary} object.
+     *
+     * @param {(string|!Binary)} binary The binary to use.
+     * @return {!Options} A self reference.
+     */
+    setBinary(binary: string|any): Options;
+
+    /**
+     * Sets the logging preferences for the new session.
+     * @param {logging.Preferences} prefs The logging preferences.
+     * @return {!Options} A self reference.
+     */
+    setLoggingPreferences(prefs: webdriver.logging.Preferences): Options;
+
+    /**
+     * Sets the proxy to use.
+     *
+     * @param {capabilities.ProxyConfig} proxy The proxy configuration to use.
+     * @return {!Options} A self reference.
+     */
+    setProxy(proxy: webdriver.ProxyConfig): Options;
+
+    /**
+     * Sets whether to use Mozilla's Marionette to drive the browser.
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette/WebDriver
+     */
+    useMarionette(marionette: any): Options;
+
+    /**
+     * Converts these options to a {@link capabilities.Capabilities} instance.
+     *
+     * @return {!capabilities.Capabilities} A new capabilities object.
+     */
+    toCapabilities(): webdriver.Capabilities;
+  }
+
+  /**
+   * @return {string} .
+   * @throws {Error}
+   */
+  function findWires(): string;
+
+  /**
+   * @param {(string|!Binary)} binary .
+   * @return {!remote.DriverService} .
+   */
+  function createWiresService(binary: string|any): remote.DriverService;
+
+  /**
+   * @param {(Profile|string)} profile The profile to prepare.
+   * @param {number} port The port the FirefoxDriver should listen on.
+   * @return {!Promise<string>} a promise for the path to the profile directory.
+   */
+  function prepareProfile(profile: string|any, port: number): any;
+
+  /**
+   * A WebDriver client for Firefox.
+   */
+  class Driver extends webdriver.WebDriver {
+    /**
+     * @param {(Options|capabilities.Capabilities|Object)=} opt_config The
+     *    configuration options for this driver, specified as either an
+     *    {@link Options} or {@link capabilities.Capabilities}, or as a raw hash
+     *    object.
+     * @param {promise.ControlFlow=} opt_flow The flow to
+     *     schedule commands through. Defaults to the active flow object.
+     */
+    constructor(opt_config?: Options|webdriver.Capabilities|Object, opt_flow?: webdriver.promise.ControlFlow);
+
+    /**
+     * This function is a no-op as file detectors are not supported by this
+     * implementation.
+     * @override
+     */
+    setFileDetector(): void;
+  }
+}
+
+declare namespace http {
+  /**
+   * Converts a headers map to a HTTP header block string.
+   * @param {!Map<string, string>} headers The map to convert.
+   * @return {string} The headers as a string.
+   */
+  function headersToString(headers: any): string;
+
+  /**
+   * Represents a HTTP request message. This class is a "partial" request and only
+   * defines the path on the server to send a request to. It is each client's
+   * responsibility to build the full URL for the final request.
+   * @final
+   */
+  class HttpRequest {
+    /**
+     * @param {string} method The HTTP method to use for the request.
+     * @param {string} path The path on the server to send the request to.
+     * @param {Object=} opt_data This request's non-serialized JSON payload data.
+     */
+    constructor(method: string, path: string, opt_data?: Object);
+
+    /** @override */
+    toString(): string;
+  }
+
+  /**
+   * Represents a HTTP response message.
+   * @final
+   */
+  class HttpResponse {
+    /**
+     * @param {number} status The response code.
+     * @param {!Object<string>} headers The response headers. All header names
+     *     will be converted to lowercase strings for consistent lookups.
+     * @param {string} body The response body.
+     */
+    constructor(status: number, headers: Object, body: string);
+
+    /** @override */
+    toString(): string;
+  }
+
+
+  function post(path: string): any;
+  function del(path: string): any;
+  function get(path: string): any;
+  function resource(method: string, path: string): any;
+
+  /**
+   * A basic HTTP client used to send messages to a remote end.
+   */
+  class HttpClient {
+    /**
+     * @param {string} serverUrl URL for the WebDriver server to send commands to.
+     * @param {http.Agent=} opt_agent The agent to use for each request.
+     *     Defaults to `http.globalAgent`.
+     * @param {?string=} opt_proxy The proxy to use for the connection to the
+     *     server. Default is to use no proxy.
+     */
+    constructor(serverUrl: string, opt_agent?: any, opt_proxy?: string);
+
+    /**
+     * Sends a request to the server. The client will automatically follow any
+     * redirects returned by the server, fulfilling the returned promise with the
+     * final response.
+     *
+     * @param {!HttpRequest} httpRequest The request to send.
+     * @return {!promise.Promise<HttpResponse>} A promise that will be fulfilled
+     *     with the server's response.
+     */
+    send(httpRequest: HttpRequest): webdriver.promise.Promise<HttpResponse>;
+  }
+
+  /**
+   * Sends a single HTTP request.
+   * @param {!Object} options The request options.
+   * @param {function(!HttpResponse)} onOk The function to call if the
+   *     request succeeds.
+   * @param {function(!Error)} onError The function to call if the request fails.
+   * @param {?string=} opt_data The data to send with the request.
+   * @param {?string=} opt_proxy The proxy server to use for the request.
+   */
+  function sendRequest(options: Object, onOk: any, onError: any, opt_data?: string, opt_proxy?: string): any;
+
+  /**
+   * A command executor that communicates with the server using HTTP + JSON.
+   *
+   * By default, each instance of this class will use the legacy wire protocol
+   * from [Selenium project][json]. The executor will automatically switch to the
+   * [W3C wire protocol][w3c] if the remote end returns a compliant response to
+   * a new session command.
+   *
+   * [json]: https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol
+   * [w3c]: https://w3c.github.io/webdriver/webdriver-spec.html
+   *
+   * @implements {cmd.Executor}
+   */
+  class Executor {
+    /**
+     * @param {!HttpClient} client The client to use for sending requests to the
+     *     server.
+     */
+    constructor(client: HttpClient);
+
+    /**
+     * Defines a new command for use with this executor. When a command is sent,
+     * the {@code path} will be preprocessed using the command's parameters; any
+     * path segments prefixed with ":" will be replaced by the parameter of the
+     * same name. For example, given "/person/:name" and the parameters
+     * "{name: 'Bob'}", the final command path will be "/person/Bob".
+     *
+     * @param {string} name The command name.
+     * @param {string} method The HTTP method to use when sending this command.
+     * @param {string} path The path to send the command to, relative to
+     *     the WebDriver server's command root and of the form
+     *     "/path/:variable/segment".
+     */
+    defineCommand(name: string, method: string, path: string): void;
+
+    /** @override */
+    execute(command: any): any;
+  }
+
+  /**
+   * @param {string} str .
+   * @return {?} .
+   */
+  function tryParse(str: string): any;
+
+  /**
+   * Callback used to parse {@link HttpResponse} objects from a
+   * {@link HttpClient}.
+   * @param {!HttpResponse} httpResponse The HTTP response to parse.
+   * @param {boolean} w3c Whether the response should be processed using the
+   *     W3C wire protocol.
+   * @return {{value: ?}} The parsed response.
+   * @throws {WebDriverError} If the HTTP response is an error.
+   */
+  function parseHttpResponse(httpResponse: HttpResponse, w3c: boolean): any;
+
+  /**
+   * Builds a fully qualified path using the given set of command parameters. Each
+   * path segment prefixed with ':' will be replaced by the value of the
+   * corresponding parameter. All parameters spliced into the path will be
+   * removed from the parameter map.
+   * @param {string} path The original resource path.
+   * @param {!Object<*>} parameters The parameters object to splice into the path.
+   * @return {string} The modified path.
+   */
+  function buildPath(path: string, parameters: Object): string;
+}
+
+declare namespace ie {
+
+  /**
+   * A WebDriver client for Microsoft's Internet Explorer.
+   */
+  class Driver extends webdriver.WebDriver {
+    /**
+     * @param {(capabilities.Capabilities|Options)=} opt_config The configuration
+     *     options.
+     * @param {promise.ControlFlow=} opt_flow The control flow to use,
+     *     or {@code null} to use the currently active flow.
+     */
+    constructor(opt_config?: webdriver.Capabilities|Options, opt_flow?: webdriver.promise.ControlFlow);
+
+    /**
+     * This function is a no-op as file detectors are not supported by this
+     * implementation.
+     * @override
+     */
+    setFileDetector(): void;
+  }
+
+  /**
+   * Class for managing IEDriver specific options.
+   */
+  class Options {
+    constructor();
+
+    /**
+     * Extracts the IEDriver specific options from the given capabilities
+     * object.
+     * @param {!capabilities.Capabilities} caps The capabilities object.
+     * @return {!Options} The IEDriver options.
+     */
+    static fromCapabilities(caps: webdriver.Capabilities): Options;
+
+    /**
+     * Whether to disable the protected mode settings check when the session is
+     * created. Disbling this setting may lead to significant instability as the
+     * browser may become unresponsive/hang. Only "best effort" support is provided
+     * when using this capability.
+     *
+     * For more information, refer to the IEDriver's
+     * [required system configuration](http://goo.gl/eH0Yi3).
+     *
+     * @param {boolean} ignoreSettings Whether to ignore protected mode settings.
+     * @return {!Options} A self reference.
+     */
+    introduceFlakinessByIgnoringProtectedModeSettings(ignoreSettings: boolean): Options;
+
+    /**
+     * Indicates whether to skip the check that the browser's zoom level is set to
+     * 100%.
+     *
+     * @param {boolean} ignore Whether to ignore the browser's zoom level settings.
+     * @return {!Options} A self reference.
+     */
+    ignoreZoomSetting(ignore: boolean): Options;
+
+    /**
+     * Sets the initial URL loaded when IE starts. This is intended to be used with
+     * {@link #ignoreProtectedModeSettings} to allow the user to initialize IE in
+     * the proper Protected Mode zone. Setting this option may cause browser
+     * instability or flaky and unresponsive code. Only "best effort" support is
+     * provided when using this option.
+     *
+     * @param {string} url The initial browser URL.
+     * @return {!Options} A self reference.
+     */
+    initialBrowserUrl(url: string): Options;
+
+    /**
+     * Configures whether to enable persistent mouse hovering (true by default).
+     * Persistent hovering is achieved by continuously firing mouse over events at
+     * the last location the mouse cursor has been moved to.
+     *
+     * @param {boolean} enable Whether to enable persistent hovering.
+     * @return {!Options} A self reference.
+     */
+    enablePersistentHover(enable: boolean): Options;
+
+    /**
+     * Configures whether the driver should attempt to remove obsolete
+     * {@linkplain webdriver.WebElement WebElements} from its internal cache on
+     * page navigation (true by default). Disabling this option will cause the
+     * driver to run with a larger memory footprint.
+     *
+     * @param {boolean} enable Whether to enable element reference cleanup.
+     * @return {!Options} A self reference.
+     */
+    enableElementCacheCleanup(enable: boolean): Options;
+
+    /**
+     * Configures whether to require the IE window to have input focus before
+     * performing any user interactions (i.e. mouse or keyboard events). This
+     * option is disabled by default, but delivers much more accurate interaction
+     * events when enabled.
+     *
+     * @param {boolean} require Whether to require window focus.
+     * @return {!Options} A self reference.
+     */
+    requireWindowFocus(require: boolean): Options;
+
+    /**
+     * Configures the timeout, in milliseconds, that the driver will attempt to
+     * located and attach to a newly opened instance of Internet Explorer. The
+     * default is zero, which indicates waiting indefinitely.
+     *
+     * @param {number} timeout How long to wait for IE.
+     * @return {!Options} A self reference.
+     */
+    browserAttachTimeout(timeout: number): Options;
+
+    /**
+     * Configures whether to launch Internet Explorer using the CreateProcess API.
+     * If this option is not specified, IE is launched using IELaunchURL, if
+     * available. For IE 8 and above, this option requires the TabProcGrowth
+     * registry value to be set to 0.
+     *
+     * @param {boolean} force Whether to use the CreateProcess API.
+     * @return {!Options} A self reference.
+     */
+    forceCreateProcessApi(force: boolean): Options;
+
+    /**
+     * Specifies command-line switches to use when launching Internet Explorer.
+     * This is only valid when used with {@link #forceCreateProcessApi}.
+     *
+     * @param {...(string|!Array.<string>)} var_args The arguments to add.
+     * @return {!Options} A self reference.
+     */
+    addArguments(...var_args: Array<string>): Options;
+
+    /**
+     * Configures whether proxies should be configured on a per-process basis. If
+     * not set, setting a {@linkplain #setProxy proxy} will configure the system
+     * proxy. The default behavior is to use the system proxy.
+     *
+     * @param {boolean} enable Whether to enable per-process proxy settings.
+     * @return {!Options} A self reference.
+     */
+    usePerProcessProxy(enable: boolean): Options;
+
+    /**
+     * Configures whether to clear the cache, cookies, history, and saved form data
+     * before starting the browser. _Using this capability will clear session data
+     * for all running instances of Internet Explorer, including those started
+     * manually._
+     *
+     * @param {boolean} cleanSession Whether to clear all session data on startup.
+     * @return {!Options} A self reference.
+     */
+    ensureCleanSession(cleanSession: boolean): Options;
+
+    /**
+     * Sets the path to the log file the driver should log to.
+     * @param {string} file The log file path.
+     * @return {!Options} A self reference.
+     */
+    setLogFile(file: string): Options;
+
+    /**
+     * Sets the IEDriverServer's logging {@linkplain Level level}.
+     * @param {Level} level The logging level.
+     * @return {!Options} A self reference.
+     */
+    setLogLevel(level: webdriver.logging.Level): Options;
+
+    /**
+     * Sets the IP address of the driver's host adapter.
+     * @param {string} host The IP address to use.
+     * @return {!Options} A self reference.
+     */
+    setHost(host: string): Options;
+
+    /**
+     * Sets the path of the temporary data directory to use.
+     * @param {string} path The log file path.
+     * @return {!Options} A self reference.
+     */
+    setExtractPath(path: string): Options;
+
+    /**
+     * Sets whether the driver should start in silent mode.
+     * @param {boolean} silent Whether to run in silent mode.
+     * @return {!Options} A self reference.
+     */
+    silent(silent: boolean): Options;
+
+    /**
+     * Sets the proxy settings for the new session.
+     * @param {capabilities.ProxyConfig} proxy The proxy configuration to use.
+     * @return {!Options} A self reference.
+     */
+    setProxy(proxy: webdriver.ProxyConfig): Options;
+
+    /**
+     * Converts this options instance to a {@link capabilities.Capabilities}
+     * object.
+     * @param {capabilities.Capabilities=} opt_capabilities The capabilities to
+     *     merge these options into, if any.
+     * @return {!capabilities.Capabilities} The capabilities.
+     */
+    toCapabilities(opt_capabilities: webdriver.Capabilities): webdriver.Capabilities;
+  }
+
+}
+
+declare namespace opera {
+  /**
+   * Creates {@link remote.DriverService} instances that manages an
+   * [OperaDriver](https://github.com/operasoftware/operachromiumdriver)
+   * server in a child process.
+   */
+  class ServiceBuilder {
+    /**
+     * @param {string=} opt_exe Path to the server executable to use. If omitted,
+     *     the builder will attempt to locate the operadriver on the current
+     *     PATH.
+     * @throws {Error} If provided executable does not exist, or the operadriver
+     *     cannot be found on the PATH.
+     */
+    constructor(opt_exe?: string);
+
+    /**
+     * Sets the port to start the OperaDriver on.
+     * @param {number} port The port to use, or 0 for any free port.
+     * @return {!ServiceBuilder} A self reference.
+     * @throws {Error} If the port is invalid.
+     */
+    usingPort(port: number): ServiceBuilder;
+
+    /**
+     * Sets the path of the log file the driver should log to. If a log file is
+     * not specified, the driver will log to stderr.
+     * @param {string} path Path of the log file to use.
+     * @return {!ServiceBuilder} A self reference.
+     */
+    loggingTo(path: string): ServiceBuilder;
+
+    /**
+     * Enables verbose logging.
+     * @return {!ServiceBuilder} A self reference.
+     */
+    enableVerboseLogging(): ServiceBuilder;
+
+    /**
+     * Silence sthe drivers output.
+     * @return {!ServiceBuilder} A self reference.
+     */
+    silent(): ServiceBuilder;
+
+    /**
+     * Defines the stdio configuration for the driver service. See
+     * {@code child_process.spawn} for more information.
+     * @param {(string|!Array<string|number|!stream.Stream|null|undefined>)}
+     *     config The configuration to use.
+     * @return {!ServiceBuilder} A self reference.
+     */
+    setStdio(config: string|Array<string|number|any>): ServiceBuilder;
+
+    /**
+     * Defines the environment to start the server under. This settings will be
+     * inherited by every browser session started by the server.
+     * @param {!Object.<string, string>} env The environment to use.
+     * @return {!ServiceBuilder} A self reference.
+     */
+    withEnvironment(env: Object): ServiceBuilder;
+
+    /**
+     * Creates a new DriverService using this instance's current configuration.
+     * @return {!remote.DriverService} A new driver service using this instance's
+     *     current configuration.
+     * @throws {Error} If the driver exectuable was not specified and a default
+     *     could not be found on the current PATH.
+     */
+    build(): remote.DriverService;
+  }
+
+  /**
+   * Sets the default service to use for new OperaDriver instances.
+   * @param {!remote.DriverService} service The service to use.
+   * @throws {Error} If the default service is currently running.
+   */
+  function setDefaultService(service: remote.DriverService): any;
+
+  /**
+   * Returns the default OperaDriver service. If such a service has not been
+   * configured, one will be constructed using the default configuration for
+   * a OperaDriver executable found on the system PATH.
+   * @return {!remote.DriverService} The default OperaDriver service.
+   */
+  function getDefaultService(): remote.DriverService;
+
+  /**
+   * Class for managing {@linkplain Driver OperaDriver} specific options.
+   */
+  class Options {
+    /**
+     * Extracts the OperaDriver specific options from the given capabilities
+     * object.
+     * @param {!capabilities.Capabilities} caps The capabilities object.
+     * @return {!Options} The OperaDriver options.
+     */
+    static fromCapabilities(caps: webdriver.Capabilities): Options;
+
+    /**
+     * Add additional command line arguments to use when launching the Opera
+     * browser.  Each argument may be specified with or without the "--" prefix
+     * (e.g. "--foo" and "foo"). Arguments with an associated value should be
+     * delimited by an "=": "foo=bar".
+     * @param {...(string|!Array.<string>)} var_args The arguments to add.
+     * @return {!Options} A self reference.
+     */
+    addArguments(...var_args: Array<string>): Options;
+
+    /**
+     * Add additional extensions to install when launching Opera. Each extension
+     * should be specified as the path to the packed CRX file, or a Buffer for an
+     * extension.
+     * @param {...(string|!Buffer|!Array.<(string|!Buffer)>)} var_args The
+     *     extensions to add.
+     * @return {!Options} A self reference.
+     */
+    addExtensions(...var_args: Array<any>): Options;
+
+    /**
+     * Sets the path to the Opera binary to use. On Mac OS X, this path should
+     * reference the actual Opera executable, not just the application binary. The
+     * binary path be absolute or relative to the operadriver server executable, but
+     * it must exist on the machine that will launch Opera.
+     *
+     * @param {string} path The path to the Opera binary to use.
+     * @return {!Options} A self reference.
+     */
+    setOperaBinaryPath(path: string): Options;
+
+    /**
+     * Sets the logging preferences for the new session.
+     * @param {!./lib/logging.Preferences} prefs The logging preferences.
+     * @return {!Options} A self reference.
+     */
+    setLoggingPrefs(prefs: webdriver.logging.Preferences): Options;
+
+    /**
+     * Sets the proxy settings for the new session.
+     * @param {capabilities.ProxyConfig} proxy The proxy configuration to use.
+     * @return {!Options} A self reference.
+     */
+    setProxy(proxy: webdriver.ProxyConfig): Options;
+
+    /**
+     * Converts this options instance to a {@link capabilities.Capabilities}
+     *     object.
+     * @param {capabilities.Capabilities=} opt_capabilities The capabilities to
+     *     merge these options into, if any.
+     * @return {!capabilities.Capabilities} The capabilities.
+     */
+    toCapabilities(opt_capabilities?: webdriver.Capabilities): webdriver.Capabilities;
+  }
+
+  class Driver extends webdriver.WebDriver {
+    /**
+     * @param {(capabilities.Capabilities|Options)=} opt_config The configuration
+     *     options.
+     * @param {remote.DriverService=} opt_service The session to use; will use
+     *     the {@link getDefaultService default service} by default.
+     * @param {promise.ControlFlow=} opt_flow The control flow to use,
+     *     or {@code null} to use the currently active flow.
+     */
+    constructor(opt_config?: webdriver.Capabilities|Options, opt_service?: remote.DriverService, opt_flow?: webdriver.promise.ControlFlow);
+
+    /**
+     * This function is a no-op as file detectors are not supported by this
+     * implementation.
+     * @override
+     */
+    setFileDetector(): void;
+  }
+}
+
+declare namespace remote {
+  /**
+   * A record object that defines the configuration options for a DriverService
+   * instance.
+   *
+   * @record
+   */
+  interface ServiceOptions {}
+
+  /**
+   * Manages the life and death of a native executable WebDriver server.
+   *
+   * It is expected that the driver server implements the
+   * https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol.
+   * Furthermore, the managed server should support multiple concurrent sessions,
+   * so that this class may be reused for multiple clients.
+   */
+  class DriverService {
+    /**
+     * @param {string} executable Path to the executable to run.
+     * @param {!ServiceOptions} options Configuration options for the service.
+     */
+    constructor(executable: string, options: ServiceOptions);
+
+    /**
+     * @return {!promise.Promise<string>} A promise that resolves to
+     *    the server's address.
+     * @throws {Error} If the server has not been started.
+     */
+    address(): webdriver.promise.Promise<string>;
+
+    /**
+     * Returns whether the underlying process is still running. This does not take
+     * into account whether the process is in the process of shutting down.
+     * @return {boolean} Whether the underlying service process is running.
+     */
+    isRunning(): boolean;
+
+    /**
+     * Starts the server if it is not already running.
+     * @param {number=} opt_timeoutMs How long to wait, in milliseconds, for the
+     *     server to start accepting requests. Defaults to 30 seconds.
+     * @return {!promise.Promise<string>} A promise that will resolve
+     *     to the server's base URL when it has started accepting requests. If the
+     *     timeout expires before the server has started, the promise will be
+     *     rejected.
+     */
+    start(opt_timeoutMs?: number): webdriver.promise.Promise<string>;
+
+    /**
+     * Stops the service if it is not currently running. This function will kill
+     * the server immediately. To synchronize with the active control flow, use
+     * {@link #stop()}.
+     * @return {!promise.Promise} A promise that will be resolved when
+     *     the server has been stopped.
+     */
+    kill(): webdriver.promise.Promise<any>;
+
+    /**
+     * Schedules a task in the current control flow to stop the server if it is
+     * currently running.
+     * @return {!promise.Promise} A promise that will be resolved when
+     *     the server has been stopped.
+     */
+    stop(): webdriver.promise.Promise<any>;
+  }
+}
+
+declare namespace safari {
+  class Server {}
+
+  /**
+   * @return {!Promise<string>} A promise that will resolve with the path
+   *     to Safari on the current system.
+   */
+  function findSafariExecutable(): any;
+
+  /**
+   * @param {string} serverUrl The URL to connect to.
+   * @return {!Promise<string>} A promise for the path to a file that Safari can
+   *     open on start-up to trigger a new connection to the WebSocket server.
+   */
+  function createConnectFile(serverUrl: string): any;
+
+  /**
+   * Deletes all session data files if so desired.
+   * @param {!Object} desiredCapabilities .
+   * @return {!Array<promise.Promise>} A list of promises for the deleted files.
+   */
+  function cleanSession(desiredCapabilities: webdriver.Capabilities): any[];
+
+  /** @return {string} . */
+  function getRandomString(): string;
+
+  /**
+   * @implements {command.Executor}
+   */
+  class CommandExecutor {
+  }
+
+  /**
+   * Configuration options specific to the {@link Driver SafariDriver}.
+   */
+  class Options {
+    /**
+     * Extracts the SafariDriver specific options from the given capabilities
+     * object.
+     * @param {!Capabilities} capabilities The capabilities object.
+     * @return {!Options} The ChromeDriver options.
+     */
+    static fromCapabilities(capabilities: webdriver.Capabilities): Options;
+
+    /**
+     * Sets whether to force Safari to start with a clean session. Enabling this
+     * option will cause all global browser data to be deleted.
+     * @param {boolean} clean Whether to make sure the session has no cookies,
+     *     cache entries, local storage, or databases.
+     * @return {!Options} A self reference.
+     */
+    setCleanSession(clean: boolean): Options;
+
+    /**
+     * Sets the logging preferences for the new session.
+     * @param {!./lib/logging.Preferences} prefs The logging preferences.
+     * @return {!Options} A self reference.
+     */
+    setLoggingPrefs(prefs: webdriver.logging.Preferences): Options;
+
+    /**
+     * Converts this options instance to a {@link Capabilities} object.
+     * @param {Capabilities=} opt_capabilities The capabilities to
+     *     merge these options into, if any.
+     * @return {!Capabilities} The capabilities.
+     */
+    toCapabilities(opt_capabilities: webdriver.Capabilities): webdriver.Capabilities;
+  }
+
+  /**
+   * A WebDriver client for Safari. This class should never be instantiated
+   * directly; instead, use the {@linkplain ./builder.Builder Builder}:
+   *
+   *     var driver = new Builder()
+   *         .forBrowser('safari')
+   *         .build();
+   *
+   */
+  class Driver extends webdriver.WebDriver {
+    /**
+     * @param {(Options|Capabilities)=} opt_config The configuration
+     *     options for the new session.
+     * @param {promise.ControlFlow=} opt_flow The control flow to create
+     *     the driver under.
+     */
+    constructor(opt_config?: Options|webdriver.Capabilities, opt_flow?: webdriver.promise.ControlFlow);
+
+  }
+}
+
+declare namespace webdriver {
+
+    namespace error {
+        class IError extends Error {
+          constructor(opt_error?: string);
+
+          code(): number;
+        }
+
+        /**
+         * The base WebDriver error type. This error type is only used directly when a
+         * more appropriate category is not defined for the offending error.
+         */
+        class WebDriverError extends IError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An attempt was made to select an element that cannot be selected.
+         */
+        class ElementNotSelectableError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An element command could not be completed because the element is not visible
+         * on the page.
+         */
+        class ElementNotVisibleError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * The arguments passed to a command are either invalid or malformed.
+         */
+        class InvalidArgumentError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An illegal attempt was made to set a cookie under a different domain than
+         * the current page.
+         */
+        class InvalidCookieDomainError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * The coordinates provided to an interactions operation are invalid.
+         */
+        class InvalidElementCoordinatesError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An element command could not be completed because the element is in an
+         * invalid state, e.g. attempting to click an element that is no longer attached
+         * to the document.
+         */
+        class InvalidElementStateError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * Argument was an invalid selector.
+         */
+        class InvalidSelectorError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * Occurs when a command is directed to a session that does not exist.
+         */
+        class NoSuchSessionError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An error occurred while executing JavaScript supplied by the user.
+         */
+        class JavascriptError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * The target for mouse interaction is not in the browser’s viewport and cannot
+         * be brought into that viewport.
+         */
+        class MoveTargetOutOfBoundsError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An attempt was made to operate on a modal dialog when one was not open.
+         */
+        class NoSuchAlertError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An element could not be located on the page using the given search
+         * parameters.
+         */
+        class NoSuchElementError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * A request to switch to a frame could not be satisfied because the frame
+         * could not be found.
+         */
+        class NoSuchFrameError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * A request to switch to a window could not be satisfied because the window
+         * could not be found.
+         */
+        class NoSuchWindowError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * A script did not complete before its timeout expired.
+         */
+        class ScriptTimeoutError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * A new session could not be created.
+         */
+        class SessionNotCreatedError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An element command failed because the referenced element is no longer
+         * attached to the DOM.
+         */
+        class StaleElementReferenceError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * An operation did not completErrorCodee before its timeout expired.
+         */
+        class TimeoutError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * A request to set a cookie’s value could not be satisfied.
+         */
+        class UnableToSetCookieError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * A screen capture operation was not possible.
+         */
+        class UnableToCaptureScreenError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * A modal dialog was open, blocking this operation.
+         */
+        class UnexpectedAlertOpenError extends WebDriverError {
+          /**
+           * @param {string=} opt_error the error message, if any.
+           * @param {string=} opt_text the text of the open dialog, if available.
+           */
+          constructor(opt_error?: string, opt_text?: string);
+
+          /**
+           * @return {(string|undefined)} The text displayed with the unhandled alert,
+           *     if available.
+           */
+          getAlertText(): string;
+        }
+
+        /**
+         * A command could not be executed because the remote end is not aware of it.
+         */
+        class UnknownCommandError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * The requested command matched a known URL but did not match an method for
+         * that URL.
+         */
+        class UnknownMethodError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+
+        /**
+         * Reports an unsupport operation.
+         */
+        class UnsupportedOperationError extends WebDriverError {
+          /** @param {string=} opt_error the error message, if any. */
+          constructor(opt_error?: string);
+        }
+    }
+
+    namespace logging {
+
+        /**
+         * A hash describing log preferences.
+         * @typedef {Object.<webdriver.logging.Type, webdriver.logging.LevelName>}
+         */
+        class Preferences {
+            setLevel(type: string|Type, level: Level|string|number): void;
+            toJSON(): { [key: string]: string };
+        }
+
+        /**
+         * Common log types.
+         * @enum {string}
+         */
+        enum Type {
+          /** Logs originating from the browser. */
+          BROWSER,
+          /** Logs from a WebDriver client. */
+          CLIENT,
+          /** Logs from a WebDriver implementation. */
+          DRIVER,
+          /** Logs related to performance. */
+          PERFORMANCE,
+          /** Logs from the remote server. */
+          SERVER
+        }
+
+        /**
+         * Defines a message level that may be used to control logging output.
+         *
+         * @final
+         */
+        class Level {
+          name_: string;
+          value_: number;
+          /**
+           * @param {string} name the level's name.
+           * @param {number} level the level's numeric value.
+           */
+          constructor(name: string, level: number);
+
+          /** @override */
+          toString(): string;
+
+          /** This logger's name. */
+          name(): string;
+
+          /** The numeric log level. */
+          value(): number;
+
+          /**
+           * Indicates no log messages should be recorded.
+           * @const
+           */
+          static OFF: Level;
+          /**
+           * Log messages with a level of `1000` or higher.
+           * @const
+           */
+          static SEVERE: Level;
+          /**
+           * Log messages with a level of `900` or higher.
+           * @const
+           */
+          static WARNING: Level;
+          /**
+           * Log messages with a level of `800` or higher.
+           * @const
+           */
+          static INFO: Level;
+          /**
+           * Log messages with a level of `700` or higher.
+           * @const
+           */
+          static DEBUG: Level;
+          /**
+           * Log messages with a level of `500` or higher.
+           * @const
+           */
+          static FINE: Level;
+          /**
+           * Log messages with a level of `400` or higher.
+           * @const
+           */
+          static FINER: Level;
+          /**
+           * Log messages with a level of `300` or higher.
+           * @const
+           */
+          static FINEST: Level;
+          /**
+           * Indicates all log messages should be recorded.
+           * @const
+           */
+          static ALL: Level;
+        }
+
+        /**
+         * Converts a level name or value to a {@link webdriver.logging.Level} value.
+         * If the name/value is not recognized, {@link webdriver.logging.Level.ALL}
+         * will be returned.
+         * @param {(number|string)} nameOrValue The log level name, or value, to
+         *     convert .
+         * @return {!webdriver.logging.Level} The converted level.
+         */
+        function getLevel(nameOrValue: string|number): Level;
+
+        interface IEntryJSON {
+          level: string;
+          message: string;
+          timestamp: number;
+          type: string;
+        }
+
+        /**
+         * A single log entry.
+         */
+        class Entry {
+          /**
+           * @param {(!webdriver.logging.Level|string)} level The entry level.
+           * @param {string} message The log message.
+           * @param {number=} opt_timestamp The time this entry was generated, in
+           *     milliseconds since 0:00:00, January 1, 1970 UTC. If omitted, the
+           *     current time will be used.
+           * @param {string=} opt_type The log type, if known.
+           * @constructor
+           */
+          constructor(level: Level|string|number, message: string, opt_timestamp?:number, opt_type?:string|Type);
+
+          /** @type {!webdriver.logging.Level} */
+          level: Level;
+
+          /** @type {string} */
+          message: string;
+
+          /** @type {number} */
+          timestamp: number;
+
+          /** @type {string} */
+          type: string;
+
+          /**
+           * @return {{level: string, message: string, timestamp: number,
+           *           type: string}} The JSON representation of this entry.
+           */
+          toJSON(): IEntryJSON;
+        }
+
+        /**
+         * An object used to log debugging messages. Loggers use a hierarchical,
+         * dot-separated naming scheme. For instance, "foo" is considered the parent of
+         * the "foo.bar" and an ancestor of "foo.bar.baz".
+         *
+         * Each logger may be assigned a {@linkplain #setLevel log level}, which
+         * controls which level of messages will be reported to the
+         * {@linkplain #addHandler handlers} attached to this instance. If a log level
+         * is not explicitly set on a logger, it will inherit its parent.
+         *
+         * This class should never be directly instantiated. Instead, users should
+         * obtain logger references using the {@linkplain ./logging.getLogger()
+         * getLogger()} function.
+         *
+         * @final
+         */
+        class Logger {
+          /**
+           * @param {string} name the name of this logger.
+           * @param {Level=} opt_level the initial level for this logger.
+           */
+          constructor(name: string, opt_level?: Level);
+
+          /** @private {string} */
+          name_: string;
+          /** @private {Level} */
+          level_: Level;
+          /** @private {Logger} */
+          parent_: Logger;
+          /** @private {Set<function(!Entry)>} */
+          handlers_: any;
+
+          /** @return {string} the name of this logger. */
+          getName(): string;
+
+          /**
+           * @param {Level} level the new level for this logger, or `null` if the logger
+           *     should inherit its level from its parent logger.
+           */
+          setLevel(level: Level): void;
+
+          /** @return {Level} the log level for this logger. */
+          getLevel(): Level;
+
+          /**
+           * @return {!Level} the effective level for this logger.
+           */
+          getEffectiveLevel(): Level;
+
+          /**
+           * @param {!Level} level the level to check.
+           * @return {boolean} whether messages recorded at the given level are loggable
+           *     by this instance.
+           */
+          isLoggable(level: Level): boolean;
+
+          /**
+           * Adds a handler to this logger. The handler will be invoked for each message
+           * logged with this instance, or any of its descendants.
+           *
+           * @param {function(!Entry)} handler the handler to add.
+           */
+          addHandler(handler: any): void;
+
+          /**
+           * Removes a handler from this logger.
+           *
+           * @param {function(!Entry)} handler the handler to remove.
+           * @return {boolean} whether a handler was successfully removed.
+           */
+          removeHandler(handler: any): void;
+
+          /**
+           * Logs a message at the given level. The message may be defined as a string
+           * or as a function that will return the message. If a function is provided,
+           * it will only be invoked if this logger's
+           * {@linkplain #getEffectiveLevel() effective log level} includes the given
+           * `level`.
+           *
+           * @param {!Level} level the level at which to log the message.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          log(level: Level, loggable: string|Function): void;
+
+          /**
+           * Logs a message at the {@link Level.SEVERE} log level.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          severe(loggable: string|Function): void;
+
+          /**
+           * Logs a message at the {@link Level.WARNING} log level.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          warning(loggable: string|Function): void;
+
+          /**
+           * Logs a message at the {@link Level.INFO} log level.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          info(loggable: string|Function): void;
+
+          /**
+           * Logs a message at the {@link Level.DEBUG} log level.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          debug(loggable: string|Function): void;
+
+          /**
+           * Logs a message at the {@link Level.FINE} log level.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          fine(loggable: string|Function): void;
+
+          /**
+           * Logs a message at the {@link Level.FINER} log level.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          finer(loggable: string|Function): void;
+
+          /**
+           * Logs a message at the {@link Level.FINEST} log level.
+           * @param {(string|function(): string)} loggable the message to log, or a
+           *     function that will return the message.
+           */
+          finest(loggable: string|Function): void;
+        }
+
+        /**
+         * Maintains a collection of loggers.
+         *
+         * @final
+         */
+        class LogManager {
+          /**
+           * Retrieves a named logger, creating it in the process. This function will
+           * implicitly create the requested logger, and any of its parents, if they
+           * do not yet exist.
+           *
+           * @param {string} name the logger's name.
+           * @return {!Logger} the requested logger.
+           */
+          getLogger(name: string): Logger;
+
+          /**
+           * Creates a new logger.
+           *
+           * @param {string} name the logger's name.
+           * @param {!Logger} parent the logger's parent.
+           * @return {!Logger} the new logger.
+           * @private
+           */
+          createLogger_(name: string, parent: Logger): Logger;
+        }
+    }
+
+    namespace promise {
+        //region Functions
+
+        /**
+         * Given an array of promises, will return a promise that will be fulfilled
+         * with the fulfillment values of the input array's values. If any of the
+         * input array's promises are rejected, the returned promise will be rejected
+         * with the same reason.
+         *
+         * @param {!Array<(T|!ManagedPromise<T>)>} arr An array of
+         *     promises to wait on.
+         * @return {!ManagedPromise<!Array<T>>} A promise that is
+         *     fulfilled with an array containing the fulfilled values of the
+         *     input array, or rejected with the same reason as the first
+         *     rejected value.
+         * @template T
+         */
+        function all<T>(arr: Array<T|Promise<T>>): Promise<T[]>;
+
+        /**
+         * Invokes the appropriate callback function as soon as a promised
+         * {@code value} is resolved. This function is similar to
+         * {@link webdriver.promise.when}, except it does not return a new promise.
+         * @param {*} value The value to observe.
+         * @param {Function} callback The function to call when the value is
+         *     resolved successfully.
+         * @param {Function=} opt_errback The function to call when the value is
+         *     rejected.
+         */
+        function asap(value: any, callback: Function, opt_errback?: Function): void;
+
+        /**
+         * @return {!webdriver.promise.ControlFlow} The currently active control flow.
+         */
+        function controlFlow(): ControlFlow;
+
+        /**
+         * Creates a new control flow. The provided callback will be invoked as the
+         * first task within the new flow, with the flow as its sole argument. Returns
+         * a promise that resolves to the callback result.
+         * @param {function(!ControlFlow)} callback The entry point
+         *     to the newly created flow.
+         * @return {!ManagedPromise} A promise that resolves to the callback
+         *     result.
+         */
+        function createFlow<R>(callback: (flow: ControlFlow) => R): Promise<R>;
+
+        /**
+         * Determines whether a {@code value} should be treated as a promise.
+         * Any object whose "then" property is a function will be considered a promise.
+         *
+         * @param {*} value The value to test.
+         * @return {boolean} Whether the value is a promise.
+         */
+        function isPromise(value: any): boolean;
+
+        /**
+         * Tests is a function is a generator.
+         * @param {!Function} fn The function to test.
+         * @return {boolean} Whether the function is a generator.
+         */
+        function isGenerator(fn: Function): boolean;
+
+        /**
+         * Creates a promise that will be resolved at a set time in the future.
+         * @param {number} ms The amount of time, in milliseconds, to wait before
+         *     resolving the promise.
+         * @return {!ManagedPromise} The promise.
+         */
+        function delayed(ms: number): Promise<void>;
+
+        /**
+         * Calls a function for each element in an array, and if the function returns
+         * true adds the element to a new array.
+         *
+         * If the return value of the filter function is a promise, this function
+         * will wait for it to be fulfilled before determining whether to insert the
+         * element into the new array.
+         *
+         * If the filter function throws or returns a rejected promise, the promise
+         * returned by this function will be rejected with the same reason. Only the
+         * first failure will be reported; all subsequent errors will be silently
+         * ignored.
+         *
+         * @param {!(Array<TYPE>|ManagedPromise<!Array<TYPE>>)} arr The
+         *     array to iterator over, or a promise that will resolve to said array.
+         * @param {function(this: SELF, TYPE, number, !Array<TYPE>): (
+         *             boolean|ManagedPromise<boolean>)} fn The function
+         *     to call for each element in the array.
+         * @param {SELF=} opt_self The object to be used as the value of 'this' within
+         *     {@code fn}.
+         * @template TYPE, SELF
+         */
+        function filter<T>(arr: Array<T>|Promise<Array<T>>, fn: (element: T, type: any, index: number, array: T[]) => any, opt_self?: any): Promise<T[]>;
+
+        /**
+         * Creates a new deferred object.
+         * @return {!webdriver.promise.Deferred} The new deferred object.
+         */
+        function defer<T>(): Deferred<T>;
+
+        /**
+         * Creates a promise that has been resolved with the given value.
+         * @param {T=} opt_value The resolved value.
+         * @return {!ManagedPromise<T>} The resolved promise.
+         * @template T
+         */
+        function fulfilled<T>(opt_value?: T): Promise<T>;
+
+        /**
+         * Calls a function for each element in an array and inserts the result into a
+         * new array, which is used as the fulfillment value of the promise returned
+         * by this function.
+         *
+         * If the return value of the mapping function is a promise, this function
+         * will wait for it to be fulfilled before inserting it into the new array.
+         *
+         * If the mapping function throws or returns a rejected promise, the
+         * promise returned by this function will be rejected with the same reason.
+         * Only the first failure will be reported; all subsequent errors will be
+         * silently ignored.
+         *
+         * @param {!(Array<TYPE>|ManagedPromise<!Array<TYPE>>)} arr The
+         *     array to iterator over, or a promise that will resolve to said array.
+         * @param {function(this: SELF, TYPE, number, !Array<TYPE>): ?} fn The
+         *     function to call for each element in the array. This function should
+         *     expect three arguments (the element, the index, and the array itself.
+         * @param {SELF=} opt_self The object to be used as the value of 'this' within
+         *     {@code fn}.
+         * @template TYPE, SELF
+         */
+        function map<T>(arr: Array<T>|Promise<Array<T>>, fn: (self: any, type: any, index: number, array: any[]) => any, opt_self?: any): Promise<T[]>
+
+        /**
+         * Creates a promise that has been rejected with the given reason.
+         * @param {*=} opt_reason The rejection reason; may be any value, but is
+         *     usually an Error or a string.
+         * @return {!ManagedPromise<T>} The rejected promise.
+         * @template T
+         */
+        function rejected<T>(opt_reason?: any): Promise<T>;
+
+        /**
+         * Wraps a function that expects a node-style callback as its final
+         * argument. This callback expects two arguments: an error value (which will be
+         * null if the call succeeded), and the success value as the second argument.
+         * The callback will the resolve or reject the returned promise, based on its
+         * arguments.
+         * @param {!Function} fn The function to wrap.
+         * @param {...?} var_args The arguments to apply to the function, excluding the
+         *     final callback.
+         * @return {!ManagedPromise} A promise that will be resolved with the
+         *     result of the provided function's callback.
+         */
+        function checkedNodeCall<T>(fn: Function, ...var_args: any[]): Promise<T>;
+
+        /**
+         * Consumes a {@code GeneratorFunction}. Each time the generator yields a
+         * promise, this function will wait for it to be fulfilled before feeding the
+         * fulfilled value back into {@code next}. Likewise, if a yielded promise is
+         * rejected, the rejection error will be passed to {@code throw}.
+         *
+         * __Example 1:__ the Fibonacci Sequence.
+         *
+         *     promise.consume(function* fibonacci() {
+         *       var n1 = 1, n2 = 1;
+         *       for (var i = 0; i < 4; ++i) {
+         *         var tmp = yield n1 + n2;
+         *         n1 = n2;
+         *         n2 = tmp;
+         *       }
+         *       return n1 + n2;
+         *     }).then(function(result) {
+         *       console.log(result);  // 13
+         *     });
+         *
+         * __Example 2:__ a generator that throws.
+         *
+         *     promise.consume(function* () {
+         *       yield promise.delayed(250).then(function() {
+         *         throw Error('boom');
+         *       });
+         *     }).catch(function(e) {
+         *       console.log(e.toString());  // Error: boom
+         *     });
+         *
+         * @param {!Function} generatorFn The generator function to execute.
+         * @param {Object=} opt_self The object to use as "this" when invoking the
+         *     initial generator.
+         * @param {...*} var_args Any arguments to pass to the initial generator.
+         * @return {!ManagedPromise<?>} A promise that will resolve to the
+         *     generator's final result.
+         * @throws {TypeError} If the given function is not a generator.
+         */
+        function consume<T>(generatorFn: Function, opt_self?: any, ...var_args: any[]): Promise<T>;
+
+        /**
+         * Registers an observer on a promised {@code value}, returning a new promise
+         * that will be resolved when the value is. If {@code value} is not a promise,
+         * then the return promise will be immediately resolved.
+         * @param {*} value The value to observe.
+         * @param {Function=} opt_callback The function to call when the value is
+         *     resolved successfully.
+         * @param {Function=} opt_errback The function to call when the value is
+         *     rejected.
+         * @return {!ManagedPromise} A new promise.
+         */
+        function when<T,R>(value: T|Promise<T>, opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): Promise<R>;
+
+        /**
+         * Returns a promise that will be resolved with the input value in a
+         * fully-resolved state. If the value is an array, each element will be fully
+         * resolved. Likewise, if the value is an object, all keys will be fully
+         * resolved. In both cases, all nested arrays and objects will also be
+         * fully resolved.  All fields are resolved in place; the returned promise will
+         * resolve on {@code value} and not a copy.
+         *
+         * Warning: This function makes no checks against objects that contain
+         * cyclical references:
+         *
+         *     var value = {};
+         *     value['self'] = value;
+         *     promise.fullyResolved(value);  // Stack overflow.
+         *
+         * @param {*} value The value to fully resolve.
+         * @return {!ManagedPromise} A promise for a fully resolved version
+         *     of the input value.
+         */
+        function fullyResolved<T>(value: any): Promise<T>;
+
+        /**
+         * Changes the default flow to use when no others are active.
+         * @param {!ControlFlow} flow The new default flow.
+         * @throws {Error} If the default flow is not currently active.
+         */
+        function setDefaultFlow(flow: ControlFlow): void;
+
+        //endregion
+
+        /**
+         * Error used when the computation of a promise is cancelled.
+         */
+        class CancellationError extends Error {
+          /**
+           * @param {string=} opt_msg The cancellation message.
+           */
+          constructor(opt_msg?: string);
+        }
+
+        interface IThenable<T> {
+            /**
+             * Cancels the computation of this promise's value, rejecting the promise in
+             * the process. This method is a no-op if the promise has already been
+             * resolved.
+             *
+             * @param {(string|Error)=} opt_reason The reason this promise is being
+             *     cancelled. This value will be wrapped in a {@link CancellationError}.
+             */
+            cancel(opt_reason?: string|Error): void;
+
+            /** @return {boolean} Whether this promise's value is still being computed. */
+            isPending(): boolean;
+
+            /**
+             * Registers listeners for when this instance is resolved.
+             *
+             * @param {?(function(T): (R|IThenable<R>))=} opt_callback The
+             *     function to call if this promise is successfully resolved. The function
+             *     should expect a single argument: the promise's resolved value.
+             * @param {?(function(*): (R|IThenable<R>))=} opt_errback
+             *     The function to call if this promise is rejected. The function should
+             *     expect a single argument: the rejection reason.
+             * @return {!ManagedPromise<R>} A new promise which will be
+             *     resolved with the result of the invoked callback.
+             * @template R
+             */
+            then<R>(opt_callback?: (value: T) => R|IThenable<R>, opt_errback?: (error: any) => R|IThenable<R>): Promise<R>;
+
+            /**
+             * Registers a listener for when this promise is rejected. This is synonymous
+             * with the {@code catch} clause in a synchronous API:
+             *
+             *     // Synchronous API:
+             *     try {
+             *       doSynchronousWork();
+             *     } catch (ex) {
+             *       console.error(ex);
+             *     }
+             *
+             *     // Asynchronous promise API:
+             *     doAsynchronousWork().catch(function(ex) {
+             *       console.error(ex);
+             *     });
+             *
+             * @param {function(*): (R|IThenable<R>)} errback The
+             *     function to call if this promise is rejected. The function should
+             *     expect a single argument: the rejection reason.
+             * @return {!ManagedPromise<R>} A new promise which will be
+             *     resolved with the result of the invoked callback.
+             * @template R
+             */
+            catch<R>(errback: Function): Promise<R>;
+        }
+
+        /**
+         * Thenable is a promise-like object with a {@code then} method which may be
+         * used to schedule callbacks on a promised value.
+         *
+         * @interface
+         * @template T
+         */
+        class Thenable<T> implements IThenable<T> {
+            /**
+             * Cancels the computation of this promise's value, rejecting the promise in
+             * the process. This method is a no-op if the promise has already been
+             * resolved.
+             *
+             * @param {(string|Error)=} opt_reason The reason this promise is being
+             *     cancelled. This value will be wrapped in a {@link CancellationError}.
+             */
+            cancel(opt_reason?: string|Error): void;
+
+            /** @return {boolean} Whether this promise's value is still being computed. */
+            isPending(): boolean;
+
+            /**
+             * Registers listeners for when this instance is resolved.
+             *
+             * @param {?(function(T): (R|IThenable<R>))=} opt_callback The
+             *     function to call if this promise is successfully resolved. The function
+             *     should expect a single argument: the promise's resolved value.
+             * @param {?(function(*): (R|IThenable<R>))=} opt_errback
+             *     The function to call if this promise is rejected. The function should
+             *     expect a single argument: the rejection reason.
+             * @return {!ManagedPromise<R>} A new promise which will be
+             *     resolved with the result of the invoked callback.
+             * @template R
+             */
+            then<R>(opt_callback?: (value: T) => R|IThenable<R>, opt_errback?: (error: any) => R|IThenable<R>): Promise<R>;
+
+            /**
+             * Registers a listener for when this promise is rejected. This is synonymous
+             * with the {@code catch} clause in a synchronous API:
+             *
+             *     // Synchronous API:
+             *     try {
+             *       doSynchronousWork();
+             *     } catch (ex) {
+             *       console.error(ex);
+             *     }
+             *
+             *     // Asynchronous promise API:
+             *     doAsynchronousWork().catch(function(ex) {
+             *       console.error(ex);
+             *     });
+             *
+             * @param {function(*): (R|IThenable<R>)} errback The
+             *     function to call if this promise is rejected. The function should
+             *     expect a single argument: the rejection reason.
+             * @return {!ManagedPromise<R>} A new promise which will be
+             *     resolved with the result of the invoked callback.
+             * @template R
+             */
+            catch<R>(errback: Function): Promise<R>;
+
+            /**
+             * Registers a listener to invoke when this promise is resolved, regardless
+             * of whether the promise's value was successfully computed. This function
+             * is synonymous with the {@code finally} clause in a synchronous API:
+             *
+             *     // Synchronous API:
+             *     try {
+             *       doSynchronousWork();
+             *     } finally {
+             *       cleanUp();
+             *     }
+             *
+             *     // Asynchronous promise API:
+             *     doAsynchronousWork().finally(cleanUp);
+             *
+             * __Note:__ similar to the {@code finally} clause, if the registered
+             * callback returns a rejected promise or throws an error, it will silently
+             * replace the rejection error (if any) from this promise:
+             *
+             *     try {
+             *       throw Error('one');
+             *     } finally {
+             *       throw Error('two');  // Hides Error: one
+             *     }
+             *
+             *     promise.rejected(Error('one'))
+             *         .finally(function() {
+             *           throw Error('two');  // Hides Error: one
+             *         });
+             *
+             * @param {function(): (R|IThenable<R>)} callback The function to call when
+             *     this promise is resolved.
+             * @return {!ManagedPromise<R>} A promise that will be fulfilled
+             *     with the callback result.
+             * @template R
+             */
+            finally<R>(callback: Function): Promise<R>;
+
+            /**
+             * Adds a property to a class prototype to allow runtime checks of whether
+             * instances of that class implement the Thenable interface. This function
+             * will also ensure the prototype's {@code then} function is exported from
+             * compiled code.
+             * @param {function(new: Thenable, ...?)} ctor The
+             *     constructor whose prototype to modify.
+             */
+            static addImplementation(ctor: Function): void;
+
+            /**
+             * Checks if an object has been tagged for implementing the Thenable
+             * interface as defined by {@link Thenable.addImplementation}.
+             * @param {*} object The object to test.
+             * @return {boolean} Whether the object is an implementation of the Thenable
+             *     interface.
+             */
+            static isImplementation(object: any): boolean;
+        }
+
+        interface IFulfilledCallback<T> {
+          (value: T|IThenable<T>|Thenable<T>|void): void;
+        }
+
+        interface IRejectedCallback {
+          (reason: any): void;
+        }
+
+        /**
+         * Represents the eventual value of a completed operation. Each promise may be
+         * in one of three states: pending, fulfilled, or rejected. Each promise starts
+         * in the pending state and may make a single transition to either a
+         * fulfilled or rejected state, at which point the promise is considered
+         * resolved.
+         *
+         * @implements {promise.Thenable<T>}
+         * @template T
+         * @see http://promises-aplus.github.io/promises-spec/
+         */
+        class Promise<T> implements IThenable<T> {
+            /**
+             * @param {function(
+             *           function((T|IThenable<T>|Thenable)=),
+             *           function(*=))} resolver
+             *     Function that is invoked immediately to begin computation of this
+             *     promise's value. The function should accept a pair of callback
+             *     functions, one for fulfilling the promise and another for rejecting it.
+             * @param {ControlFlow=} opt_flow The control flow
+             *     this instance was created under. Defaults to the currently active flow.
+             */
+            constructor(resolver: (onFulfilled: IFulfilledCallback<T>, onRejected: IRejectedCallback)=>void, opt_flow?: ControlFlow);
+            constructor(); // For angular-protractor/angular-protractor-tests.ts
+
+            //region Methods
+
+            /**
+             * Cancels the computation of this promise's value, rejecting the promise in the
+             * process.
+             * @param {*} reason The reason this promise is being cancelled. If not an
+             *     {@code Error}, one will be created using the value's string
+             *     representation.
+             */
+            cancel(opt_reason?: string|Error): void;
+
+            /** @return {boolean} Whether this promise's value is still being computed. */
+            isPending(): boolean;
+
+            /**
+             * Registers listeners for when this instance is resolved. This function most
+             * overridden by subtypes.
+             *
+             * @param opt_callback The function to call if this promise is
+             *     successfully resolved. The function should expect a single argument: the
+             *     promise's resolved value.
+             * @param opt_errback The function to call if this promise is
+             *     rejected. The function should expect a single argument: the rejection
+             *     reason.
+             * @return A new promise which will be resolved
+             *     with the result of the invoked callback.
+             */
+            then(opt_callback?: Function, opt_errback?: Function): Promise<any>;
+
+            /**
+             * Registers a listener for when this promise is rejected. This is synonymous
+             * with the {@code catch} clause in a synchronous API:
+             * <pre><code>
+             *   // Synchronous API:
+             *   try {
+             *     doSynchronousWork();
+             *   } catch (ex) {
+             *     console.error(ex);
+             *   }
+             *
+             *   // Asynchronous promise API:
+             *   doAsynchronousWork().thenCatch(function(ex) {
+             *     console.error(ex);
+             *   });
+             * </code></pre>
+             *
+             * @param {function(*): (R|webdriver.promise.Promise.<R>)} errback The function
+             *     to call if this promise is rejected. The function should expect a single
+             *     argument: the rejection reason.
+             * @return {!webdriver.promise.Promise.<R>} A new promise which will be
+             *     resolved with the result of the invoked callback.
+             * @template R
+             */
+            thenCatch<R>(errback: (error: any) => any): Promise<R>;
+
+            /**
+             * Registers a listener for when this promise is rejected. This is synonymous
+             * with the {@code catch} clause in a synchronous API:
+             *
+             *     // Synchronous API:
+             *     try {
+             *       doSynchronousWork();
+             *     } catch (ex) {
+             *       console.error(ex);
+             *     }
+             *
+             *     // Asynchronous promise API:
+             *     doAsynchronousWork().catch(function(ex) {
+             *       console.error(ex);
+             *     });
+             *
+             * @param {function(*): (R|IThenable<R>)} errback The
+             *     function to call if this promise is rejected. The function should
+             *     expect a single argument: the rejection reason.
+             * @return {!ManagedPromise<R>} A new promise which will be
+             *     resolved with the result of the invoked callback.
+             * @template R
+             */
+            catch<R>(errback: Function): Promise<R>;
+
+
+            /**
+             * Registers a listener to invoke when this promise is resolved, regardless
+             * of whether the promise's value was successfully computed. This function
+             * is synonymous with the {@code finally} clause in a synchronous API:
+             * <pre><code>
+             *   // Synchronous API:
+             *   try {
+             *     doSynchronousWork();
+             *   } finally {
+             *     cleanUp();
+             *   }
+             *
+             *   // Asynchronous promise API:
+             *   doAsynchronousWork().thenFinally(cleanUp);
+             * </code></pre>
+             *
+             * <b>Note:</b> similar to the {@code finally} clause, if the registered
+             * callback returns a rejected promise or throws an error, it will silently
+             * replace the rejection error (if any) from this promise:
+             * <pre><code>
+             *   try {
+             *     throw Error('one');
+             *   } finally {
+             *     throw Error('two');  // Hides Error: one
+             *   }
+             *
+             *   webdriver.promise.rejected(Error('one'))
+             *       .thenFinally(function() {
+             *         throw Error('two');  // Hides Error: one
+             *       });
+             * </code></pre>
+             *
+             *
+             * @param {function(): (R|webdriver.promise.Promise.<R>)} callback The function
+             *     to call when this promise is resolved.
+             * @return {!webdriver.promise.Promise.<R>} A promise that will be fulfilled
+             *     with the callback result.
+             * @template R
+             */
+            thenFinally<R>(callback: Function): Promise<R>;
+
+            //endregion
+        }
+
+        /**
+         * Represents a value that will be resolved at some point in the future. This
+         * class represents the protected "producer" half of a Promise - each Deferred
+         * has a {@code promise} property that may be returned to consumers for
+         * registering callbacks, reserving the ability to resolve the deferred to the
+         * producer.
+         *
+         * <p>If this Deferred is rejected and there are no listeners registered before
+         * the next turn of the event loop, the rejection will be passed to the
+         * {@link webdriver.promise.ControlFlow} as an unhandled failure.
+         *
+         * <p>If this Deferred is cancelled, the cancellation reason will be forward to
+         * the Deferred's canceller function (if provided). The canceller may return a
+         * truth-y value to override the reason provided for rejection.
+         *
+         * @extends {webdriver.promise.Promise}
+         */
+        class Deferred<T> extends Promise<T> {
+            //region Constructors
+
+            /**
+             *
+             * @param {webdriver.promise.ControlFlow=} opt_flow The control flow
+             *     this instance was created under. This should only be provided during
+             *     unit tests.
+             * @constructor
+             */
+            constructor(opt_flow?: ControlFlow);
+
+            //endregion
+
+            static State_: {
+                BLOCKED: number;
+                PENDING: number;
+                REJECTED: number;
+                RESOLVED: number;
+            };
+
+            //region Properties
+
+            /**
+             * The consumer promise for this instance. Provides protected access to the
+             * callback registering functions.
+             * @type {!webdriver.promise.Promise}
+             */
+            promise: Promise<T>;
+
+            //endregion
+
+            //region Methods
+
+            /**
+             * Rejects this promise. If the error is itself a promise, this instance will
+             * be chained to it and be rejected with the error's resolved value.
+             * @param {*=} opt_error The rejection reason, typically either a
+             *     {@code Error} or a {@code string}.
+             */
+            reject(opt_error?: any): void;
+            errback(opt_error?: any): void;
+
+            /**
+             * Resolves this promise with the given value. If the value is itself a
+             * promise and not a reference to this deferred, this instance will wait for
+             * it before resolving.
+             * @param {*=} opt_value The resolved value.
+             */
+            fulfill(opt_value?: T): void;
+
+            /**
+             * Removes all of the listeners previously registered on this deferred.
+             * @throws {Error} If this deferred has already been resolved.
+             */
+            removeAll(): void;
+
+            //endregion
+        }
+
+        interface IControlFlowTimer {
+            clearInterval: (ms: number) => void;
+            clearTimeout: (ms: number) => void;
+            setInterval: (fn: Function, ms: number) => number;
+            setTimeout: (fn: Function, ms: number) => number;
+        }
+
+        /**
+         * Handles the execution of scheduled tasks, each of which may be an
+         * asynchronous operation. The control flow will ensure tasks are executed in
+         * the ordered scheduled, starting each task only once those before it have
+         * completed.
+         *
+         * Each task scheduled within this flow may return a
+         * {@link webdriver.promise.Promise} to indicate it is an asynchronous
+         * operation. The ControlFlow will wait for such promises to be resolved before
+         * marking the task as completed.
+         *
+         * Tasks and each callback registered on a {@link webdriver.promise.Promise}
+         * will be run in their own ControlFlow frame.  Any tasks scheduled within a
+         * frame will take priority over previously scheduled tasks. Furthermore, if any
+         * of the tasks in the frame fail, the remainder of the tasks in that frame will
+         * be discarded and the failure will be propagated to the user through the
+         * callback/task's promised result.
+         *
+         * Each time a ControlFlow empties its task queue, it will fire an
+         * {@link webdriver.promise.ControlFlow.EventType.IDLE IDLE} event. Conversely,
+         * whenever the flow terminates due to an unhandled error, it will remove all
+         * remaining tasks in its queue and fire an
+         * {@link webdriver.promise.ControlFlow.EventType.UNCAUGHT_EXCEPTION
+         * UNCAUGHT_EXCEPTION} event. If there are no listeners registered with the
+         * flow, the error will be rethrown to the global error handler.
+         *
+         * @extends {EventEmitter}
+         * @final
+         */
+        class ControlFlow extends EventEmitter {
+            /**
+             * @constructor
+             */
+            constructor();
+
+            /**
+             * Events that may be emitted by an {@link webdriver.promise.ControlFlow}.
+             * @enum {string}
+             */
+            static EventType: {
+                /** Emitted when all tasks have been successfully executed. */
+                    IDLE: string;
+
+                /** Emitted when a ControlFlow has been reset. */
+                    RESET: string;
+
+                /** Emitted whenever a new task has been scheduled. */
+                    SCHEDULE_TASK: string;
+
+                /**
+                 * Emitted whenever a control flow aborts due to an unhandled promise
+                 * rejection. This event will be emitted along with the offending rejection
+                 * reason. Upon emitting this event, the control flow will empty its task
+                 * queue and revert to its initial state.
+                 */
+                    UNCAUGHT_EXCEPTION: string;
+            };
+
+            /**
+             * Returns a string representation of this control flow, which is its current
+             * {@link #getSchedule() schedule}, sans task stack traces.
+             * @return {string} The string representation of this contorl flow.
+             * @override
+             */
+            toString(): string;
+
+            /**
+             * Resets this instance, clearing its queue and removing all event listeners.
+             */
+            reset(): void;
+
+            /**
+             * Generates an annotated string describing the internal state of this control
+             * flow, including the currently executing as well as pending tasks. If
+             * {@code opt_includeStackTraces === true}, the string will include the
+             * stack trace from when each task was scheduled.
+             * @param {string=} opt_includeStackTraces Whether to include the stack traces
+             *     from when each task was scheduled. Defaults to false.
+             * @return {string} String representation of this flow's internal state.
+             */
+            getSchedule(opt_includeStackTraces?: boolean): string;
+
+            /**
+             * Schedules a task for execution. If there is nothing currently in the
+             * queue, the task will be executed in the next turn of the event loop. If
+             * the task function is a generator, the task will be executed using
+             * {@link webdriver.promise.consume}.
+             *
+             * @param {function(): (T|promise.Promise<T>)} fn The function to
+             *     call to start the task. If the function returns a
+             *     {@link webdriver.promise.Promise}, this instance will wait for it to be
+             *     resolved before starting the next task.
+             * @param {string=} opt_description A description of the task.
+             * @return {!promise.Promise<T>} A promise that will be resolved
+             *     with the result of the action.
+             * @template T
+             */
+            execute<T>(fn: ()=>(T|Promise<T>), opt_description?: string): Promise<T>;
+
+            /**
+             * Inserts a {@code setTimeout} into the command queue. This is equivalent to
+             * a thread sleep in a synchronous programming language.
+             *
+             * @param {number} ms The timeout delay, in milliseconds.
+             * @param {string=} opt_description A description to accompany the timeout.
+             * @return {!webdriver.promise.Promise} A promise that will be resolved with
+             *     the result of the action.
+             */
+            timeout(ms: number, opt_description?: string): Promise<void>;
+
+            /**
+             * Schedules a task that shall wait for a condition to hold. Each condition
+             * function may return any value, but it will always be evaluated as a boolean.
+             *
+             * Condition functions may schedule sub-tasks with this instance, however,
+             * their execution time will be factored into whether a wait has timed out.
+             *
+             * In the event a condition returns a Promise, the polling loop will wait for
+             * it to be resolved before evaluating whether the condition has been satisfied.
+             * The resolution time for a promise is factored into whether a wait has timed
+             * out.
+             *
+             * If the condition function throws, or returns a rejected promise, the
+             * wait task will fail.
+             *
+             * If the condition is defined as a promise, the flow will wait for it to
+             * settle. If the timeout expires before the promise settles, the promise
+             * returned by this function will be rejected.
+             *
+             * If this function is invoked with `timeout === 0`, or the timeout is omitted,
+             * the flow will wait indefinitely for the condition to be satisfied.
+             *
+             * @param {(!promise.Promise<T>|function())} condition The condition to poll,
+             *     or a promise to wait on.
+             * @param {number=} opt_timeout How long to wait, in milliseconds, for the
+             *     condition to hold before timing out. If omitted, the flow will wait
+             *     indefinitely.
+             * @param {string=} opt_message An optional error message to include if the
+             *     wait times out; defaults to the empty string.
+             * @return {!promise.Promise<T>} A promise that will be fulfilled
+             *     when the condition has been satisified. The promise shall be rejected if
+             *     the wait times out waiting for the condition.
+             * @throws {TypeError} If condition is not a function or promise or if timeout
+             *     is not a number >= 0.
+             * @template T
+             */
+            wait<T>(condition: Promise<T>|Function, opt_timeout?: number, opt_message?: string): Promise<T>;
+        }
+    }
+
+    namespace until {
+        /**
+         * Defines a condition to
+         */
+        class Condition<T> {
+            /**
+             * @param {string} message A descriptive error message. Should complete the
+             *     sentence "Waiting [...]"
+             * @param {function(!webdriver.WebDriver): OUT} fn The condition function to
+             *     evaluate on each iteration of the wait loop.
+             * @constructor
+             */
+            constructor(message: string, fn: (webdriver: WebDriver) => any);
+
+            /** @return {string} A description of this condition. */
+            description(): string;
+
+            /** @type {function(!webdriver.WebDriver): OUT} */
+            fn(webdriver: WebDriver): any;
+        }
+
+        /**
+         * Creates a condition that will wait until the input driver is able to switch
+         * to the designated frame. The target frame may be specified as
+         *
+         * 1. a numeric index into
+         *     [window.frames](https://developer.mozilla.org/en-US/docs/Web/API/Window.frames)
+         *     for the currently selected frame.
+         * 2. a {@link ./webdriver.WebElement}, which must reference a FRAME or IFRAME
+         *     element on the current page.
+         * 3. a locator which may be used to first locate a FRAME or IFRAME on the
+         *     current page before attempting to switch to it.
+         *
+         * Upon successful resolution of this condition, the driver will be left
+         * focused on the new frame.
+         *
+         * @param {!(number|./webdriver.WebElement|By|
+         *           function(!./webdriver.WebDriver): !./webdriver.WebElement)} frame
+         *     The frame identifier.
+         * @return {!Condition<boolean>} A new condition.
+         */
+        function ableToSwitchToFrame(frame: number|WebElement|By|((webdriver: WebDriver)=>WebElement)): Condition<boolean>;
+
+        /**
+         * Creates a condition that waits for an alert to be opened. Upon success, the
+         * returned promise will be fulfilled with the handle for the opened alert.
+         *
+         * @return {!Condition<!./webdriver.Alert>} The new condition.
+         */
+        function alertIsPresent(): Condition<Alert>;
+
+        /**
+         * Creates a condition that will wait for the given element to be disabled.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isEnabled
+         */
+        function elementIsDisabled(element: WebElement): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be enabled.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isEnabled
+         */
+        function elementIsEnabled(element: WebElement): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be deselected.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isSelected
+         */
+        function elementIsNotSelected(element: WebElement): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be in the DOM,
+         * yet not visible to the user.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isDisplayed
+         */
+        function elementIsNotVisible(element: WebElement): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be selected.
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isSelected
+         */
+        function elementIsSelected(element: WebElement): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to become visible.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isDisplayed
+         */
+        function elementIsVisible(element: WebElement): Condition<boolean>;
+
+        /**
+         * Creates a condition that will loop until an element is
+         * {@link ./webdriver.WebDriver#findElement found} with the given locator.
+         *
+         * @param {!(By|Function)} locator The locator to use.
+         * @return {!until.Condition.<!webdriver.WebElement>} The new condition.
+         */
+        function elementLocated(locator: By|Function): Condition<WebElement>;
+
+        /**
+         * Creates a condition that will wait for the given element's
+         * {@link webdriver.WebDriver#getText visible text} to contain the given
+         * substring.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @param {string} substr The substring to search for.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#getText
+         */
+        function elementTextContains(element: WebElement, substr: string): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element's
+         * {@link webdriver.WebDriver#getText visible text} to match the given
+         * {@code text} exactly.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @param {string} text The expected text.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#getText
+         */
+        function elementTextIs(element: WebElement, text: string): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element's
+         * {@link webdriver.WebDriver#getText visible text} to match a regular
+         * expression.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @param {!RegExp} regex The regular expression to test against.
+         * @return {!until.Condition<boolean>} The new condition.
+         * @see webdriver.WebDriver#getText
+         */
+        function elementTextMatches(element: WebElement, regex: RegExp): Condition<boolean>;
+
+        /**
+         * Creates a condition that will loop until at least one element is
+         * {@link webdriver.WebDriver#findElement found} with the given locator.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The locator
+         *     to use.
+         * @return {!until.Condition.<!Array.<!webdriver.WebElement>>} The new
+         *     condition.
+         */
+        function elementsLocated(locator: By|Function): Condition<WebElement[]>;
+
+        /**
+         * Creates a condition that will wait for the given element to become stale. An
+         * element is considered stale once it is removed from the DOM, or a new page
+         * has loaded.
+         *
+         * @param {!webdriver.WebElement} element The element that should become stale.
+         * @return {!until.Condition<boolean>} The new condition.
+         */
+        function stalenessOf(element: WebElement): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the current page's title to contain
+         * the given substring.
+         *
+         * @param {string} substr The substring that should be present in the page
+         *     title.
+         * @return {!until.Condition.<boolean>} The new condition.
+         */
+        function titleContains(substr: string): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the current page's title to match the
+         * given value.
+         *
+         * @param {string} title The expected page title.
+         * @return {!until.Condition<boolean>} The new condition.
+         */
+        function titleIs(title: string): Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the current page's title to match the
+         * given regular expression.
+         *
+         * @param {!RegExp} regex The regular expression to test against.
+         * @return {!until.Condition.<boolean>} The new condition.
+         */
+        function titleMatches(regex: RegExp): Condition<boolean>;
+    }
+
+    interface ILocation {
+        x: number;
+        y: number;
+    }
+
+    interface ISize {
+        width: number;
+        height: number;
+    }
+
+    /**
+     * Representations of pressable keys that aren't text.  These are stored in
+     * the Unicode PUA (Private Use Area) code points, 0xE000-0xF8FF.  Refer to
+     * http://www.google.com.au/search?&q=unicode+pua&btnG=Search
+     *
+     * @enum {string}
+     */
+    enum Button {
+        LEFT,
+        MIDDLE,
+        RIGHT,
+    }
+
+    /**
+     * Representations of pressable keys that aren't text.  These are stored in
+     * the Unicode PUA (Private Use Area) code points, 0xE000-0xF8FF.  Refer to
+     * http://www.google.com.au/search?&q=unicode+pua&btnG=Search
+     *
+     * @enum {string}
+     */
+    enum Key {
+        NULL,
+        CANCEL,  // ^break
+        HELP,
+        BACK_SPACE,
+        TAB,
+        CLEAR,
+        RETURN,
+        ENTER,
+        SHIFT,
+        CONTROL,
+        ALT,
+        PAUSE,
+        ESCAPE,
+        SPACE,
+        PAGE_UP,
+        PAGE_DOWN,
+        END,
+        HOME,
+        ARROW_LEFT,
+        LEFT,
+        ARROW_UP,
+        UP,
+        ARROW_RIGHT,
+        RIGHT,
+        ARROW_DOWN,
+        DOWN,
+        INSERT,
+        DELETE,
+        SEMICOLON,
+        EQUALS,
+
+        NUMPAD0,  // number pad keys
+        NUMPAD1,
+        NUMPAD2,
+        NUMPAD3,
+        NUMPAD4,
+        NUMPAD5,
+        NUMPAD6,
+        NUMPAD7,
+        NUMPAD8,
+        NUMPAD9,
+        MULTIPLY,
+        ADD,
+        SEPARATOR,
+        SUBTRACT,
+        DECIMAL,
+        DIVIDE,
+
+        F1,  // function keys
+        F2,
+        F3,
+        F4,
+        F5,
+        F6,
+        F7,
+        F8,
+        F9,
+        F10,
+        F11,
+        F12,
+
+        COMMAND,  // Apple command key
+        META      // alias for Windows key
+
+    }
+
+    /**
+     * Class for defining sequences of complex user interactions. Each sequence
+     * will not be executed until {@link #perform} is called.
+     *
+     * Example:
+     *
+     *     new ActionSequence(driver).
+     *         keyDown(Key.SHIFT).
+     *         click(element1).
+     *         click(element2).
+     *         dragAndDrop(element3, element4).
+     *         keyUp(Key.SHIFT).
+     *         perform();
+     *
+     */
+    class ActionSequence {
+
+        //region Constructors
+
+        /**
+         * @param {!webdriver.WebDriver} driver The driver instance to use.
+         * @constructor
+         */
+        constructor(driver: WebDriver);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Executes this action sequence.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved once
+         *     this sequence has completed.
+         */
+        perform(): webdriver.promise.Promise<void>;
+
+        /**
+         * Moves the mouse.  The location to move to may be specified in terms of the
+         * mouse's current location, an offset relative to the top-left corner of an
+         * element, or an element (in which case the middle of the element is used).
+         *
+         * @param {(!./webdriver.WebElement|{x: number, y: number})} location The
+         *     location to drag to, as either another WebElement or an offset in
+         *     pixels.
+         * @param {{x: number, y: number}=} opt_offset If the target {@code location}
+         *     is defined as a {@link ./webdriver.WebElement}, this parameter defines
+         *     an offset within that element. The offset should be specified in pixels
+         *     relative to the top-left corner of the element's bounding box. If
+         *     omitted, the element's center will be used as the target offset.
+         * @return {!ActionSequence} A self reference.
+         */
+        mouseMove(location: WebElement|ILocation, opt_offset?: ILocation): ActionSequence;
+
+        /**
+         * Presses a mouse button. The mouse button will not be released until
+         * {@link #mouseUp} is called, regardless of whether that call is made in this
+         * sequence or another. The behavior for out-of-order events (e.g. mouseDown,
+         * click) is undefined.
+         *
+         * If an element is provided, the mouse will first be moved to the center
+         * of that element. This is equivalent to:
+         *
+         *     sequence.mouseMove(element).mouseDown()
+         *
+         * Warning: this method currently only supports the left mouse button. See
+         * [issue 4047](http://code.google.com/p/selenium/issues/detail?id=4047).
+         *
+         * @param {(./webdriver.WebElement|input.Button)=} opt_elementOrButton Either
+         *     the element to interact with or the button to click with.
+         *     Defaults to {@link input.Button.LEFT} if neither an element nor
+         *     button is specified.
+         * @param {input.Button=} opt_button The button to use. Defaults to
+         *     {@link input.Button.LEFT}. Ignored if a button is provided as the
+         *     first argument.
+         * @return {!ActionSequence} A self reference.
+         */
+        mouseDown(opt_elementOrButton?: WebElement|webdriver.Button, opt_button?: webdriver.Button): ActionSequence;
+
+        /**
+         * Releases a mouse button. Behavior is undefined for calling this function
+         * without a previous call to {@link #mouseDown}.
+         *
+         * If an element is provided, the mouse will first be moved to the center
+         * of that element. This is equivalent to:
+         *
+         *     sequence.mouseMove(element).mouseUp()
+         *
+         * Warning: this method currently only supports the left mouse button. See
+         * [issue 4047](http://code.google.com/p/selenium/issues/detail?id=4047).
+         *
+         * @param {(./webdriver.WebElement|input.Button)=} opt_elementOrButton Either
+         *     the element to interact with or the button to click with.
+         *     Defaults to {@link input.Button.LEFT} if neither an element nor
+         *     button is specified.
+         * @param {input.Button=} opt_button The button to use. Defaults to
+         *     {@link input.Button.LEFT}. Ignored if a button is provided as the
+         *     first argument.
+         * @return {!ActionSequence} A self reference.
+         */
+        mouseUp(opt_elementOrButton?: WebElement|webdriver.Button, opt_button?: webdriver.Button): ActionSequence;
+
+        /**
+         * Convenience function for performing a "drag and drop" manuever. The target
+         * element may be moved to the location of another element, or by an offset (in
+         * pixels).
+         *
+         * @param {!./webdriver.WebElement} element The element to drag.
+         * @param {(!./webdriver.WebElement|{x: number, y: number})} location The
+         *     location to drag to, either as another WebElement or an offset in
+         *     pixels.
+         * @return {!ActionSequence} A self reference.
+         */
+        dragAndDrop(element: WebElement, location: WebElement|ILocation): ActionSequence;
+
+        /**
+         * Clicks a mouse button.
+         *
+         * If an element is provided, the mouse will first be moved to the center
+         * of that element. This is equivalent to:
+         *
+         *     sequence.mouseMove(element).click()
+         *
+         * @param {(./webdriver.WebElement|input.Button)=} opt_elementOrButton Either
+         *     the element to interact with or the button to click with.
+         *     Defaults to {@link input.Button.LEFT} if neither an element nor
+         *     button is specified.
+         * @param {input.Button=} opt_button The button to use. Defaults to
+         *     {@link input.Button.LEFT}. Ignored if a button is provided as the
+         *     first argument.
+         * @return {!ActionSequence} A self reference.
+         */
+        click(opt_elementOrButton?: WebElement|webdriver.Button, opt_button?: webdriver.Button): ActionSequence;
+
+        /**
+         * Double-clicks a mouse button.
+         *
+         * If an element is provided, the mouse will first be moved to the center of
+         * that element. This is equivalent to:
+         *
+         *     sequence.mouseMove(element).doubleClick()
+         *
+         * Warning: this method currently only supports the left mouse button. See
+         * [issue 4047](http://code.google.com/p/selenium/issues/detail?id=4047).
+         *
+         * @param {(./webdriver.WebElement|input.Button)=} opt_elementOrButton Either
+         *     the element to interact with or the button to click with.
+         *     Defaults to {@link input.Button.LEFT} if neither an element nor
+         *     button is specified.
+         * @param {input.Button=} opt_button The button to use. Defaults to
+         *     {@link input.Button.LEFT}. Ignored if a button is provided as the
+         *     first argument.
+         * @return {!ActionSequence} A self reference.
+         */
+        doubleClick(opt_elementOrButton?: WebElement|webdriver.Button, opt_button?: webdriver.Button): ActionSequence;
+
+        /**
+         * Performs a modifier key press. The modifier key is <em>not released</em>
+         * until {@link #keyUp} or {@link #sendKeys} is called. The key press will be
+         * targetted at the currently focused element.
+         * @param {!webdriver.Key} key The modifier key to push. Must be one of
+         *     {ALT, CONTROL, SHIFT, COMMAND, META}.
+         * @return {!webdriver.ActionSequence} A self reference.
+         * @throws {Error} If the key is not a valid modifier key.
+         */
+        keyDown(key: Key): ActionSequence;
+
+        /**
+         * Performs a modifier key release. The release is targetted at the currently
+         * focused element.
+         * @param {!webdriver.Key} key The modifier key to release. Must be one of
+         *     {ALT, CONTROL, SHIFT, COMMAND, META}.
+         * @return {!webdriver.ActionSequence} A self reference.
+         * @throws {Error} If the key is not a valid modifier key.
+         */
+        keyUp(key: Key): ActionSequence;
+
+        /**
+         * Simulates typing multiple keys. Each modifier key encountered in the
+         * sequence will not be released until it is encountered again. All key events
+         * will be targetted at the currently focused element.
+         * @param {...(string|!webdriver.Key|!Array.<(string|!webdriver.Key)>)} var_args
+         *     The keys to type.
+         * @return {!webdriver.ActionSequence} A self reference.
+         * @throws {Error} If the key is not a valid modifier key.
+         */
+        sendKeys(...var_args: Array<string|Key>): ActionSequence;
+
+        //endregion
+    }
+
+
+    /**
+     * Class for defining sequences of user touch interactions. Each sequence
+     * will not be executed until {@link #perform} is called.
+     *
+     * Example:
+     *
+     *     new webdriver.TouchSequence(driver).
+     *         tapAndHold({x: 0, y: 0}).
+     *         move({x: 3, y: 4}).
+     *         release({x: 10, y: 10}).
+     *         perform();
+     */
+    class TouchSequence {
+      /*
+       * @param {!webdriver.WebDriver} driver The driver instance to use.
+       * @constructor
+       */
+      constructor(driver: WebDriver);
+
+
+      /**
+       * Executes this action sequence.
+       * @return {!webdriver.promise.Promise} A promise that will be resolved once
+       *     this sequence has completed.
+       */
+      perform(): webdriver.promise.Promise<void>;
+
+
+      /**
+       * Taps an element.
+       *
+       * @param {!webdriver.WebElement} elem The element to tap.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      tap(elem: WebElement): TouchSequence;
+
+
+      /**
+       * Double taps an element.
+       *
+       * @param {!webdriver.WebElement} elem The element to double tap.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      doubleTap(elem: WebElement): TouchSequence;
+
+
+      /**
+       * Long press on an element.
+       *
+       * @param {!webdriver.WebElement} elem The element to long press.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      longPress(elem: WebElement): TouchSequence;
+
+
+      /**
+       * Touch down at the given location.
+       *
+       * @param {{ x: number, y: number }} location The location to touch down at.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      tapAndHold(location: ILocation): TouchSequence;
+
+
+      /**
+       * Move a held {@linkplain #tapAndHold touch} to the specified location.
+       *
+       * @param {{x: number, y: number}} location The location to move to.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      move(location: ILocation): TouchSequence;
+
+
+      /**
+       * Release a held {@linkplain #tapAndHold touch} at the specified location.
+       *
+       * @param {{x: number, y: number}} location The location to release at.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      release(location: ILocation): TouchSequence;
+
+
+      /**
+       * Scrolls the touch screen by the given offset.
+       *
+       * @param {{x: number, y: number}} offset The offset to scroll to.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      scroll(offset: IOffset): TouchSequence;
+
+      /**
+       * Scrolls the touch screen, starting on `elem` and moving by the specified
+       * offset.
+       *
+       * @param {!webdriver.WebElement} elem The element where scroll starts.
+       * @param {{x: number, y: number}} offset The offset to scroll to.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      scrollFromElement(elem: WebElement, offset: IOffset): TouchSequence;
+
+      /**
+       * Flick, starting anywhere on the screen, at speed xspeed and yspeed.
+       *
+       * @param {{xspeed: number, yspeed: number}} speed The speed to flick in each
+       direction, in pixels per second.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      flick(speed: ISpeed): TouchSequence;
+
+      /**
+       * Flick starting at elem and moving by x and y at specified speed.
+       *
+       * @param {!webdriver.WebElement} elem The element where flick starts.
+       * @param {{x: number, y: number}} offset The offset to flick to.
+       * @param {number} speed The speed to flick at in pixels per second.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      flickElement(elem: WebElement, offset: IOffset, speed: number): TouchSequence;
+    }
+
+    interface IOffset {
+      x: number;
+      y: number;
+    }
+
+    interface ISpeed {
+      xspeed: number;
+      yspeed: number;
+    }
+
+    /**
+     * Represents a modal dialog such as {@code alert}, {@code confirm}, or
+     * {@code prompt}. Provides functions to retrieve the message displayed with
+     * the alert, accept or dismiss the alert, and set the response text (in the
+     * case of {@code prompt}).
+     */
+    class Alert {
+        /**
+         * @param {!WebDriver} driver The driver controlling the browser this alert
+         *     is attached to.
+         * @param {string} text The message text displayed with this alert.
+         */
+        constructor(driver: WebDriver, text: string);
+
+        //region Methods
+
+        /**
+         * Retrieves the message text displayed with this alert. For instance, if the
+         * alert were opened with alert("hello"), then this would return "hello".
+         * @return {!webdriver.promise.Promise} A promise that will be resolved to the
+         *     text displayed with this alert.
+         */
+        getText(): webdriver.promise.Promise<string>;
+
+        /**
+         * Sets the username and password in an alert prompting for credentials (such
+         * as a Basic HTTP Auth prompt). This method will implicitly
+         * {@linkplain #accept() submit} the dialog.
+         *
+         * @param {string} username The username to send.
+         * @param {string} password The password to send.
+         * @return {!promise.Promise<void>} A promise that will be resolved when this
+         *     command has completed.
+         */
+        authenticateAs(username: string, password: string): webdriver.promise.Promise<void>;
+
+        /**
+         * Accepts this alert.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     this command has completed.
+         */
+        accept(): webdriver.promise.Promise<void>;
+
+        /**
+         * Dismisses this alert.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     this command has completed.
+         */
+        dismiss(): webdriver.promise.Promise<void>;
+
+        /**
+         * Sets the response text on this alert. This command will return an error if
+         * the underlying alert does not support response text (e.g. window.alert and
+         * window.confirm).
+         * @param {string} text The text to set.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     this command has completed.
+         */
+        sendKeys(text: string): webdriver.promise.Promise<void>;
+
+        //endregion
+
+    }
+
+    /**
+     * AlertPromise is a promise that will be fulfilled with an Alert. This promise
+     * serves as a forward proxy on an Alert, allowing calls to be scheduled
+     * directly on this instance before the underlying Alert has been fulfilled. In
+     * other words, the following two statements are equivalent:
+     *
+     *     driver.switchTo().alert().dismiss();
+     *     driver.switchTo().alert().then(function(alert) {
+     *       return alert.dismiss();
+     *     });
+     *
+     * @implements {promise.Thenable.<!webdriver.Alert>}
+     * @final
+     */
+    class AlertPromise extends Alert {
+      /**
+       * @param {!WebDriver} driver The driver controlling the browser this
+       *     alert is attached to.
+       * @param {!promise.Thenable<!Alert>} alert A thenable
+       *     that will be fulfilled with the promised alert.
+       */
+      constructor(driver: WebDriver, alert: webdriver.promise.Promise<Alert>);
+    }
+
+    /** @deprecated Use {@link error.UnexpectedAlertOpenError} instead. */
+    class UnhandledAlertError extends webdriver.error.UnexpectedAlertOpenError {
+    }
+
+    /**
+     * Recognized browser names.
+     * @enum {string}
+     */
+    interface IBrowser {
+        ANDROID: string;
+        CHROME: string;
+        EDGE: string;
+        FIREFOX: string;
+        IE: string;
+        INTERNET_EXPLORER: string;
+        IPAD: string;
+        IPHONE: string;
+        OPERA: string;
+        PHANTOM_JS: string;
+        SAFARI: string;
+        HTMLUNIT: string;
+    }
+
+    var Browser: IBrowser;
+
+    interface ProxyConfig {
+        proxyType: string;
+        proxyAutoconfigUrl?: string;
+        ftpProxy?: string;
+        httpProxy?: string;
+        sslProxy?: string;
+        noProxy?: string;
+    }
+
+    /**
+     * Creates new {@link webdriver.WebDriver WebDriver} instances. The environment
+     * variables listed below may be used to override a builder's configuration,
+     * allowing quick runtime changes.
+     *
+     * - {@code SELENIUM_BROWSER}: defines the target browser in the form
+     *   {@code browser[:version][:platform]}.
+     *
+     * - {@code SELENIUM_REMOTE_URL}: defines the remote URL for all builder
+     *   instances. This environment variable should be set to a fully qualified
+     *   URL for a WebDriver server (e.g. http://localhost:4444/wd/hub). This
+     *   option always takes precedence over {@code SELENIUM_SERVER_JAR}.
+     *
+     * - {@code SELENIUM_SERVER_JAR}: defines the path to the
+     *   <a href="http://selenium-release.storage.googleapis.com/index.html">
+     *   standalone Selenium server</a> jar to use. The server will be started the
+     *   first time a WebDriver instance and be killed when the process exits.
+     *
+     * Suppose you had mytest.js that created WebDriver with
+     *
+     *     var driver = new webdriver.Builder()
+     *         .forBrowser('chrome')
+     *         .build();
+     *
+     * This test could be made to use Firefox on the local machine by running with
+     * `SELENIUM_BROWSER=firefox node mytest.js`. Rather than change the code to
+     * target Google Chrome on a remote machine, you can simply set the
+     * `SELENIUM_BROWSER` and `SELENIUM_REMOTE_URL` environment variables:
+     *
+     *     SELENIUM_BROWSER=chrome:36:LINUX \
+     *     SELENIUM_REMOTE_URL=http://www.example.com:4444/wd/hub \
+     *     node mytest.js
+     *
+     * You could also use a local copy of the standalone Selenium server:
+     *
+     *     SELENIUM_BROWSER=chrome:36:LINUX \
+     *     SELENIUM_SERVER_JAR=/path/to/selenium-server-standalone.jar \
+     *     node mytest.js
+     */
+    class Builder {
+
+        //region Constructors
+
+        /**
+         * @constructor
+         */
+        constructor();
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Configures this builder to ignore any environment variable overrides and to
+         * only use the configuration specified through this instance's API.
+         *
+         * @return {!Builder} A self reference.
+         */
+        disableEnvironmentOverrides(): Builder;
+
+        /**
+         * Creates a new WebDriver client based on this builder's current
+         * configuration.
+         *
+         * While this method will immediately return a new WebDriver instance, any
+         * commands issued against it will be deferred until the associated browser
+         * has been fully initialized. Users may call {@link #buildAsync()} to obtain
+         * a promise that will not be fulfilled until the browser has been created
+         * (the difference is purely in style).
+         *
+         * @return {!webdriver.WebDriver} A new WebDriver instance.
+         * @throws {Error} If the current configuration is invalid.
+         * @see #buildAsync()
+         */
+        build(): WebDriver;
+
+        /**
+         * Creates a new WebDriver client based on this builder's current
+         * configuration. This method returns a promise that will not be fulfilled
+         * until the new browser session has been fully initialized.
+         *
+         * __Note:__ this method is purely a convenience wrapper around
+         * {@link #build()}.
+         *
+         * @return {!promise.Promise<!webdriver.WebDriver>} A promise that will be
+         *    fulfilled with the newly created WebDriver instance once the browser
+         *    has been fully initialized.
+         * @see #build()
+         */
+        buildAsync(): webdriver.promise.Promise<WebDriver>;
+
+        /**
+         * Configures the target browser for clients created by this instance.
+         * Any calls to {@link #withCapabilities} after this function will
+         * overwrite these settings.
+         *
+         * <p>You may also define the target browser using the {@code SELENIUM_BROWSER}
+         * environment variable. If set, this environment variable should be of the
+         * form {@code browser[:[version][:platform]]}.
+         *
+         * @param {(string|webdriver.Browser)} name The name of the target browser;
+         *     common defaults are available on the {@link webdriver.Browser} enum.
+         * @param {string=} opt_version A desired version; may be omitted if any
+         *     version should be used.
+         * @param {string=} opt_platform The desired platform; may be omitted if any
+         *     version may be used.
+         * @return {!Builder} A self reference.
+         */
+        forBrowser(name: string, opt_version?: string, opt_platform?: string): Builder;
+
+        /**
+         * Returns the base set of capabilities this instance is currently configured
+         * to use.
+         * @return {!webdriver.Capabilities} The current capabilities for this builder.
+         */
+        getCapabilities(): Capabilities;
+
+        /**
+         * @return {string} The URL of the WebDriver server this instance is configured
+         *     to use.
+         */
+        getServerUrl(): string;
+
+        /**
+         * @return {?string} The URL of the proxy server to use for the WebDriver's
+         *    HTTP connections, or `null` if not set.
+         */
+        getWebDriverProxy(): string;
+
+        /**
+         * Sets the default action to take with an unexpected alert before returning
+         * an error.
+         * @param {string} beahvior The desired behavior; should be "accept", "dismiss",
+         *     or "ignore". Defaults to "dismiss".
+         * @return {!Builder} A self reference.
+         */
+        setAlertBehavior(behavior: string): Builder;
+
+        /**
+         * Sets Chrome-specific options for drivers created by this builder. Any
+         * logging or proxy settings defined on the given options will take precedence
+         * over those set through {@link #setLoggingPrefs} and {@link #setProxy},
+         * respectively.
+         *
+         * @param {!chrome.Options} options The ChromeDriver options to use.
+         * @return {!Builder} A self reference.
+         */
+        setChromeOptions(options: chrome.Options): Builder;
+
+        /**
+         * Sets the control flow that created drivers should execute actions in. If
+         * the flow is never set, or is set to {@code null}, it will use the active
+         * flow at the time {@link #build()} is called.
+         * @param {webdriver.promise.ControlFlow} flow The control flow to use, or
+         *     {@code null} to
+         * @return {!Builder} A self reference.
+         */
+        setControlFlow(flow: webdriver.promise.ControlFlow): Builder;
+
+        /**
+         * Set {@linkplain edge.Options options} specific to Microsoft's Edge browser
+         * for drivers created by this builder. Any proxy settings defined on the
+         * given options will take precedence over those set through
+         * {@link #setProxy}.
+         *
+         * @param {!edge.Options} options The MicrosoftEdgeDriver options to use.
+         * @return {!Builder} A self reference.
+         */
+        setEdgeOptions(options: edge.Options): Builder;
+
+        /**
+         * Sets whether native events should be used.
+         * @param {boolean} enabled Whether to enable native events.
+         * @return {!Builder} A self reference.
+         */
+        setEnableNativeEvents(enabled: boolean): Builder;
+
+        /**
+         * Sets Firefox-specific options for drivers created by this builder. Any
+         * logging or proxy settings defined on the given options will take precedence
+         * over those set through {@link #setLoggingPrefs} and {@link #setProxy},
+         * respectively.
+         *
+         * @param {!firefox.Options} options The FirefoxDriver options to use.
+         * @return {!Builder} A self reference.
+         */
+        setFirefoxOptions(options: firefox.Options): Builder;
+
+        /**
+         * Set Internet Explorer specific {@linkplain ie.Options options} for drivers
+         * created by this builder. Any proxy settings defined on the given options
+         * will take precedence over those set through {@link #setProxy}.
+         *
+         * @param {!ie.Options} options The IEDriver options to use.
+         * @return {!Builder} A self reference.
+         */
+        setIeOptions(options: ie.Options): Builder;
+
+        /**
+         * Sets the logging preferences for the created session. Preferences may be
+         * changed by repeated calls, or by calling {@link #withCapabilities}.
+         * @param {!(webdriver.logging.Preferences|Object.<string, string>)} prefs The
+         *     desired logging preferences.
+         * @return {!Builder} A self reference.
+         */
+        setLoggingPrefs(prefs: webdriver.logging.Preferences|Object): Builder;
+
+        /**
+         * Sets Opera specific {@linkplain opera.Options options} for drivers created
+         * by this builder. Any logging or proxy settings defined on the given options
+         * will take precedence over those set through {@link #setLoggingPrefs} and
+         * {@link #setProxy}, respectively.
+         *
+         * @param {!opera.Options} options The OperaDriver options to use.
+         * @return {!Builder} A self reference.
+         */
+        setOperaOptions(options: opera.Options): Builder;
+
+        /**
+         * Sets the proxy configuration to use for WebDriver clients created by this
+         * builder. Any calls to {@link #withCapabilities} after this function will
+         * overwrite these settings.
+         * @param {!capabilities.ProxyConfig} config The configuration to use.
+         * @return {!Builder} A self reference.
+         */
+        setProxy(config: webdriver.ProxyConfig): Builder;
+
+        /**
+         * Sets Safari specific {@linkplain safari.Options options} for drivers
+         * created by this builder. Any logging settings defined on the given options
+         * will take precedence over those set through {@link #setLoggingPrefs}.
+         *
+         * @param {!safari.Options} options The Safari options to use.
+         * @return {!Builder} A self reference.
+         */
+        setSafari(options: safari.Options): Builder;
+
+        /**
+         * Sets how elements should be scrolled into view for interaction.
+         * @param {number} behavior The desired scroll behavior: either 0 to align with
+         *     the top of the viewport or 1 to align with the bottom.
+         * @return {!Builder} A self reference.
+         */
+        setScrollBehavior(behavior: number): Builder;
+
+        /**
+         * Sets the URL of a remote WebDriver server to use. Once a remote URL has been
+         * specified, the builder direct all new clients to that server. If this method
+         * is never called, the Builder will attempt to create all clients locally.
+         *
+         * <p>As an alternative to this method, you may also set the
+         * {@code SELENIUM_REMOTE_URL} environment variable.
+         *
+         * @param {string} url The URL of a remote server to use.
+         * @return {!Builder} A self reference.
+         */
+        usingServer(url: string): Builder;
+
+        /**
+         * Sets the URL of the proxy to use for the WebDriver's HTTP connections.
+         * If this method is never called, the Builder will create a connection
+         * without a proxy.
+         *
+         * @param {string} proxy The URL of a proxy to use.
+         * @return {!Builder} A self reference.
+         */
+        usingWebDriverProxy(proxy: string): Builder;
+
+        /**
+         * Sets the desired capabilities when requesting a new session. This will
+         * overwrite any previously set capabilities.
+         * @param {!(Object|webdriver.Capabilities)} capabilities The desired
+         *     capabilities for a new session.
+         * @return {!Builder} A self reference.
+         */
+        withCapabilities(capabilities: Object|Capabilities): Builder;
+
+        //endregion
+    }
+
+    /**
+     * Describes a mechanism for locating an element on the page.
+     * @final
+     */
+    class By {
+
+      /**
+       * @param {string} using the name of the location strategy to use.
+       * @param {string} value the value to search for.
+       */
+      constructor(using: string, value: string);
+
+      /**
+       * Locates elements that have a specific class name.
+       *
+       * @param {string} name The class name to search for.
+       * @return {!By} The new locator.
+       * @see http://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes
+       * @see http://www.w3.org/TR/CSS2/selector.html#class-html
+       */
+      static className(name: string): By;
+
+      /**
+       * Locates elements using a CSS selector.
+       *
+       * @param {string} selector The CSS selector to use.
+       * @return {!By} The new locator.
+       * @see http://www.w3.org/TR/CSS2/selector.html
+       */
+      static css(selector: string): By;
+
+      /**
+       * Locates eleemnts by the ID attribute. This locator uses the CSS selector
+       * `*[id="$ID"]`, _not_ `document.getElementById`.
+       *
+       * @param {string} id The ID to search for.
+       * @return {!By} The new locator.
+       */
+      static id(id: string): By;
+
+      /**
+       * Locates link elements whose
+       * {@linkplain webdriver.WebElement#getText visible text} matches the given
+       * string.
+       *
+       * @param {string} text The link text to search for.
+       * @return {!By} The new locator.
+       */
+      static linkText(text: string): By;
+
+      /**
+       * Locates an elements by evaluating a
+       * {@linkplain webdriver.WebDriver#executeScript JavaScript expression}.
+       * The result of this expression must be an element or list of elements.
+       *
+       * @param {!(string|Function)} script The script to execute.
+       * @param {...*} var_args The arguments to pass to the script.
+       * @return {function(!./webdriver.WebDriver): !./promise.Promise}
+       *     A new JavaScript-based locator function.
+       */
+      static js(script: string|Function, ...var_args: Array<any>): (webdriver: webdriver.WebDriver) => webdriver.promise.Promise<any>;
+
+      /**
+       * Locates elements whose `name` attribute has the given value.
+       *
+       * @param {string} name The name attribute to search for.
+       * @return {!By} The new locator.
+       */
+      static name(name: string): By;
+
+      /**
+       * Locates link elements whose
+       * {@linkplain webdriver.WebElement#getText visible text} contains the given
+       * substring.
+       *
+       * @param {string} text The substring to check for in a link's visible text.
+       * @return {!By} The new locator.
+       */
+      static partialLinkText(text: string): By;
+
+      /**
+       * Locates elements with a given tag name.
+       *
+       * @param {string} name The tag name to search for.
+       * @return {!By} The new locator.
+       * @deprecated Use {@link By.css() By.css(tagName)} instead.
+       */
+      static tagName(name: string): By;
+
+      /**
+       * Locates elements matching a XPath selector. Care should be taken when
+       * using an XPath selector with a {@link webdriver.WebElement} as WebDriver
+       * will respect the context in the specified in the selector. For example,
+       * given the selector `//div`, WebDriver will search from the document root
+       * regardless of whether the locator was used with a WebElement.
+       *
+       * @param {string} xpath The XPath selector to use.
+       * @return {!By} The new locator.
+       * @see http://www.w3.org/TR/xpath/
+       */
+      static xpath(xpath: string): By;
+
+      /** @override */
+      toString(): string;
+    }
+
+    /**
+     * Short-hand expressions for the primary element locator strategies.
+     * For example the following two statements are equivalent:
+     *
+     *     var e1 = driver.findElement(webdriver.By.id('foo'));
+     *     var e2 = driver.findElement({id: 'foo'});
+     *
+     * Care should be taken when using JavaScript minifiers (such as the
+     * Closure compiler), as locator hashes will always be parsed using
+     * the un-obfuscated properties listed.
+     *
+     * @typedef {(
+     *     {className: string}|
+     *     {css: string}|
+     *     {id: string}|
+     *     {js: string}|
+     *     {linkText: string}|
+     *     {name: string}|
+     *     {partialLinkText: string}|
+     *     {tagName: string}|
+     *     {xpath: string})}
+     */
+    type ByHash = {className: string}|
+        {css: string}|
+        {id: string}|
+        {js: string}|
+        {linkText: string}|
+        {name: string}|
+        {partialLinkText: string}|
+        {tagName: string}|
+        {xpath: string};
+
+    /**
+     * Common webdriver capability keys.
+     * @enum {string}
+     */
+    interface ICapability {
+
+        /**
+         * Indicates whether a driver should accept all SSL certs by default. This
+         * capability only applies when requesting a new session. To query whether
+         * a driver can handle insecure SSL certs, see
+         * {@link webdriver.Capability.SECURE_SSL}.
+         */
+        ACCEPT_SSL_CERTS: string;
+
+
+        /**
+         * The browser name. Common browser names are defined in the
+         * {@link webdriver.Browser} enum.
+         */
+        BROWSER_NAME: string;
+
+        /**
+         * Defines how elements should be scrolled into the viewport for interaction.
+         * This capability will be set to zero (0) if elements are aligned with the
+         * top of the viewport, or one (1) if aligned with the bottom. The default
+         * behavior is to align with the top of the viewport.
+         */
+        ELEMENT_SCROLL_BEHAVIOR: string;
+
+        /**
+         * Whether the driver is capable of handling modal alerts (e.g. alert,
+         * confirm, prompt). To define how a driver <i>should</i> handle alerts,
+         * use {@link webdriver.Capability.UNEXPECTED_ALERT_BEHAVIOR}.
+         */
+        HANDLES_ALERTS: string;
+
+        /**
+         * Key for the logging driver logging preferences.
+         */
+        LOGGING_PREFS: string;
+
+        /**
+	     * Whether this session generates native events when simulating user input.
+         */
+        NATIVE_EVENTS: string;
+
+        /**
+         * Describes the platform the browser is running on. Will be one of
+         * ANDROID, IOS, LINUX, MAC, UNIX, or WINDOWS. When <i>requesting</i> a
+         * session, ANY may be used to indicate no platform preference (this is
+         * semantically equivalent to omitting the platform capability).
+         */
+        PLATFORM: string;
+
+        /**
+         * Describes the proxy configuration to use for a new WebDriver session.
+         */
+        PROXY: string;
+
+        /** Whether the driver supports changing the brower's orientation. */
+        ROTATABLE: string;
+
+        /**
+         * Whether a driver is only capable of handling secure SSL certs. To request
+         * that a driver accept insecure SSL certs by default, use
+         * {@link webdriver.Capability.ACCEPT_SSL_CERTS}.
+         */
+        SECURE_SSL: string;
+
+        /** Whether the driver supports manipulating the app cache. */
+        SUPPORTS_APPLICATION_CACHE: string;
+
+        /** Whether the driver supports locating elements with CSS selectors. */
+        SUPPORTS_CSS_SELECTORS: string;
+
+        /** Whether the browser supports JavaScript. */
+        SUPPORTS_JAVASCRIPT: string;
+
+        /** Whether the driver supports controlling the browser's location info. */
+        SUPPORTS_LOCATION_CONTEXT: string;
+
+        /** Whether the driver supports taking screenshots. */
+        TAKES_SCREENSHOT: string;
+
+        /**
+         * Defines how the driver should handle unexpected alerts. The value should
+         * be one of "accept", "dismiss", or "ignore.
+         */
+        UNEXPECTED_ALERT_BEHAVIOR: string;
+
+        /** Defines the browser version. */
+        VERSION: string;
+    }
+
+    var Capability: ICapability;
+
+    class Capabilities {
+        //region Constructors
+
+        /**
+         * @param {(webdriver.Capabilities|Object)=} opt_other Another set of
+         *     capabilities to merge into this instance.
+         * @constructor
+         */
+        constructor(opt_other?: Capabilities|Object);
+
+        //endregion
+
+        //region Methods
+
+        /** @return {!Object} The JSON representation of this instance. */
+        toJSON(): any;
+
+        /**
+         * Merges another set of capabilities into this instance. Any duplicates in
+         * the provided set will override those already set on this instance.
+         * @param {!(webdriver.Capabilities|Object)} other The capabilities to
+         *     merge into this instance.
+         * @return {!webdriver.Capabilities} A self reference.
+         */
+        merge(other: Capabilities|Object): Capabilities;
+
+        /**
+         * @param {string} key The capability to set.
+         * @param {*} value The capability value.  Capability values must be JSON
+         *     serializable. Pass {@code null} to unset the capability.
+         * @return {!webdriver.Capabilities} A self reference.
+         */
+        set(key: string, value: any): Capabilities;
+
+        /**
+         * Sets the logging preferences. Preferences may be specified as a
+         * {@link webdriver.logging.Preferences} instance, or a as a map of log-type to
+         * log-level.
+         * @param {!(webdriver.logging.Preferences|Object.<string, string>)} prefs The
+         *     logging preferences.
+         * @return {!webdriver.Capabilities} A self reference.
+         */
+        setLoggingPrefs(prefs: webdriver.logging.Preferences|Object): Capabilities;
+
+        /**
+         * Sets the proxy configuration for this instance.
+         * @param {webdriver.ProxyConfig} proxy The desired proxy configuration.
+         * @return {!webdriver.Capabilities} A self reference.
+         */
+        setProxy(proxy: ProxyConfig): Capabilities;
+
+
+        /**
+         * Sets whether native events should be used.
+         * @param {boolean} enabled Whether to enable native events.
+         * @return {!webdriver.Capabilities} A self reference.
+         */
+        setEnableNativeEvents(enabled: boolean): Capabilities;
+
+
+        /**
+         * Sets how elements should be scrolled into view for interaction.
+         * @param {number} behavior The desired scroll behavior: either 0 to align with
+         *     the top of the viewport or 1 to align with the bottom.
+         * @return {!webdriver.Capabilities} A self reference.
+         */
+        setScrollBehavior(behavior: number): Capabilities;
+
+        /**
+         * Sets the default action to take with an unexpected alert before returning
+         * an error.
+         * @param {string} behavior The desired behavior; should be "accept", "dismiss",
+         *     or "ignore". Defaults to "dismiss".
+         * @return {!webdriver.Capabilities} A self reference.
+         */
+        setAlertBehavior(behavior: string): Capabilities;
+
+        /**
+         * @param {string} key The capability to return.
+         * @return {*} The capability with the given key, or {@code null} if it has
+         *     not been set.
+         */
+        get(key: string): any;
+
+        /**
+         * @param {string} key The capability to check.
+         * @return {boolean} Whether the specified capability is set.
+         */
+        has(key: string): boolean;
+
+        //endregion
+
+        //region Static Methods
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for Android.
+         */
+        static android(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for Chrome.
+         */
+        static chrome(): Capabilities;
+
+        /**
+         * @return {!Capabilities} A basic set of capabilities for Microsoft Edge.
+         */
+        static edge(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for Firefox.
+         */
+        static firefox(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for
+         *     Internet Explorer.
+         */
+        static ie(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for iPad.
+         */
+        static ipad(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for iPhone.
+         */
+        static iphone(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for Opera.
+         */
+        static opera(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for
+         *     PhantomJS.
+         */
+        static phantomjs(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for Safari.
+         */
+        static safari(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for HTMLUnit.
+         */
+        static htmlunit(): Capabilities;
+
+        /**
+         * @return {!webdriver.Capabilities} A basic set of capabilities for HTMLUnit
+         *                                   with enabled Javascript.
+         */
+        static htmlunitwithjs(): Capabilities;
+
+        //endregion
+    }
+
+    /**
+     * An enumeration of valid command string.
+     */
+    interface ICommandName {
+        GET_SERVER_STATUS: string;
+
+        NEW_SESSION: string;
+        GET_SESSIONS: string;
+        DESCRIBE_SESSION: string;
+
+        CLOSE: string;
+        QUIT: string;
+
+        GET_CURRENT_URL: string;
+        GET: string;
+        GO_BACK: string;
+        GO_FORWARD: string;
+        REFRESH: string;
+
+        ADD_COOKIE: string;
+        GET_COOKIE: string;
+        GET_ALL_COOKIES: string;
+        DELETE_COOKIE: string;
+        DELETE_ALL_COOKIES: string;
+
+        GET_ACTIVE_ELEMENT: string;
+        FIND_ELEMENT: string;
+        FIND_ELEMENTS: string;
+        FIND_CHILD_ELEMENT: string;
+        FIND_CHILD_ELEMENTS: string;
+
+        CLEAR_ELEMENT: string;
+        CLICK_ELEMENT: string;
+        SEND_KEYS_TO_ELEMENT: string;
+        SUBMIT_ELEMENT: string;
+
+        GET_CURRENT_WINDOW_HANDLE: string;
+        GET_WINDOW_HANDLES: string;
+        GET_WINDOW_POSITION: string;
+        SET_WINDOW_POSITION: string;
+        GET_WINDOW_SIZE: string;
+        SET_WINDOW_SIZE: string;
+        MAXIMIZE_WINDOW: string;
+
+        SWITCH_TO_WINDOW: string;
+        SWITCH_TO_FRAME: string;
+        GET_PAGE_SOURCE: string;
+        GET_TITLE: string;
+
+        EXECUTE_SCRIPT: string;
+        EXECUTE_ASYNC_SCRIPT: string;
+
+        GET_ELEMENT_TEXT: string;
+        GET_ELEMENT_TAG_NAME: string;
+        IS_ELEMENT_SELECTED: string;
+        IS_ELEMENT_ENABLED: string;
+        IS_ELEMENT_DISPLAYED: string;
+        GET_ELEMENT_LOCATION: string;
+        GET_ELEMENT_LOCATION_IN_VIEW: string;
+        GET_ELEMENT_SIZE: string;
+        GET_ELEMENT_ATTRIBUTE: string;
+        GET_ELEMENT_VALUE_OF_CSS_PROPERTY: string;
+        ELEMENT_EQUALS: string;
+
+        SCREENSHOT: string;
+        IMPLICITLY_WAIT: string;
+        SET_SCRIPT_TIMEOUT: string;
+        SET_TIMEOUT: string;
+
+        ACCEPT_ALERT: string;
+        DISMISS_ALERT: string;
+        GET_ALERT_TEXT: string;
+        SET_ALERT_TEXT: string;
+
+        EXECUTE_SQL: string;
+        GET_LOCATION: string;
+        SET_LOCATION: string;
+        GET_APP_CACHE: string;
+        GET_APP_CACHE_STATUS: string;
+        CLEAR_APP_CACHE: string;
+        IS_BROWSER_ONLINE: string;
+        SET_BROWSER_ONLINE: string;
+
+        GET_LOCAL_STORAGE_ITEM: string;
+        GET_LOCAL_STORAGE_KEYS: string;
+        SET_LOCAL_STORAGE_ITEM: string;
+        REMOVE_LOCAL_STORAGE_ITEM: string;
+        CLEAR_LOCAL_STORAGE: string;
+        GET_LOCAL_STORAGE_SIZE: string;
+
+        GET_SESSION_STORAGE_ITEM: string;
+        GET_SESSION_STORAGE_KEYS: string;
+        SET_SESSION_STORAGE_ITEM: string;
+        REMOVE_SESSION_STORAGE_ITEM: string;
+        CLEAR_SESSION_STORAGE: string;
+        GET_SESSION_STORAGE_SIZE: string;
+
+        SET_SCREEN_ORIENTATION: string;
+        GET_SCREEN_ORIENTATION: string;
+
+        // These belong to the Advanced user interactions - an element is
+        // optional for these commands.
+        CLICK: string;
+        DOUBLE_CLICK: string;
+        MOUSE_DOWN: string;
+        MOUSE_UP: string;
+        MOVE_TO: string;
+        SEND_KEYS_TO_ACTIVE_ELEMENT: string;
+
+        // These belong to the Advanced Touch API
+        TOUCH_SINGLE_TAP: string;
+        TOUCH_DOWN: string;
+        TOUCH_UP: string;
+        TOUCH_MOVE: string;
+        TOUCH_SCROLL: string;
+        TOUCH_DOUBLE_TAP: string;
+        TOUCH_LONG_PRESS: string;
+        TOUCH_FLICK: string;
+
+        GET_AVAILABLE_LOG_TYPES: string;
+        GET_LOG: string;
+        GET_SESSION_LOGS: string;
+
+        UPLOAD_FILE: string;
+    }
+
+    var CommandName: ICommandName;
+
+    /**
+     * Describes a command to be executed by the WebDriverJS framework.
+     * @param {!webdriver.CommandName} name The name of this command.
+     * @constructor
+     */
+    class Command {
+        //region Constructors
+
+        /**
+         * @param {!webdriver.CommandName} name The name of this command.
+         * @constructor
+         */
+        constructor(name: string);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * @return {!webdriver.CommandName} This command's name.
+         */
+        getName(): string;
+
+        /**
+         * Sets a parameter to send with this command.
+         * @param {string} name The parameter name.
+         * @param {*} value The parameter value.
+         * @return {!webdriver.Command} A self reference.
+         */
+        setParameter(name: string, value: any): Command;
+
+        /**
+         * Sets the parameters for this command.
+         * @param {!Object.<*>} parameters The command parameters.
+         * @return {!webdriver.Command} A self reference.
+         */
+        setParameters(parameters: any): Command;
+
+        /**
+         * Returns a named command parameter.
+         * @param {string} key The parameter key to look up.
+         * @return {*} The parameter value, or undefined if it has not been set.
+         */
+        getParameter(key: string): any;
+
+        /**
+         * @return {!Object.<*>} The parameters to send with this command.
+         */
+        getParameters(): any;
+
+        //endregion
+    }
+
+    /**
+     * Handles the execution of WebDriver {@link Command commands}.
+     * @interface
+     */
+    class Executor {
+      /**
+       * Executes the given {@code command}. If there is an error executing the
+       * command, the provided callback will be invoked with the offending error.
+       * Otherwise, the callback will be invoked with a null Error and non-null
+       * response object.
+       *
+       * @param {!Command} command The command to execute.
+       * @return {!promise.Promise<?>} A promise that will be fulfilled with
+       *     the command result.
+       */
+      execute(command: Command): webdriver.promise.Promise<any>
+    }
+
+    /**
+     * Wraps a promised {@link Executor}, ensuring no commands are executed until
+     * the wrapped executor has been fully resolved.
+     * @implements {Executor}
+     */
+    class DeferredExecutor {
+      /**
+       * @param {!promise.Promise<Executor>} delegate The promised delegate, which
+       *     may be provided by any promise-like thenable object.
+       */
+      constructor(delegate: webdriver.promise.Promise<Executor>);
+    }
+
+    /**
+     * Describes an event listener registered on an {@linkplain EventEmitter}.
+     */
+    class Listener {
+      /**
+       * @param {!Function} fn The acutal listener function.
+       * @param {(Object|undefined)} scope The object in whose scope to invoke the
+       *     listener.
+       * @param {boolean} oneshot Whether this listener should only be used once.
+       */
+      constructor(fn: Function, scope: Object, oneshot: boolean);
+    }
+
+    /**
+     * Object that can emit events for others to listen for. This is used instead
+     * of Closure's event system because it is much more light weight. The API is
+     * based on Node's EventEmitters.
+     */
+    class EventEmitter {
+        //region Constructors
+
+        /**
+         * @constructor
+         */
+        constructor();
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Fires an event and calls all listeners.
+         * @param {string} type The type of event to emit.
+         * @param {...*} var_args Any arguments to pass to each listener.
+         */
+        emit(type: string, ...var_args: any[]): void;
+
+        /**
+         * Returns a mutable list of listeners for a specific type of event.
+         * @param {string} type The type of event to retrieve the listeners for.
+         * @return {!Set<!Listener>} The registered listeners for the given event
+         *     type.
+         */
+        listeners(type: string): any;
+
+        /**
+         * Registers a listener.
+         * @param {string} type The type of event to listen for.
+         * @param {!Function} fn The function to invoke when the event is fired.
+         * @param {Object=} opt_self The object in whose scope to invoke the listener.
+         * @param {boolean=} opt_oneshot Whether the listener should b (e removed after
+         *    the first event is fired.
+         * @return {!EventEmitter} A self reference.
+         * @private
+         */
+        addListener(type: string, fn: Function, opt_scope?:any, opt_oneshot?: boolean): EventEmitter;
+
+
+        /**
+         * Registers a one-time listener which will be called only the first time an
+         * event is emitted, after which it will be removed.
+         * @param {string} type The type of event to listen for.
+         * @param {!Function} fn The function to invoke when the event is fired.
+         * @param {Object=} opt_scope The object in whose scope to invoke the listener.
+         * @return {!webdriver.EventEmitter} A self reference.
+         */
+        once(type: string, fn: any, opt_scope?: any): EventEmitter;
+
+        /**
+         * An alias for {@code #addListener()}.
+         * @param {string} type The type of event to listen for.
+         * @param {!Function} fn The function to invoke when the event is fired.
+         * @param {Object=} opt_scope The object in whose scope to invoke the listener.
+         * @return {!webdriver.EventEmitter} A self reference.
+         */
+        on(type: string, fn: Function, opt_scope?:any): EventEmitter;
+
+        /**
+         * Removes a previously registered event listener.
+         * @param {string} type The type of event to unregister.
+         * @param {!Function} listenerFn The handler function to remove.
+         * @return {!webdriver.EventEmitter} A self reference.
+         */
+        removeListener(type: string, listenerFn: Function): EventEmitter;
+
+        /**
+         * Removes all listeners for a specific type of event. If no event is
+         * specified, all listeners across all types will be removed.
+         * @param {string=} opt_type The type of event to remove listeners from.
+         * @return {!webdriver.EventEmitter} A self reference.
+         */
+        removeAllListeners(opt_type?: string): EventEmitter;
+
+        //endregion
+    }
+
+
+    /**
+     * Interface for navigating back and forth in the browser history.
+     */
+    class Navigation {
+        //region Constructors
+
+        /**
+         * Interface for navigating back and forth in the browser history.
+         *
+         * This class should never be instantiated directly. Insead, obtain an instance
+         * with
+         *
+         *    webdriver.navigate()
+         *
+         * @see WebDriver#navigate()
+         */
+        constructor(driver: WebDriver);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Schedules a command to navigate to a new URL.
+         * @param {string} url The URL to navigate to.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the URL has been loaded.
+         */
+        to(url: string): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to move backwards in the browser history.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the navigation event has completed.
+         */
+        back(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to move forwards in the browser history.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the navigation event has completed.
+         */
+        forward(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to refresh the current page.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the navigation event has completed.
+         */
+        refresh(): webdriver.promise.Promise<void>;
+
+        //endregion
+    }
+
+    interface IWebDriverOptionsCookie {
+        name: string;
+        value: string;
+        path?: string;
+        domain?: string;
+        secure?: boolean;
+        expiry?: number;
+    }
+
+    /**
+     * Provides methods for managing browser and driver state.
+     */
+    class Options {
+        //region Constructors
+
+        /**
+         * @param {!webdriver.WebDriver} driver The parent driver.
+         * @constructor
+         */
+        constructor(driver: webdriver.WebDriver);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Schedules a command to add a cookie.
+         * @param {string} name The cookie name.
+         * @param {string} value The cookie value.
+         * @param {string=} opt_path The cookie path.
+         * @param {string=} opt_domain The cookie domain.
+         * @param {boolean=} opt_isSecure Whether the cookie is secure.
+         * @param {(number|!Date)=} opt_expiry When the cookie expires. If specified
+         *     as a number, should be in milliseconds since midnight,
+         *     January 1, 1970 UTC.
+         * @return {!promise.Promise<void>} A promise that will be resolved
+         *     when the cookie has been added to the page.
+         */
+        addCookie(name: string, value: string, opt_path?: string, opt_domain?: string, opt_isSecure?: boolean, opt_expiry?: number|Date): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to delete all cookies visible to the current page.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when all
+         *     cookies have been deleted.
+         */
+        deleteAllCookies(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to delete the cookie with the given name. This command is
+         * a no-op if there is no cookie with the given name visible to the current
+         * page.
+         * @param {string} name The name of the cookie to delete.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
+         *     cookie has been deleted.
+         */
+        deleteCookie(name: string): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to retrieve all cookies visible to the current page.
+         * Each cookie will be returned as a JSON object as described by the WebDriver
+         * wire protocol.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     cookies visible to the current page.
+         * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Cookie_JSON_Object
+         */
+        getCookies(): webdriver.promise.Promise<IWebDriverOptionsCookie[]>;
+
+        /**
+         * Schedules a command to retrieve the cookie with the given name. Returns null
+         * if there is no such cookie. The cookie will be returned as a JSON object as
+         * described by the WebDriver wire protocol.
+         * @param {string} name The name of the cookie to retrieve.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     named cookie, or {@code null} if there is no such cookie.
+         * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Cookie_JSON_Object
+         */
+        getCookie(name: string): webdriver.promise.Promise<IWebDriverOptionsCookie>;
+
+        /**
+         * @return {!webdriver.WebDriver.Logs} The interface for managing driver
+         *     logs.
+         */
+        logs(): webdriver.Logs;
+
+        /**
+         * @return {!webdriver.WebDriver.Timeouts} The interface for managing driver
+         *     timeouts.
+         */
+        timeouts(): webdriver.Timeouts;
+
+        /**
+         * @return {!webdriver.WebDriver.Window} The interface for managing the
+         *     current window.
+         */
+        window(): webdriver.Window;
+
+        //endregion
+    }
+
+    /**
+     * An interface for managing timeout behavior for WebDriver instances.
+     */
+    class Timeouts {
+        //region Constructors
+
+        /**
+         * @param {!webdriver.WebDriver} driver The parent driver.
+         * @constructor
+         */
+        constructor(driver: webdriver.WebDriver);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Specifies the amount of time the driver should wait when searching for an
+         * element if it is not immediately present.
+         * <p/>
+         * When searching for a single element, the driver should poll the page
+         * until the element has been found, or this timeout expires before failing
+         * with a {@code bot.ErrorCode.NO_SUCH_ELEMENT} error. When searching
+         * for multiple elements, the driver should poll the page until at least one
+         * element has been found or this timeout has expired.
+         * <p/>
+         * Setting the wait timeout to 0 (its default value), disables implicit
+         * waiting.
+         * <p/>
+         * Increasing the implicit wait timeout should be used judiciously as it
+         * will have an adverse effect on test run time, especially when used with
+         * slower location strategies like XPath.
+         *
+         * @param {number} ms The amount of time to wait, in milliseconds.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
+         *     implicit wait timeout has been set.
+         */
+        implicitlyWait(ms: number): webdriver.promise.Promise<void>;
+
+        /**
+         * Sets the amount of time to wait, in milliseconds, for an asynchronous script
+         * to finish execution before returning an error. If the timeout is less than or
+         * equal to 0, the script will be allowed to run indefinitely.
+         *
+         * @param {number} ms The amount of time to wait, in milliseconds.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
+         *     script timeout has been set.
+         */
+        setScriptTimeout(ms: number): webdriver.promise.Promise<void>;
+
+        /**
+         * Sets the amount of time to wait for a page load to complete before returning
+         * an error.  If the timeout is negative, page loads may be indefinite.
+         * @param {number} ms The amount of time to wait, in milliseconds.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     the timeout has been set.
+         */
+        pageLoadTimeout(ms: number): webdriver.promise.Promise<void>;
+
+        //endregion
+    }
+
+    /**
+     * An interface for managing the current window.
+     */
+    class Window {
+
+        //region Constructors
+
+        /**
+         * @param {!webdriver.WebDriver} driver The parent driver.
+         * @constructor
+         */
+        constructor(driver: webdriver.WebDriver);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Retrieves the window's current position, relative to the top left corner of
+         * the screen.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     window's position in the form of a {x:number, y:number} object literal.
+         */
+        getPosition(): webdriver.promise.Promise<ILocation>;
+
+        /**
+         * Repositions the current window.
+         * @param {number} x The desired horizontal position, relative to the left side
+         *     of the screen.
+         * @param {number} y The desired vertical position, relative to the top of the
+         *     of the screen.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
+         *     command has completed.
+         */
+        setPosition(x: number, y: number): webdriver.promise.Promise<void>;
+
+        /**
+         * Retrieves the window's current size.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     window's size in the form of a {width:number, height:number} object
+         *     literal.
+         */
+        getSize(): webdriver.promise.Promise<ISize>;
+
+        /**
+         * Resizes the current window.
+         * @param {number} width The desired window width.
+         * @param {number} height The desired window height.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
+         *     command has completed.
+         */
+        setSize(width: number, height: number): webdriver.promise.Promise<void>;
+
+        /**
+         * Maximizes the current window.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
+         *     command has completed.
+         */
+        maximize(): webdriver.promise.Promise<void>;
+
+        //endregion
+    }
+
+    /**
+     * Interface for managing WebDriver log records.
+     */
+    class Logs {
+
+        //region Constructors
+
+        /**
+         * @param {!webdriver.WebDriver} driver The parent driver.
+         * @constructor
+         */
+        constructor(driver: webdriver.WebDriver);
+
+        //endregion
+
+        //region
+
+        /**
+         * Fetches available log entries for the given type.
+         *
+         * <p/>Note that log buffers are reset after each call, meaning that
+         * available log entries correspond to those entries not yet returned for a
+         * given log type. In practice, this means that this call will return the
+         * available log entries since the last call, or from the start of the
+         * session.
+         *
+         * @param {!webdriver.logging.Type} type The desired log type.
+         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.logging.Entry>>} A
+         *   promise that will resolve to a list of log entries for the specified
+         *   type.
+         */
+        get(type: webdriver.logging.Type): webdriver.promise.Promise<webdriver.logging.Entry[]>;
+
+        /**
+         * Retrieves the log types available to this driver.
+         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.logging.Type>>} A
+         *     promise that will resolve to a list of available log types.
+         */
+        getAvailableLogTypes(): webdriver.promise.Promise<string[]>;
+
+        //endregion
+    }
+
+    /**
+     * An interface for changing the focus of the driver to another frame or window.
+     */
+    class TargetLocator {
+
+        //region Constructors
+
+        /**
+         * @param {!webdriver.WebDriver} driver The parent driver.
+         * @constructor
+         */
+        constructor(driver: webdriver.WebDriver);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * Schedules a command retrieve the {@code document.activeElement} element on
+         * the current document, or {@code document.body} if activeElement is not
+         * available.
+         * @return {!webdriver.WebElement} The active element.
+         */
+        activeElement(): WebElementPromise;
+
+        /**
+         * Schedules a command to switch focus of all future commands to the first frame
+         * on the page.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
+         *     driver has changed focus to the default content.
+         */
+        defaultContent(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to switch the focus of all future commands to another
+         * frame on the page. The target frame may be specified as one of the
+         * following:
+         *
+         * - A number that specifies a (zero-based) index into [window.frames](
+         *   https://developer.mozilla.org/en-US/docs/Web/API/Window.frames).
+         * - A {@link WebElement} reference, which correspond to a `frame` or `iframe`
+         *   DOM element.
+         * - The `null` value, to select the topmost frame on the page. Passing `null`
+         *   is the same as calling {@link #defaultContent defaultContent()}.
+         *
+         * If the specified frame can not be found, the returned promise will be
+         * rejected with a {@linkplain error.NoSuchFrameError}.
+         *
+         * @param {(number|WebElement|null)} id The frame locator.
+         * @return {!promise.Promise<void>} A promise that will be resolved
+         *     when the driver has changed focus to the specified frame.
+         */
+        frame(nameOrIndex: number|WebElement): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to switch the focus of all future commands to another
+         * window. Windows may be specified by their {@code window.name} attribute or
+         * by its handle (as returned by {@link WebDriver#getWindowHandles}).
+         *
+         * If the specified window cannot be found, the returned promise will be
+         * rejected with a {@linkplain error.NoSuchWindowError}.
+         *
+         * @param {string} nameOrHandle The name or window handle of the window to
+         *     switch focus to.
+         * @return {!promise.Promise<void>} A promise that will be resolved
+         *     when the driver has changed focus to the specified window.
+         */
+        window(nameOrHandle: string): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to change focus to the active modal dialog, such as
+         * those opened by `window.alert()`, `window.confirm()`, and
+         * `window.prompt()`. The returned promise will be rejected with a
+         * {@linkplain error.NoSuchAlertError} if there are no open alerts.
+         *
+         * @return {!AlertPromise} The open alert.
+         */
+        alert(): AlertPromise;
+
+        //endregion
+    }
+
+    /**
+     * Used with {@link webdriver.WebElement#sendKeys WebElement#sendKeys} on file
+     * input elements ({@code <input type="file">}) to detect when the entered key
+     * sequence defines the path to a file.
+     *
+     * By default, {@linkplain webdriver.WebElement WebElement's} will enter all
+     * key sequences exactly as entered. You may set a
+     * {@linkplain webdriver.WebDriver#setFileDetector file detector} on the parent
+     * WebDriver instance to define custom behavior for handling file elements. Of
+     * particular note is the {@link selenium-webdriver/remote.FileDetector}, which
+     * should be used when running against a remote
+     * [Selenium Server](http://docs.seleniumhq.org/download/).
+     */
+    class FileDetector {
+      /** @constructor */
+      constructor();
+
+      /**
+       * Handles the file specified by the given path, preparing it for use with
+       * the current browser. If the path does not refer to a valid file, it will
+       * be returned unchanged, otherwisee a path suitable for use with the current
+       * browser will be returned.
+       *
+       * This default implementation is a no-op. Subtypes may override this
+       * function for custom tailored file handling.
+       *
+       * @param {!webdriver.WebDriver} driver The driver for the current browser.
+       * @param {string} path The path to process.
+       * @return {!webdriver.promise.Promise<string>} A promise for the processed
+       *     file path.
+       * @package
+       */
+      handleFile(driver: webdriver.WebDriver, path: string): webdriver.promise.Promise<string>;
+    }
+
+    /**
+     * Creates a new WebDriver client, which provides control over a browser.
+     *
+     * Every WebDriver command returns a {@code webdriver.promise.Promise} that
+     * represents the result of that command. Callbacks may be registered on this
+     * object to manipulate the command result or catch an expected error. Any
+     * commands scheduled with a callback are considered sub-commands and will
+     * execute before the next command in the current frame. For example:
+     *
+     *   var message = [];
+     *   driver.call(message.push, message, 'a').then(function() {
+     *     driver.call(message.push, message, 'b');
+     *   });
+     *   driver.call(message.push, message, 'c');
+     *   driver.call(function() {
+     *     alert('message is abc? ' + (message.join('') == 'abc'));
+     *   });
+     *
+     */
+    class WebDriver {
+        //region Constructors
+
+        /**
+         * @param {!(Session|promise.Promise<!Session>)} session Either a
+         *     known session or a promise that will be resolved to a session.
+         * @param {!command.Executor} executor The executor to use when sending
+         *     commands to the browser.
+         * @param {promise.ControlFlow=} opt_flow The flow to
+         *     schedule commands through. Defaults to the active flow object.
+         */
+         constructor(session: Session|webdriver.promise.Promise<Session>, executor: Executor, opt_flow?: webdriver.promise.ControlFlow);
+
+        //endregion
+
+        //region StaticMethods
+
+        /**
+         * Creates a new WebDriver client for an existing session.
+         * @param {!command.Executor} executor Command executor to use when querying
+         *     for session details.
+         * @param {string} sessionId ID of the session to attach to.
+         * @param {promise.ControlFlow=} opt_flow The control flow all
+         *     driver commands should execute under. Defaults to the
+         *     {@link promise.controlFlow() currently active}  control flow.
+         * @return {!WebDriver} A new client for the specified session.
+         */
+        static attachToSession(executor: Executor, sessionId: string, opt_flow?: webdriver.promise.ControlFlow): WebDriver;
+
+        /**
+         * Creates a new WebDriver session.
+         * @param {!command.Executor} executor The executor to create the new session
+         *     with.
+         * @param {!./capabilities.Capabilities} desiredCapabilities The desired
+         *     capabilities for the new session.
+         * @param {promise.ControlFlow=} opt_flow The control flow all driver
+         *     commands should execute under, including the initial session creation.
+         *     Defaults to the {@link promise.controlFlow() currently active}
+         *     control flow.
+         * @return {!WebDriver} The driver for the newly created session.
+         */
+        static createSession(executor: Executor, desiredCapabilities: Capabilities, opt_flow?: webdriver.promise.ControlFlow): WebDriver;
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * @return {!webdriver.promise.ControlFlow} The control flow used by this
+         *     instance.
+         */
+        controlFlow(): webdriver.promise.ControlFlow;
+
+        /**
+         * Schedules a {@link command.Command} to be executed by this driver's
+         * {@link command.Executor}.
+         *
+         * @param {!command.Command} command The command to schedule.
+         * @param {string} description A description of the command for debugging.
+         * @return {!promise.Promise<T>} A promise that will be resolved
+         *     with the command result.
+         * @template T
+         */
+        schedule<T>(command: Command, description: string): webdriver.promise.Promise<T>;
+
+
+        /**
+         * Sets the {@linkplain input.FileDetector file detector} that should be
+         * used with this instance.
+         * @param {input.FileDetector} detector The detector to use or {@code null}.
+         */
+        setFileDetector(detector: FileDetector): void;
+
+
+        /**
+         * @return {!webdriver.promise.Promise.<!webdriver.Session>} A promise for this
+         *     client's session.
+         */
+        getSession(): webdriver.promise.Promise<Session>;
+
+
+        /**
+         * @return {!webdriver.promise.Promise.<!webdriver.Capabilities>} A promise
+         *     that will resolve with the this instance's capabilities.
+         */
+        getCapabilities(): webdriver.promise.Promise<Capabilities>;
+
+
+        /**
+         * Schedules a command to quit the current session. After calling quit, this
+         * instance will be invalidated and may no longer be used to issue commands
+         * against the browser.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the command has completed.
+         */
+        quit(): webdriver.promise.Promise<void>;
+
+        /**
+         * Creates a new action sequence using this driver. The sequence will not be
+         * scheduled for execution until {@link actions.ActionSequence#perform} is
+         * called. Example:
+         *
+         *     driver.actions().
+         *         mouseDown(element1).
+         *         mouseMove(element2).
+         *         mouseUp().
+         *         perform();
+         *
+         * @return {!actions.ActionSequence} A new action sequence for this instance.
+         */
+        actions(): ActionSequence;
+
+
+        /**
+         * Creates a new touch sequence using this driver. The sequence will not be
+         * scheduled for execution until {@link actions.TouchSequence#perform} is
+         * called. Example:
+         *
+         *     driver.touchActions().
+         *         tap(element1).
+         *         doubleTap(element2).
+         *         perform();
+         *
+         * @return {!actions.TouchSequence} A new touch sequence for this instance.
+         */
+        touchActions(): TouchSequence;
+
+
+        /**
+         * Schedules a command to execute JavaScript in the context of the currently
+         * selected frame or window. The script fragment will be executed as the body
+         * of an anonymous function. If the script is provided as a function object,
+         * that function will be converted to a string for injection into the target
+         * window.
+         *
+         * Any arguments provided in addition to the script will be included as script
+         * arguments and may be referenced using the {@code arguments} object.
+         * Arguments may be a boolean, number, string, or {@code webdriver.WebElement}.
+         * Arrays and objects may also be used as script arguments as long as each item
+         * adheres to the types previously mentioned.
+         *
+         * The script may refer to any variables accessible from the current window.
+         * Furthermore, the script will execute in the window's context, thus
+         * {@code document} may be used to refer to the current document. Any local
+         * variables will not be available once the script has finished executing,
+         * though global variables will persist.
+         *
+         * If the script has a return value (i.e. if the script contains a return
+         * statement), then the following steps will be taken for resolving this
+         * functions return value:
+         *
+         * - For a HTML element, the value will resolve to a
+         *     {@link webdriver.WebElement}
+         * - Null and undefined return values will resolve to null</li>
+         * - Booleans, numbers, and strings will resolve as is</li>
+         * - Functions will resolve to their string representation</li>
+         * - For arrays and objects, each member item will be converted according to
+         *     the rules above
+         *
+         * @param {!(string|Function)} script The script to execute.
+         * @param {...*} var_args The arguments to pass to the script.
+         * @return {!webdriver.promise.Promise.<T>} A promise that will resolve to the
+         *    scripts return value.
+         * @template T
+         */
+        executeScript<T>(script: string|Function, ...var_args: any[]): webdriver.promise.Promise<T>;
+
+        /**
+         * Schedules a command to execute asynchronous JavaScript in the context of the
+         * currently selected frame or window. The script fragment will be executed as
+         * the body of an anonymous function. If the script is provided as a function
+         * object, that function will be converted to a string for injection into the
+         * target window.
+         *
+         * Any arguments provided in addition to the script will be included as script
+         * arguments and may be referenced using the {@code arguments} object.
+         * Arguments may be a boolean, number, string, or {@code webdriver.WebElement}.
+         * Arrays and objects may also be used as script arguments as long as each item
+         * adheres to the types previously mentioned.
+         *
+         * Unlike executing synchronous JavaScript with {@link #executeScript},
+         * scripts executed with this function must explicitly signal they are finished
+         * by invoking the provided callback. This callback will always be injected
+         * into the executed function as the last argument, and thus may be referenced
+         * with {@code arguments[arguments.length - 1]}. The following steps will be
+         * taken for resolving this functions return value against the first argument
+         * to the script's callback function:
+         *
+         * - For a HTML element, the value will resolve to a
+         *     {@link webdriver.WebElement}
+         * - Null and undefined return values will resolve to null
+         * - Booleans, numbers, and strings will resolve as is
+         * - Functions will resolve to their string representation
+         * - For arrays and objects, each member item will be converted according to
+         *     the rules above
+         *
+         * __Example #1:__ Performing a sleep that is synchronized with the currently
+         * selected window:
+         *
+         *     var start = new Date().getTime();
+         *     driver.executeAsyncScript(
+         *         'window.setTimeout(arguments[arguments.length - 1], 500);').
+         *         then(function() {
+         *           console.log(
+         *               'Elapsed time: ' + (new Date().getTime() - start) + ' ms');
+         *         });
+         *
+         * __Example #2:__ Synchronizing a test with an AJAX application:
+         *
+         *     var button = driver.findElement(By.id('compose-button'));
+         *     button.click();
+         *     driver.executeAsyncScript(
+         *         'var callback = arguments[arguments.length - 1];' +
+         *         'mailClient.getComposeWindowWidget().onload(callback);');
+         *     driver.switchTo().frame('composeWidget');
+         *     driver.findElement(By.id('to')).sendKeys('dog@example.com');
+         *
+         * __Example #3:__ Injecting a XMLHttpRequest and waiting for the result. In
+         * this example, the inject script is specified with a function literal. When
+         * using this format, the function is converted to a string for injection, so it
+         * should not reference any symbols not defined in the scope of the page under
+         * test.
+         *
+         *     driver.executeAsyncScript(function() {
+         *       var callback = arguments[arguments.length - 1];
+         *       var xhr = new XMLHttpRequest();
+         *       xhr.open("GET", "/resource/data.json", true);
+         *       xhr.onreadystatechange = function() {
+         *         if (xhr.readyState == 4) {
+         *           callback(xhr.responseText);
+         *         }
+         *       }
+         *       xhr.send('');
+         *     }).then(function(str) {
+         *       console.log(JSON.parse(str)['food']);
+         *     });
+         *
+         * @param {!(string|Function)} script The script to execute.
+         * @param {...*} var_args The arguments to pass to the script.
+         * @return {!webdriver.promise.Promise.<T>} A promise that will resolve to the
+         *    scripts return value.
+         * @template T
+         */
+        executeAsyncScript<T>(script: string|Function, ...var_args: any[]): webdriver.promise.Promise<T>;
+
+        /**
+         * Schedules a command to execute a custom function.
+         * @param {function(...): (T|webdriver.promise.Promise.<T>)} fn The function to
+         *     execute.
+         * @param {Object=} opt_scope The object in whose scope to execute the function.
+         * @param {...*} var_args Any arguments to pass to the function.
+         * @return {!webdriver.promise.Promise.<T>} A promise that will be resolved'
+         *     with the function's result.
+         * @template T
+         */
+        call<T>(fn: (...var_args: any[])=>(T|webdriver.promise.Promise<T>), opt_scope?: any, ...var_args: any[]): webdriver.promise.Promise<T>;
+
+        /**
+         * Schedules a command to wait for a condition to hold. The condition may be
+         * specified by a {@link webdriver.until.Condition}, as a custom function, or
+         * as a {@link webdriver.promise.Promise}.
+         *
+         * For a {@link webdriver.until.Condition} or function, the wait will repeatedly
+         * evaluate the condition until it returns a truthy value. If any errors occur
+         * while evaluating the condition, they will be allowed to propagate. In the
+         * event a condition returns a {@link webdriver.promise.Promise promise}, the
+         * polling loop will wait for it to be resolved and use the resolved value for
+         * whether the condition has been satisified. Note the resolution time for
+         * a promise is factored into whether a wait has timed out.
+         *
+         * *Example:* waiting up to 10 seconds for an element to be present and visible
+         * on the page.
+         *
+         *     var button = driver.wait(until.elementLocated(By.id('foo'), 10000);
+         *     button.click();
+         *
+         * This function may also be used to block the command flow on the resolution
+         * of a {@link webdriver.promise.Promise promise}. When given a promise, the
+         * command will simply wait for its resolution before completing. A timeout may
+         * be provided to fail the command if the promise does not resolve before the
+         * timeout expires.
+         *
+         * *Example:* Suppose you have a function, `startTestServer`, that returns a
+         * promise for when a server is ready for requests. You can block a `WebDriver`
+         * client on this promise with:
+         *
+         *     var started = startTestServer();
+         *     driver.wait(started, 5 * 1000, 'Server should start within 5 seconds');
+         *     driver.get(getServerUrl());
+         *
+         * @param {!(webdriver.promise.Promise<T>|
+         *           webdriver.until.Condition<T>|
+         *           function(!webdriver.WebDriver): T)} condition The condition to
+         *     wait on, defined as a promise, condition object, or  a function to
+         *     evaluate as a condition.
+         * @param {number=} opt_timeout How long to wait for the condition to be true.
+         * @param {string=} opt_message An optional message to use if the wait times
+         *     out.
+         * @return {!webdriver.promise.Promise<T>} A promise that will be fulfilled
+         *     with the first truthy value returned by the condition function, or
+         *     rejected if the condition times out.
+         * @template T
+         */
+        wait<T>(condition: webdriver.promise.Promise<T>|webdriver.until.Condition<T>|((driver: WebDriver)=>T), timeout?: number, opt_message?: string): webdriver.promise.Promise<T>;
+
+        /**
+         * Schedules a command to make the driver sleep for the given amount of time.
+         * @param {number} ms The amount of time, in milliseconds, to sleep.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the sleep has finished.
+         */
+        sleep(ms: number): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to retrieve they current window handle.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current window handle.
+         */
+        getWindowHandle(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to retrieve the current list of available window handles.
+         * @return {!webdriver.promise.Promise.<!Array.<string>>} A promise that will
+         *     be resolved with an array of window handles.
+         */
+        getAllWindowHandles(): webdriver.promise.Promise<string[]>;
+
+        /**
+         * Schedules a command to retrieve the current page's source. The page source
+         * returned is a representation of the underlying DOM: do not expect it to be
+         * formatted or escaped in the same way as the response sent from the web
+         * server.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current page source.
+         */
+        getPageSource(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to close the current window.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when this command has completed.
+         */
+        close(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to navigate to the given URL.
+         * @param {string} url The fully qualified URL to open.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the document has finished loading.
+         */
+        get(url: string): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to retrieve the URL of the current page.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current URL.
+         */
+        getCurrentUrl(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to retrieve the current page's title.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current page's title.
+         */
+        getTitle(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedule a command to find an element on the page. If the element cannot be
+         * found, a {@link bot.ErrorCode.NO_SUCH_ELEMENT} result will be returned
+         * by the driver. Unlike other commands, this error cannot be suppressed. In
+         * other words, scheduling a command to find an element doubles as an assert
+         * that the element is present on the page. To test whether an element is
+         * present on the page, use {@link #isElementPresent} instead.
+         *
+         * The search criteria for an element may be defined using one of the
+         * factories in the {@link webdriver.By} namespace, or as a short-hand
+         * {@link webdriver.By.Hash} object. For example, the following two statements
+         * are equivalent:
+         *
+         *     var e1 = driver.findElement(By.id('foo'));
+         *     var e2 = driver.findElement({id:'foo'});
+         *
+         * You may also provide a custom locator function, which takes as input this
+         * instance and returns a {@link WebElement}, or a promise that will resolve
+         * to a WebElement. If the returned promise resolves to an array of
+         * WebElements, WebDriver will use the first element. For example, to find the
+         * first visible link on a page, you could write:
+         *
+         *     var link = driver.findElement(firstVisibleLink);
+         *
+         *     function firstVisibleLink(driver) {
+         *       var links = driver.findElements(By.tagName('a'));
+         *       return promise.filter(links, function(link) {
+         *         return link.isDisplayed();
+         *       });
+         *     }
+         *
+         * @param {!(by.By|Function)} locator The locator to use.
+         * @return {!WebElementPromise} A WebElement that can be used to issue
+         *     commands against the located element. If the element is not found, the
+         *     element will be invalidated and all scheduled commands aborted.
+         */
+        findElement(locator: By|Function): WebElementPromise;
+
+        /**
+         * Schedules a command to test if an element is present on the page.
+         *
+         * If given a DOM element, this function will check if it belongs to the
+         * document the driver is currently focused on. Otherwise, the function will
+         * test if at least one element can be found with the given search criteria.
+         *
+         * @param {!(by.By|Function)} locator The locator to use.
+         * @return {!promise.Promise<boolean>} A promise that will resolve
+         *     with whether the element is present on the page.
+         * @deprecated This method will be removed in Selenium 3.0 for consistency
+         *     with the other Selenium language bindings. This method is equivalent
+         *     to
+         *
+         *      driver.findElements(locator).then(e => !!e.length);
+         */
+        isElementPresent(locatorOrElement: By|Function): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedule a command to search for multiple elements on the page.
+         *
+         * @param {!(by.By|Function)} locator The locator to use.
+         * @return {!promise.Promise.<!Array.<!WebElement>>} A
+         *     promise that will resolve to an array of WebElements.
+         */
+        findElements(locator: By|Function): webdriver.promise.Promise<WebElement[]>;
+
+        /**
+         * Schedule a command to take a screenshot. The driver makes a best effort to
+         * return a screenshot of the following, in order of preference:
+         *
+         * 1. Entire page
+         * 2. Current window
+         * 3. Visible portion of the current frame
+         * 4. The entire display containing the browser
+         *
+         * @return {!promise.Promise<string>} A promise that will be
+         *     resolved to the screenshot as a base-64 encoded PNG.
+         */
+        takeScreenshot(): webdriver.promise.Promise<string>;
+
+        /**
+         * @return {!webdriver.WebDriver.Options} The options interface for this
+         *     instance.
+         */
+        manage(): webdriver.Options;
+
+        /**
+         * @return {!webdriver.WebDriver.Navigation} The navigation interface for this
+         *     instance.
+         */
+        navigate(): Navigation;
+
+        /**
+         * @return {!webdriver.WebDriver.TargetLocator} The target locator interface for
+         *     this instance.
+         */
+        switchTo(): webdriver.TargetLocator;
+
+        //endregion
+    }
+
+    interface IWebElementId {
+        [ELEMENT:string]: string;
+    }
+
+    /**
+     * Represents a DOM element. WebElements can be found by searching from the
+     * document root using a {@code webdriver.WebDriver} instance, or by searching
+     * under another {@code webdriver.WebElement}:
+     * <pre><code>
+     *   driver.get('http://www.google.com');
+     *   var searchForm = driver.findElement(By.tagName('form'));
+     *   var searchBox = searchForm.findElement(By.name('q'));
+     *   searchBox.sendKeys('webdriver');
+     * </code></pre>
+     *
+     * The WebElement is implemented as a promise for compatibility with the promise
+     * API. It will always resolve itself when its internal state has been fully
+     * resolved and commands may be issued against the element. This can be used to
+     * catch errors when an element cannot be located on the page:
+     * <pre><code>
+     *   driver.findElement(By.id('not-there')).then(function(element) {
+     *     alert('Found an element that was not expected to be there!');
+     *   }, function(error) {
+     *     alert('The element was not found, as expected');
+     *   });
+     * </code></pre>
+     */
+    interface IWebElement {
+        //region Methods
+
+        /**
+         * Schedules a command to click on this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     the click command has completed.
+         */
+        click(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to type a sequence on the DOM element represented by this
+         * instance.
+         * <p/>
+         * Modifier keys (SHIFT, CONTROL, ALT, META) are stateful; once a modifier is
+         * processed in the keysequence, that key state is toggled until one of the
+         * following occurs:
+         * <ul>
+         * <li>The modifier key is encountered again in the sequence. At this point the
+         * state of the key is toggled (along with the appropriate keyup/down events).
+         * </li>
+         * <li>The {@code webdriver.Key.NULL} key is encountered in the sequence. When
+         * this key is encountered, all modifier keys current in the down state are
+         * released (with accompanying keyup events). The NULL key can be used to
+         * simulate common keyboard shortcuts:
+         * <code>
+         *     element.sendKeys("text was",
+         *                      webdriver.Key.CONTROL, "a", webdriver.Key.NULL,
+         *                      "now text is");
+         *     // Alternatively:
+         *     element.sendKeys("text was",
+         *                      webdriver.Key.chord(webdriver.Key.CONTROL, "a"),
+         *                      "now text is");
+         * </code></li>
+         * <li>The end of the keysequence is encountered. When there are no more keys
+         * to type, all depressed modifier keys are released (with accompanying keyup
+         * events).
+         * </li>
+         * </ul>
+         * <strong>Note:</strong> On browsers where native keyboard events are not yet
+         * supported (e.g. Firefox on OS X), key events will be synthesized. Special
+         * punctionation keys will be synthesized according to a standard QWERTY en-us
+         * keyboard layout.
+         *
+         * @param {...string} var_args The sequence of keys to
+         *     type. All arguments will be joined into a single sequence (var_args is
+         *     permitted for convenience).
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when all
+         *     keys have been typed.
+         */
+        sendKeys(...var_args: string[]): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to query for the tag/node name of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's tag name.
+         */
+        getTagName(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to query for the computed style of the element
+         * represented by this instance. If the element inherits the named style from
+         * its parent, the parent will be queried for its value.  Where possible, color
+         * values will be converted to their hex representation (e.g. #00ff00 instead of
+         * rgb(0, 255, 0)).
+         * <p/>
+         * <em>Warning:</em> the value returned will be as the browser interprets it, so
+         * it may be tricky to form a proper assertion.
+         *
+         * @param {string} cssStyleProperty The name of the CSS style property to look
+         *     up.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     requested CSS value.
+         */
+        getCssValue(cssStyleProperty: string): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to query for the value of the given attribute of the
+         * element. Will return the current value even if it has been modified after the
+         * page has been loaded. More exactly, this method will return the value of the
+         * given attribute, unless that attribute is not present, in which case the
+         * value of the property with the same name is returned. If neither value is
+         * set, null is returned. The "style" attribute is converted as best can be to a
+         * text representation with a trailing semi-colon. The following are deemed to
+         * be "boolean" attributes and will be returned as thus:
+         *
+         * <p>async, autofocus, autoplay, checked, compact, complete, controls, declare,
+         * defaultchecked, defaultselected, defer, disabled, draggable, ended,
+         * formnovalidate, hidden, indeterminate, iscontenteditable, ismap, itemscope,
+         * loop, multiple, muted, nohref, noresize, noshade, novalidate, nowrap, open,
+         * paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
+         * selected, spellcheck, truespeed, willvalidate
+         *
+         * <p>Finally, the following commonly mis-capitalized attribute/property names
+         * are evaluated as expected:
+         * <ul>
+         *   <li>"class"
+         *   <li>"readonly"
+         * </ul>
+         * @param {string} attributeName The name of the attribute to query.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     attribute's value.
+         */
+        getAttribute(attributeName: string): webdriver.promise.Promise<string>;
+
+        /**
+         * Get the visible (i.e. not hidden by CSS) innerText of this element, including
+         * sub-elements, without any leading or trailing whitespace.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's visible text.
+         */
+        getText(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to compute the size of this element's bounding box, in
+         * pixels.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's size as a {@code {width:number, height:number}} object.
+         */
+        getSize(): webdriver.promise.Promise<ISize>;
+
+        /**
+         * Schedules a command to compute the location of this element in page space.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved to the
+         *     element's location as a {@code {x:number, y:number}} object.
+         */
+        getLocation(): webdriver.promise.Promise<ILocation>;
+
+        /**
+         * Schedules a command to query whether the DOM element represented by this
+         * instance is enabled, as dicted by the {@code disabled} attribute.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     whether this element is currently enabled.
+         */
+        isEnabled(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to query whether this element is selected.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     whether this element is currently selected.
+         */
+        isSelected(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to submit the form containing this element (or this
+         * element if it is a FORM element). This command is a no-op if the element is
+         * not contained in a form.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     the form has been submitted.
+         */
+        submit(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to clear the {@code value} of this element. This command
+         * has no effect if the underlying DOM element is neither a text INPUT element
+         * nor a TEXTAREA element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     the element has been cleared.
+         */
+        clear(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to test whether this element is currently displayed.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     whether this element is currently visible on the page.
+         */
+        isDisplayed(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to retrieve the outer HTML of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     the element's outer HTML.
+         */
+        getOuterHtml(): webdriver.promise.Promise<string>;
+
+        /**
+         * @return {!webdriver.promise.Promise.<webdriver.WebElement.Id>} A promise
+         *     that resolves to this element's JSON representation as defined by the
+         *     WebDriver wire protocol.
+         * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol
+         */
+        getId(): webdriver.promise.Promise<IWebElementId>;
+
+        /**
+         * Schedules a command to retrieve the inner HTML of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's inner HTML.
+         */
+        getInnerHtml(): webdriver.promise.Promise<string>;
+
+        //endregion
+    }
+
+    interface IWebElementFinders {
+        /**
+         * Schedule a command to find a descendant of this element. If the element
+         * cannot be found, a {@code bot.ErrorCode.NO_SUCH_ELEMENT} result will
+         * be returned by the driver. Unlike other commands, this error cannot be
+         * suppressed. In other words, scheduling a command to find an element doubles
+         * as an assert that the element is present on the page. To test whether an
+         * element is present on the page, use {@code #isElementPresent} instead.
+         *
+         * <p>The search criteria for an element may be defined using one of the
+         * factories in the {@link webdriver.By} namespace, or as a short-hand
+         * {@link webdriver.By.Hash} object. For example, the following two statements
+         * are equivalent:
+         * <code><pre>
+         * var e1 = element.findElement(By.id('foo'));
+         * var e2 = element.findElement({id:'foo'});
+         * </pre></code>
+         *
+         * <p>You may also provide a custom locator function, which takes as input
+         * this WebDriver instance and returns a {@link webdriver.WebElement}, or a
+         * promise that will resolve to a WebElement. For example, to find the first
+         * visible link on a page, you could write:
+         * <code><pre>
+         * var link = element.findElement(firstVisibleLink);
+         *
+         * function firstVisibleLink(element) {
+         *   var links = element.findElements(By.tagName('a'));
+         *   return webdriver.promise.filter(links, function(link) {
+         *     return links.isDisplayed();
+         *   }).then(function(visibleLinks) {
+         *     return visibleLinks[0];
+         *   });
+         * }
+         * </pre></code>
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the element.
+         * @return {!webdriver.WebElement} A WebElement that can be used to issue
+         *     commands against the located element. If the element is not found, the
+         *     element will be invalidated and all scheduled commands aborted.
+         */
+        findElement(locator: By|Function): WebElementPromise;
+
+        /**
+         * Schedules a command to test if there is at least one descendant of this
+         * element that matches the given search criteria.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the element.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether an element could be located on the page.
+         */
+        isElementPresent(locator: By|Function): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to find all of the descendants of this element that
+         * match the given search criteria.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the elements.
+         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.WebElement>>} A
+         *     promise that will resolve to an array of WebElements.
+         */
+        findElements(locator: By|Function): webdriver.promise.Promise<WebElement[]>;
+    }
+
+    /**
+     * Defines an object that can be asynchronously serialized to its WebDriver
+     * wire representation.
+     *
+     * @constructor
+     * @template T
+     */
+    interface Serializable<T> {
+        /**
+         * Returns either this instance's serialized represention, if immediately
+         * available, or a promise for its serialized representation. This function is
+         * conceptually equivalent to objects that have a {@code toJSON()} property,
+         * except the serialize() result may be a promise or an object containing a
+         * promise (which are not directly JSON friendly).
+         *
+         * @return {!(T|IThenable.<!T>)} This instance's serialized wire format.
+         */
+        serialize(): T|webdriver.promise.IThenable<T>;
+    }
+
+    /**
+     * Represents a DOM element. WebElements can be found by searching from the
+     * document root using a {@link webdriver.WebDriver} instance, or by searching
+     * under another WebElement:
+     *
+     *     driver.get('http://www.google.com');
+     *     var searchForm = driver.findElement(By.tagName('form'));
+     *     var searchBox = searchForm.findElement(By.name('q'));
+     *     searchBox.sendKeys('webdriver');
+     *
+     * The WebElement is implemented as a promise for compatibility with the promise
+     * API. It will always resolve itself when its internal state has been fully
+     * resolved and commands may be issued against the element. This can be used to
+     * catch errors when an element cannot be located on the page:
+     *
+     *     driver.findElement(By.id('not-there')).then(function(element) {
+     *       alert('Found an element that was not expected to be there!');
+     *     }, function(error) {
+     *       alert('The element was not found, as expected');
+     *     });
+     *
+     * @extends {webdriver.Serializable.<webdriver.WebElement.Id>}
+     */
+    class WebElement implements Serializable<IWebElementId> {
+        /**
+         * @param {!WebDriver} driver the parent WebDriver instance for this element.
+         * @param {(!IThenable<string>|string)} id The server-assigned opaque ID for
+         *     the underlying DOM element.
+         */
+        constructor(driver: webdriver.WebDriver, id: webdriver.promise.Promise<string>|string);
+
+        /**
+         * @param {string} id The raw ID.
+         * @param {boolean=} opt_noLegacy Whether to exclude the legacy element key.
+         * @return {!Object} The element ID for use with WebDriver's wire protocol.
+         */
+        static buildId(id: string, opt_noLegacy?: boolean): Object;
+
+        /**
+         * Extracts the encoded WebElement ID from the object.
+         *
+         * @param {?} obj The object to extract the ID from.
+         * @return {string} the extracted ID.
+         * @throws {TypeError} if the object is not a valid encoded ID.
+         */
+        static extractId(obj: IWebElementId): string;
+
+        /**
+         * @param {?} obj the object to test.
+         * @return {boolean} whether the object is a valid encoded WebElement ID.
+         */
+        static isId(obj: IWebElementId): boolean;
+
+        /**
+         * Compares two WebElements for equality.
+         *
+         * @param {!WebElement} a A WebElement.
+         * @param {!WebElement} b A WebElement.
+         * @return {!promise.Promise<boolean>} A promise that will be
+         *     resolved to whether the two WebElements are equal.
+         */
+        static equals(a: WebElement, b: WebElement): webdriver.promise.Promise<boolean>;
+
+        /**
+         * @return {!webdriver.WebDriver} The parent driver for this instance.
+         */
+        getDriver(): webdriver.WebDriver;
+
+        /**
+         * @return {!promise.Promise<string>} A promise that resolves to
+         *     the server-assigned opaque ID assigned to this element.
+         */
+        getId(): webdriver.promise.Promise<string>;
+
+        /**
+         * @deprecated Use {@link #getId()} instead.
+         */
+        getRawId(): any;
+
+        /**
+         * Schedule a command to find a descendant of this element. If the element
+         * cannot be found, a {@link bot.ErrorCode.NO_SUCH_ELEMENT} result will
+         * be returned by the driver. Unlike other commands, this error cannot be
+         * suppressed. In other words, scheduling a command to find an element doubles
+         * as an assert that the element is present on the page. To test whether an
+         * element is present on the page, use {@link #isElementPresent} instead.
+         *
+         * The search criteria for an element may be defined using one of the
+         * factories in the {@link webdriver.By} namespace, or as a short-hand
+         * {@link webdriver.By.Hash} object. For example, the following two statements
+         * are equivalent:
+         *
+         *     var e1 = element.findElement(By.id('foo'));
+         *     var e2 = element.findElement({id:'foo'});
+         *
+         * You may also provide a custom locator function, which takes as input
+         * this WebDriver instance and returns a {@link webdriver.WebElement}, or a
+         * promise that will resolve to a WebElement. For example, to find the first
+         * visible link on a page, you could write:
+         *
+         *     var link = element.findElement(firstVisibleLink);
+         *
+         *     function firstVisibleLink(element) {
+         *       var links = element.findElements(By.tagName('a'));
+         *       return webdriver.promise.filter(links, function(link) {
+         *         return links.isDisplayed();
+         *       }).then(function(visibleLinks) {
+         *         return visibleLinks[0];
+         *       });
+         *     }
+         *
+         * @param {!(by.By|Function)} locator The locator strategy to use when
+         *     searching for the element.
+         * @return {!WebElementPromise} A WebElement that can be used to issue
+         *     commands against the located element. If the element is not found, the
+         *     element will be invalidated and all scheduled commands aborted.
+         */
+        findElement(locator: By|Function): WebElementPromise;
+
+        /**
+         * Schedules a command to test if there is at least one descendant of this
+         * element that matches the given search criteria.
+         *
+         * @param {!(by.By|Function)} locator The locator strategy to use when
+         *     searching for the element.
+         * @return {!promise.Promise<boolean>} A promise that will be
+         *     resolved with whether an element could be located on the page.
+         * @deprecated This method will be removed in Selenium 3.0 for consistency
+         *     with the other Selenium language bindings. This method is equivalent
+         *     to
+         *
+         *      element.findElements(locator).then(e => !!e.length);
+         */
+        isElementPresent(locator: By|Function): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to find all of the descendants of this element that
+         * match the given search criteria.
+         *
+         * @param {!(by.By|Function)} locator The locator strategy to use when
+         *     searching for the element.
+         * @return {!promise.Promise<!Array<!WebElement>>} A
+         *     promise that will resolve to an array of WebElements.
+         */
+        findElements(locator: By|Function): webdriver.promise.Promise<WebElement[]>;
+
+        /**
+         * Schedules a command to click on this element.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the click command has completed.
+         */
+        click(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to type a sequence on the DOM element represented by this
+         * promsieinstance.
+         *
+         * Modifier keys (SHIFT, CONTROL, ALT, META) are stateful; once a modifier is
+         * processed in the keysequence, that key state is toggled until one of the
+         * following occurs:
+         *
+         * - The modifier key is encountered again in the sequence. At this point the
+         *   state of the key is toggled (along with the appropriate keyup/down events).
+         * - The {@link webdriver.Key.NULL} key is encountered in the sequence. When
+         *   this key is encountered, all modifier keys current in the down state are
+         *   released (with accompanying keyup events). The NULL key can be used to
+         *   simulate common keyboard shortcuts:
+         *
+         *         element.sendKeys("text was",
+         *                          webdriver.Key.CONTROL, "a", webdriver.Key.NULL,
+         *                          "now text is");
+         *         // Alternatively:
+         *         element.sendKeys("text was",
+         *                          webdriver.Key.chord(webdriver.Key.CONTROL, "a"),
+         *                          "now text is");
+         *
+         * - The end of the keysequence is encountered. When there are no more keys
+         *   to type, all depressed modifier keys are released (with accompanying keyup
+         *   events).
+         *
+         * If this element is a file input ({@code <input type="file">}), the
+         * specified key sequence should specify the path to the file to attach to
+         * the element. This is analgous to the user clicking "Browse..." and entering
+         * the path into the file select dialog.
+         *
+         *     var form = driver.findElement(By.css('form'));
+         *     var element = form.findElement(By.css('input[type=file]'));
+         *     element.sendKeys('/path/to/file.txt');
+         *     form.submit();
+         *
+         * For uploads to function correctly, the entered path must reference a file
+         * on the _browser's_ machine, not the local machine running this script. When
+         * running against a remote Selenium server, a {@link webdriver.FileDetector}
+         * may be used to transparently copy files to the remote machine before
+         * attempting to upload them in the browser.
+         *
+         * __Note:__ On browsers where native keyboard events are not supported
+         * (e.g. Firefox on OS X), key events will be synthesized. Special
+         * punctionation keys will be synthesized according to a standard QWERTY en-us
+         * keyboard layout.
+         *
+         * @param {...(string|!webdriver.promise.Promise<string>)} var_args The sequence
+         *     of keys to type. All arguments will be joined into a single sequence.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when all keys have been typed.
+         */
+        sendKeys(...var_args: Array<string|webdriver.promise.Promise<string>>): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to query for the tag/node name of this element.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the element's tag name.
+         */
+        getTagName(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to query for the computed style of the element
+         * represented by this instance. If the element inherits the named style from
+         * its parent, the parent will be queried for its value.  Where possible, color
+         * values will be converted to their hex representation (e.g. #00ff00 instead of
+         * rgb(0, 255, 0)).
+         *
+         * _Warning:_ the value returned will be as the browser interprets it, so
+         * it may be tricky to form a proper assertion.
+         *
+         * @param {string} cssStyleProperty The name of the CSS style property to look
+         *     up.
+         * @return {!promise.Promise<string>} A promise that will be
+         *     resolved with the requested CSS value.
+         */
+        getCssValue(cssStyleProperty: string): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to query for the value of the given attribute of the
+         * element. Will return the current value, even if it has been modified after
+         * the page has been loaded. More exactly, this method will return the value of
+         * the given attribute, unless that attribute is not present, in which case the
+         * value of the property with the same name is returned. If neither value is
+         * set, null is returned (for example, the "value" property of a textarea
+         * element). The "style" attribute is converted as best can be to a
+         * text representation with a trailing semi-colon. The following are deemed to
+         * be "boolean" attributes and will return either "true" or null:
+         *
+         * async, autofocus, autoplay, checked, compact, complete, controls, declare,
+         * defaultchecked, defaultselected, defer, disabled, draggable, ended,
+         * formnovalidate, hidden, indeterminate, iscontenteditable, ismap, itemscope,
+         * loop, multiple, muted, nohref, noresize, noshade, novalidate, nowrap, open,
+         * paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
+         * selected, spellcheck, truespeed, willvalidate
+         *
+         * Finally, the following commonly mis-capitalized attribute/property names
+         * are evaluated as expected:
+         *
+         * - "class"
+         * - "readonly"
+         *
+         * @param {string} attributeName The name of the attribute to query.
+         * @return {!webdriver.promise.Promise.<?string>} A promise that will be
+         *     resolved with the attribute's value. The returned value will always be
+         *     either a string or null.
+         */
+        getAttribute(attributeName: string): webdriver.promise.Promise<string>;
+
+        /**
+         * Get the visible (i.e. not hidden by CSS) innerText of this element, including
+         * sub-elements, without any leading or trailing whitespace.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the element's visible text.
+         */
+        getText(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to compute the size of this element's bounding box, in
+         * pixels.
+         * @return {!webdriver.promise.Promise.<{width: number, height: number}>} A
+         *     promise that will be resolved with the element's size as a
+         *     {@code {width:number, height:number}} object.
+         */
+        getSize(): webdriver.promise.Promise<ISize>;
+
+        /**
+         * Schedules a command to compute the location of this element in page space.
+         * @return {!webdriver.promise.Promise.<{x: number, y: number}>} A promise that
+         *     will be resolved to the element's location as a
+         *     {@code {x:number, y:number}} object.
+         */
+        getLocation(): webdriver.promise.Promise<ILocation>;
+
+        /**
+         * Schedules a command to query whether the DOM element represented by this
+         * instance is enabled, as dicted by the {@code disabled} attribute.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether this element is currently enabled.
+         */
+        isEnabled(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to query whether this element is selected.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether this element is currently selected.
+         */
+        isSelected(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to submit the form containing this element (or this
+         * element if it is a FORM element). This command is a no-op if the element is
+         * not contained in a form.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the form has been submitted.
+         */
+        submit(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to clear the `value` of this element. This command has
+         * no effect if the underlying DOM element is neither a text INPUT element
+         * nor a TEXTAREA element.
+         * @return {!promise.Promise<void>} A promise that will be resolved
+         *     when the element has been cleared.
+         */
+        clear(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to test whether this element is currently displayed.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether this element is currently visible on the page.
+         */
+        isDisplayed(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Take a screenshot of the visible region encompassed by this element's
+         * bounding rectangle.
+         *
+         * @param {boolean=} opt_scroll Optional argument that indicates whether the
+         *     element should be scrolled into view before taking a screenshot.
+         *     Defaults to false.
+         * @return {!promise.Promise<string>} A promise that will be
+         *     resolved to the screenshot as a base-64 encoded PNG.
+         */
+        takeScreenshot(opt_scroll?: boolean): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to retrieve the outer HTML of this element.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the element's outer HTML.
+         */
+        getOuterHtml(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to retrieve the inner HTML of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's inner HTML.
+         */
+        getInnerHtml(): webdriver.promise.Promise<string>;
+
+        /** @override */
+        serialize(): webdriver.promise.Promise<IWebElementId>;
+    }
+
+    /**
+     * WebElementPromise is a promise that will be fulfilled with a WebElement.
+     * This serves as a forward proxy on WebElement, allowing calls to be
+     * scheduled without directly on this instance before the underlying
+     * WebElement has been fulfilled. In other words, the following two statements
+     * are equivalent:
+     * <pre><code>
+     *     driver.findElement({id: 'my-button'}).click();
+     *     driver.findElement({id: 'my-button'}).then(function(el) {
+     *       return el.click();
+     *     });
+     * </code></pre>
+     *
+     * @param {!webdriver.WebDriver} driver The parent WebDriver instance for this
+     *     element.
+     * @param {!webdriver.promise.Promise.<!webdriver.WebElement>} el A promise
+     *     that will resolve to the promised element.
+     * @constructor
+     * @extends {webdriver.WebElement}
+     * @implements {webdriver.promise.Thenable.<!webdriver.WebElement>}
+     * @final
+     */
+    class WebElementPromise extends WebElement implements webdriver.promise.IThenable<WebElement> {
+        /**
+         * @param {!WebDriver} driver The parent WebDriver instance for this
+         *     element.
+         * @param {!promise.Promise<!WebElement>} el A promise
+         *     that will resolve to the promised element.
+         */
+        constructor(driver: webdriver.WebDriver, el: webdriver.promise.Promise<WebElement>);
+
+        /**
+         * Cancels the computation of this promise's value, rejecting the promise in the
+         * process. This method is a no-op if the promise has alreayd been resolved.
+         *
+         * @param {string=} opt_reason The reason this promise is being cancelled.
+         */
+        cancel(opt_reason?: string): void;
+
+
+        /** @return {boolean} Whether this promise's value is still being computed. */
+        isPending(): boolean;
+
+
+        /**
+         * Registers listeners for when this instance is resolved.
+         *
+         * @param opt_callback The
+         *     function to call if this promise is successfully resolved. The function
+         *     should expect a single argument: the promise's resolved value.
+         * @param opt_errback The
+         *     function to call if this promise is rejected. The function should expect
+         *     a single argument: the rejection reason.
+         * @return A new promise which will be
+         *     resolved with the result of the invoked callback.
+         */
+        then<R>(opt_callback?: (value: WebElement) => webdriver.promise.Promise<R>, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
+
+        /**
+         * Registers listeners for when this instance is resolved.
+         *
+         * @param opt_callback The
+         *     function to call if this promise is successfully resolved. The function
+         *     should expect a single argument: the promise's resolved value.
+         * @param opt_errback The
+         *     function to call if this promise is rejected. The function should expect
+         *     a single argument: the rejection reason.
+         * @return A new promise which will be
+         *     resolved with the result of the invoked callback.
+         */
+        then<R>(opt_callback?: (value: WebElement) => R, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
+
+
+        /**
+         * Registers a listener for when this promise is rejected. This is synonymous
+         * with the {@code catch} clause in a synchronous API:
+         * <pre><code>
+         *   // Synchronous API:
+         *   try {
+         *     doSynchronousWork();
+         *   } catch (ex) {
+         *     console.error(ex);
+         *   }
+         *
+         *   // Asynchronous promise API:
+         *   doAsynchronousWork().thenCatch(function(ex) {
+         *     console.error(ex);
+         *   });
+         * </code></pre>
+         *
+         * @param {function(*): (R|webdriver.promise.Promise.<R>)} errback The function
+         *     to call if this promise is rejected. The function should expect a single
+         *     argument: the rejection reason.
+         * @return {!webdriver.promise.Promise.<R>} A new promise which will be
+         *     resolved with the result of the invoked callback.
+         * @template R
+         */
+        thenCatch<R>(errback: (error: any) => any): webdriver.promise.Promise<R>;
+
+
+        /**
+         * Registers a listener to invoke when this promise is resolved, regardless
+         * of whether the promise's value was successfully computed. This function
+         * is synonymous with the {@code finally} clause in a synchronous API:
+         * <pre><code>
+         *   // Synchronous API:
+         *   try {
+         *     doSynchronousWork();
+         *   } finally {
+         *     cleanUp();
+         *   }
+         *
+         *   // Asynchronous promise API:
+         *   doAsynchronousWork().thenFinally(cleanUp);
+         * </code></pre>
+         *
+         * <b>Note:</b> similar to the {@code finally} clause, if the registered
+         * callback returns a rejected promise or throws an error, it will silently
+         * replace the rejection error (if any) from this promise:
+         * <pre><code>
+         *   try {
+         *     throw Error('one');
+         *   } finally {
+         *     throw Error('two');  // Hides Error: one
+         *   }
+         *
+         *   webdriver.promise.rejected(Error('one'))
+         *       .thenFinally(function() {
+         *         throw Error('two');  // Hides Error: one
+         *       });
+         * </code></pre>
+         *
+         *
+         * @param {function(): (R|webdriver.promise.Promise.<R>)} callback The function
+         *     to call when this promise is resolved.
+         * @return {!webdriver.promise.Promise.<R>} A promise that will be fulfilled
+         *     with the callback result.
+         * @template R
+         */
+        thenFinally<R>(callback: () => any): webdriver.promise.Promise<R>;
+
+        /**
+         * Registers a listener for when this promise is rejected. This is synonymous
+         * with the {@code catch} clause in a synchronous API:
+         *
+         *     // Synchronous API:
+         *     try {
+         *       doSynchronousWork();
+         *     } catch (ex) {
+         *       console.error(ex);
+         *     }
+         *
+         *     // Asynchronous promise API:
+         *     doAsynchronousWork().catch(function(ex) {
+         *       console.error(ex);
+         *     });
+         *
+         * @param {function(*): (R|IThenable<R>)} errback The
+         *     function to call if this promise is rejected. The function should
+         *     expect a single argument: the rejection reason.
+         * @return {!ManagedPromise<R>} A new promise which will be
+         *     resolved with the result of the invoked callback.
+         * @template R
+         */
+        catch<R>(errback: Function): webdriver.promise.Promise<R>;
+    }
+
+    /**
+     * Contains information about a WebDriver session.
+     */
+    class Session {
+
+        //region Constructors
+
+        /**
+         * @param {string} id The session ID.
+         * @param {!(Object|webdriver.Capabilities)} capabilities The session
+         *     capabilities.
+         * @constructor
+         */
+        constructor(id: string, capabilities: Capabilities|Object);
+
+        //endregion
+
+        //region Methods
+
+        /**
+         * @return {string} This session's ID.
+         */
+        getId(): string;
+
+        /**
+         * @return {!webdriver.Capabilities} This session's capabilities.
+         */
+        getCapabilities(): webdriver.Capabilities;
+
+        /**
+         * Retrieves the value of a specific capability.
+         * @param {string} key The capability to retrieve.
+         * @return {*} The capability value.
+         */
+        getCapability(key: string): any;
+
+        /**
+         * Returns the JSON representation of this object, which is just the string
+         * session ID.
+         * @return {string} The JSON representation of this Session.
+         */
+        toJSON(): string;
+
+        //endregion
+    }
+}
+
+declare namespace testing {
+    /**
+    * Registers a new test suite.
+    * @param name The suite name.
+    * @param fn The suite function, or {@code undefined} to define a pending test suite.
+    */
+    function describe(name: string, fn: Function): void;
+
+    /**
+     * Defines a suppressed test suite.
+     * @param name The suite name.
+     * @param fn The suite function, or {@code undefined} to define a pending test suite.
+     */
+    function xdescribe(name: string, fn: Function): void;
+
+    /**
+     * Register a function to call after the current suite finishes.
+     * @param fn
+     */
+    function after(fn: Function): void;
+
+    /**
+     * Register a function to call after each test in a suite.
+     * @param fn
+     */
+    function afterEach(fn: Function): void;
+
+    /**
+     * Register a function to call before the current suite starts.
+     * @param fn
+     */
+    function before(fn: Function): void;
+
+    /**
+     * Register a function to call before each test in a suite.
+     * @param fn
+     */
+    function beforeEach(fn: Function): void;
+
+    /**
+     * Add a test to the current suite.
+     * @param name The test name.
+     * @param fn The test function, or {@code undefined} to define a pending test case.
+     */
+    function it(name: string, fn: Function): void;
+
+    /**
+     * An alias for {@link #it()} that flags the test as the only one that should
+     * be run within the current suite.
+     * @param name The test name.
+     * @param fn The test function, or {@code undefined} to define a pending test case.
+     */
+    function iit(name: string, fn: Function): void;
+
+    /**
+     * Adds a test to the current suite while suppressing it so it is not run.
+     * @param name The test name.
+     * @param fn The test function, or {@code undefined} to define a pending test case.
+     */
+    function xit(name: string, fn: Function): void;
+}
+
+declare module 'selenium-webdriver/chrome' {
+    export = chrome;
+}
+
+declare module 'selenium-webdriver/executors' {
+    export = executors;
+}
+
+declare module 'selenium-webdriver' {
+    export = webdriver;
+}
+
+declare module 'selenium-webdriver/testing' {
+    export = testing;
+}
diff --git a/selenium-webdriver/selenium-webdriver.d.ts b/selenium-webdriver/selenium-webdriver.d.ts
index 548048b695..e1301d5b58 100644
--- a/selenium-webdriver/selenium-webdriver.d.ts
+++ b/selenium-webdriver/selenium-webdriver.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Selenium WebDriverJS 2.44.0
 // Project: https://code.google.com/p/selenium/
-// Definitions by: Bill Armstrong <https://github.com/BillArmstrong>, Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions by: Bill Armstrong <https://github.com/BillArmstrong>, Yuki Kokubun <https://github.com/Kuniwak>, Craig Nishina <https://github.com/cnishina>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace chrome {
diff --git a/serialport/serialport.d.ts b/serialport/serialport.d.ts
index 53d8a4e92e..60c240bbda 100644
--- a/serialport/serialport.d.ts
+++ b/serialport/serialport.d.ts
@@ -13,10 +13,10 @@ declare module 'serialport' {
         pause(): void;
         resume(): void;
         disconnected(err: Error): void;
-        close(callback?: () => void): void;
-        flush(callback?: () => void): void;
+        close(callback?: (err:any) => void): void;
+        flush(callback?: (err:any) => void): void;
         set(options: SerialPort.setOptions, callback: () => void): void;
-        drain(callback?: () => void): void;
+        drain(callback?: (err:any) => void): void;
         update(options: SerialPort.updateOptions, callback?: () => void): void;
         static list(callback: (err: string, ports: SerialPort.portConfig[]) => void): void;
         static parsers: {
diff --git a/socket.io/socket.io.d.ts b/socket.io/socket.io.d.ts
index ad95f39ef3..82e4dcacc3 100644
--- a/socket.io/socket.io.d.ts
+++ b/socket.io/socket.io.d.ts
@@ -47,7 +47,8 @@ interface SocketIOStatic {
 declare namespace SocketIO {
 
 	interface Server {
-
+		engine: { ws: any };
+		
 		/**
 		 * A dictionary of all the namespaces currently on this Server
 		 */
@@ -752,7 +753,7 @@ declare namespace SocketIO {
 		 * A dictionary of all the rooms that we have in this namespace
 		 * The rooms are made of a `sockets` key which is the dictionary of sockets per ID
 		 */
-		rooms: {[room: string]: {sockets: {[id: string]: boolean }}};
+		rooms: {[room: string]: {sockets: {[id: string]: boolean }, length: number }};
 
 		/**
 		 * A dictionary of all the socket ids that we're dealing with, and all
diff --git a/sql.js/sql.js-tests.ts b/sql.js/sql.js-tests.ts
index 40fceb8fbd..ece6e536e4 100644
--- a/sql.js/sql.js-tests.ts
+++ b/sql.js/sql.js-tests.ts
@@ -1,8 +1,8 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="sql.js.d.ts" />
 
-import fs = require("fs");
-import SQL = require("sql.js");
+import * as fs from "fs";
+import * as SQL from "sql.js";
 
 var DB_PATH = "data.db";
 
@@ -34,6 +34,8 @@ db.run(insertRecordStatement, {
 	"@content": "Content 2"
 });
 
+var n = db.getRowsModified();
+
 try {
 	// This query will throw exception: primary key constraint failed.
 	db.run(insertRecordStatement, {
@@ -79,3 +81,14 @@ function dbAccessDone(): void {
 	// Finally, close the database connection and release the resources in memory.
 	db.close();
 }
+
+// Create a database
+var db2 = new SQL.Database();
+
+// You can also use javascript functions inside your SQL code
+// Create the js function you need
+function add(a: number, b: number): number {return a+b;}
+// Specifies the SQL function's name, the number of it's arguments, and the js function to use
+db2.create_function("add_js", add);
+// Run a query in which the function is used
+db2.run("INSERT INTO hello VALUES (add_js(7, 3), add_js('Hello ', 'world'));"); // Inserts 10 and 'Hello world'
diff --git a/sql.js/sql.js.d.ts b/sql.js/sql.js.d.ts
index 67f0a183c2..c5ebb67023 100644
--- a/sql.js/sql.js.d.ts
+++ b/sql.js/sql.js.d.ts
@@ -8,6 +8,7 @@
 declare module "sql.js" {
 
     class Database {
+        constructor();
         constructor(data: Buffer);
         constructor(data: Uint8Array);
         constructor(data: number[]);
@@ -29,6 +30,10 @@ declare module "sql.js" {
         export(): Uint8Array;
 
         close(): void;
+
+        getRowsModified(): number;
+
+        create_function(name: string, func: Function): void;
     }
 
     class Statement {
diff --git a/strftime/strftime-tests.ts b/strftime/strftime-tests.ts
new file mode 100644
index 0000000000..3f24a53c48
--- /dev/null
+++ b/strftime/strftime-tests.ts
@@ -0,0 +1,37 @@
+/// <reference path="strftime.d.ts"/>
+
+import * as strftime from "strftime";
+
+strftime('%B %d, %Y %H:%M:%S');
+strftime('%F %T', new Date(1307472705067));
+
+var it_IT = {
+    days: ['domenica', 'lunedi', 'martedi', 'mercoledi', 'giovedi', 'venerdi', 'sabato'],
+    shortDays: ['dom', 'lun', 'mar', 'mer', 'gio', 'ven', 'sab'],
+    months: ['gennaio', 'febbraio', 'marzo', 'aprile', 'maggio', 'giugno', 'luglio', 'agosto', 'settembre', 'ottobre', 'novembre', 'dicembre'],
+    shortMonths: ['gen', 'feb', 'mar', 'apr', 'mag', 'giu', 'lug', 'ago', 'set', 'ott', 'nov', 'dic'],
+    AM: 'AM',
+    PM: 'PM',
+    am: 'am',
+    pm: 'pm',
+    formats: {
+        D: '%m/%d/%y',
+        F: '%Y-%m-%d',
+        R: '%H:%M',
+        X: '%T',
+        c: '%a %b %d %X %Y',
+        r: '%I:%M:%S %p',
+        T: '%H:%M:%S',
+        v: '%e-%b-%Y',
+        x: '%D'
+    }
+};
+
+var strftimeIT = strftime.localize(it_IT);
+strftimeIT('%B %d, %Y %H:%M:%S');
+strftimeIT('%B %d, %Y %H:%M:%S', new Date(1307472705067));
+
+var strftimePDT = strftime.timezone(-420);
+var strftimeCEST = strftime.timezone(120);
+strftimePDT('%B %d, %y %H:%M:%S', new Date(1307472705067));
+strftimeCEST('%F %T', new Date(1307472705067));
\ No newline at end of file
diff --git a/strftime/strftime.d.ts b/strftime/strftime.d.ts
new file mode 100644
index 0000000000..4c4b8ad835
--- /dev/null
+++ b/strftime/strftime.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for strftime 0.9.2
+// Project: https://github.com/samsonjs/strftime
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "strftime" {
+    type strftimeFunction = (format: string, date?: Date) => string;
+
+    namespace strftime {
+        /**
+         * Sets locale.
+         * @param {Locale} locale A locale.
+         * @return {strftimeFunction} A strftime function.
+         */
+        export function localize(locale: Locale): strftimeFunction;
+
+        /**
+         * Sets timezone.
+         * @param {number|string} offset A offset.
+         * @return {strftimeFunction} A strftime function.
+         */
+        export function timezone(offset: number | string): strftimeFunction;
+
+        /**
+         * Locale formats.
+         * @interface
+         */
+        export interface LocaleFormats {
+            D?: string;
+            F?: string;
+            R?: string;
+            T?: string;
+            X?: string;
+            c?: string;
+            r?: string;
+            v?: string;
+            x?: string;
+        }
+
+        /**
+         * Locale.
+         * @interface
+         */
+        export interface Locale {
+            days?: Array<string>;
+            shortDays?: Array<string>;
+            months?: Array<string>;
+            shortMonths?: Array<string>;
+            AM?: string;
+            PM?: string;
+            am?: string;
+            pm?: string;
+            formats: LocaleFormats
+        }
+    }
+
+    /**
+     * Format a local time/date according to locale settings
+     * @param {string} format A format.
+     * @return {string} Returns a string formatted.
+     */
+    function strftime(format: string): string;
+
+    /**
+     * Format a local time/date according to locale settings
+     * @param {string} format A format.
+     * @param {Date}   date   A date.
+     * @return {string} Returns a string formatted according format using the given date or the current local time.
+     */
+    function strftime(format: string, date: Date): string;
+    export = strftime;
+}
diff --git a/superagent/superagent-tests.ts b/superagent/superagent-tests.ts
index 237cbdeda1..283244ac85 100644
--- a/superagent/superagent-tests.ts
+++ b/superagent/superagent-tests.ts
@@ -5,6 +5,7 @@
 
 import * as request from 'superagent';
 import * as fs from 'fs';
+import * as assert from 'assert';
 
 // Examples taken from https://github.com/visionmedia/superagent/blob/gh-pages/docs/index.md
 // and https://github.com/visionmedia/superagent/blob/master/Readme.md
@@ -302,4 +303,14 @@ request
 request
   .get('/search')
   .then((response) => {})
-  .catch((error) => {}); 
\ No newline at end of file
+  .catch((error) => {});
+
+// Requesting binary data.
+// adapted from: https://github.com/visionmedia/superagent/blob/v2.0.0/test/client/request.js#L110
+request
+  .get('/blob')
+  .responseType('blob')
+  .end(function (err, res) {
+    assert(res.xhr instanceof XMLHttpRequest)
+    assert(res.xhr.response instanceof Blob);
+  });
diff --git a/superagent/superagent.d.ts b/superagent/superagent.d.ts
index 1d89adeb6b..c41847775c 100644
--- a/superagent/superagent.d.ts
+++ b/superagent/superagent.d.ts
@@ -77,6 +77,7 @@ declare module "superagent" {
       notAcceptable: boolean;
       notFound: boolean;
       forbidden: boolean;
+      xhr: XMLHttpRequest;
       get(header: string): string;
     }
 
@@ -96,6 +97,7 @@ declare module "superagent" {
       pipe(stream: NodeJS.WritableStream, options?: Object): stream.Writable;
       query(val: Object): this;
       redirects(n: number): this;
+      responseType(type: string): this;
       send(data: string): this;
       send(data: Object): this;
       send(): this;
diff --git a/swiper/swiper.d.ts b/swiper/swiper.d.ts
index 78ad2813a4..2be39474d2 100644
--- a/swiper/swiper.d.ts
+++ b/swiper/swiper.d.ts
@@ -122,8 +122,7 @@ declare class SwiperSlide {
 }
 
 declare class Swiper {
-    constructor(container: string, options?: SwiperOptions);
-    constructor(container: Element, options?: SwiperOptions);
+    constructor(container: string|Element, options?: SwiperOptions);
 
     // Properties
     width: number;
diff --git a/tether-drop/tether-drop-tests.ts b/tether-drop/tether-drop-tests.ts
index f67f746a7c..8976f0344c 100644
--- a/tether-drop/tether-drop-tests.ts
+++ b/tether-drop/tether-drop-tests.ts
@@ -24,7 +24,7 @@ d.remove();
 d.toggle();
 d.position();
 d.destroy();
-d.element.appendChild(document.createElement("div"));
+d.content.appendChild(document.createElement("div"));
 d.tether.position();
 
 d.on("open", () => false);
diff --git a/tether-drop/tether-drop.d.ts b/tether-drop/tether-drop.d.ts
index 19c48ec7a1..8ee8ca1c02 100644
--- a/tether-drop/tether-drop.d.ts
+++ b/tether-drop/tether-drop.d.ts
@@ -10,7 +10,6 @@ declare class Drop {
     constructor(options: Drop.IDropOptions);
 
     public content: HTMLElement;
-    public element: HTMLElement;
     public tether: Tether;
     public open(): void;
     public close(): void;
diff --git a/threejs/three.d.ts b/threejs/three.d.ts
index 15510a5821..9e70f1e898 100644
--- a/threejs/three.d.ts
+++ b/threejs/three.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for three.js r79
+// Type definitions for three.js r80
 // Project: http://mrdoob.github.com/three.js/
 // Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -149,6 +149,7 @@ declare namespace THREE {
     export const UnsignedShort4444Type: PixelType;
     export const UnsignedShort5551Type: PixelType;
     export const UnsignedShort565Type: PixelType;
+    export const UnsignedInt248Type: PixelType;
 
     // Pixel formats
     export enum PixelFormat { }
@@ -159,6 +160,7 @@ declare namespace THREE {
     export const LuminanceAlphaFormat: PixelFormat;
     export const RGBEFormat: PixelFormat;
     export const DepthFormat: PixelFormat;
+    export const DepthStencilFormat: PixelFormat;
 
     // Compressed texture formats
     // DDS / ST3C Compressed texture formats
@@ -246,8 +248,8 @@ declare namespace THREE {
         getEffectiveWeight(): number;
         fadeIn(duration: number): AnimationAction;
         fadeOut(duration: number): AnimationAction;
-        crossFadeFrom(fadeOutAction: AnimationAction,duration: number, warp: boolean): AnimationAction;
-        crossFadeTo(fadeInAction: AnimationAction,duration: number, warp: boolean): AnimationAction;
+        crossFadeFrom(fadeOutAction: AnimationAction, duration: number, warp: boolean): AnimationAction;
+        crossFadeTo(fadeInAction: AnimationAction, duration: number, warp: boolean): AnimationAction;
         stopFading(): AnimationAction;
         setEffectiveTimeScale(timeScale: number): AnimationAction;
         getEffectiveTimeScale(): number;
@@ -673,7 +675,7 @@ declare namespace THREE {
         array: ArrayLike<number>;
         itemSize: number;
         dynamic: boolean;
-        updateRange: {offset:number, count:number};
+        updateRange: {offset: number, count: number};
         version: number;
         normalized: boolean;
         needsUpdate: boolean;
@@ -684,11 +686,11 @@ declare namespace THREE {
         copy(source: BufferAttribute): BufferAttribute;
         copyAt(index1: number, attribute: BufferAttribute, index2: number): BufferAttribute;
         copyArray(array: ArrayLike<number>): BufferAttribute;
-        copyColorsArray(colors: {r:number, g:number, b:number}[]): BufferAttribute;
-        copyIndicesArray(indices: {a:number, b:number, c:number}[]): BufferAttribute;
-        copyVector2sArray(vectors: {x:number, y:number}[]): BufferAttribute;
-        copyVector3sArray(vectors: {x:number, y:number, z:number}[]): BufferAttribute;
-        copyVector4sArray(vectors: {x:number, y:number, z:number, w:number}[]): BufferAttribute;
+        copyColorsArray(colors: {r: number, g: number, b: number}[]): BufferAttribute;
+        copyIndicesArray(indices: {a: number, b: number, c: number}[]): BufferAttribute;
+        copyVector2sArray(vectors: {x: number, y: number}[]): BufferAttribute;
+        copyVector3sArray(vectors: {x: number, y: number, z: number}[]): BufferAttribute;
+        copyVector4sArray(vectors: {x: number, y: number, z: number, w: number}[]): BufferAttribute;
         set(value: ArrayLike<number>, offset?: number): BufferAttribute;
         getX(index: number): number;
         setX(index: number, x: number): BufferAttribute;
@@ -802,8 +804,8 @@ declare namespace THREE {
 
         center(): Vector3;
 
-        setFromObject(object: Object3D) : void;
-        updateFromObject(object: Object3D) : void;
+        setFromObject(object: Object3D): void;
+        updateFromObject(object: Object3D): void;
 
         fromGeometry(geometry: Geometry, settings?: any): BufferGeometry;
 
@@ -1317,7 +1319,7 @@ declare namespace THREE {
         dispose(): void;
 
 
-        //These properties do not exist in a normal Geometry class, but if you use the instance that was passed by JSONLoader, it will be added.
+        // These properties do not exist in a normal Geometry class, but if you use the instance that was passed by JSONLoader, it will be added.
         bones: Bone[];
         animation: AnimationClip;
         animations: AnimationClip[];
@@ -1339,7 +1341,7 @@ declare namespace THREE {
      */
     export class InstancedBufferAttribute extends BufferAttribute {
         constructor(data: ArrayLike<number>, itemSize: number, meshPerAttribute?: number);
-        
+
         meshPerAttribute: number;
 
         clone(): InstancedBufferAttribute;
@@ -1352,9 +1354,9 @@ declare namespace THREE {
     export class InstancedBufferGeometry extends BufferGeometry {
         constructor();
 
-        groups: {start:number, count:number, instances:number}[];
+        groups: {start: number, count: number, instances: number}[];
         maxInstancedCount: number;
-        
+
         addGroup(start: number, count: number, instances: number): void;
         clone(): InstancedBufferGeometry;
         copy(source: InstancedBufferGeometry): InstancedBufferGeometry;
@@ -1388,7 +1390,7 @@ declare namespace THREE {
      */
     export class InstancedInterleavedBuffer extends InterleavedBuffer {
         constructor(array: ArrayLike<number>, stride: number, meshPerAttribute?: number);
-        
+
         meshPerAttribute: number;
 
         clone(): InstancedInterleavedBuffer;
@@ -1726,9 +1728,9 @@ declare namespace THREE {
         params: RaycasterParameters;
         precision: number;
         linePrecision: number;
-        
+
         set(origin: Vector3, direction: Vector3): void;
-        setFromCamera(coords: { x: number; y: number;}, camera: Camera ): void;
+        setFromCamera(coords: { x: number; y: number; }, camera: Camera ): void;
         intersectObject(object: Object3D, recursive?: boolean): Intersection[];
         intersectObjects(objects: Object3D[], recursive?: boolean): Intersection[];
     }
@@ -1792,6 +1794,7 @@ declare namespace THREE {
 
         copy(source: LightShadow): LightShadow;
         clone(recursive?: boolean): LightShadow;
+        toJSON(): any;
     }
 
     /**
@@ -1988,7 +1991,7 @@ declare namespace THREE {
         static Handlers: LoaderHandler;
     }
 
-    export interface LoaderHandler{
+    export interface LoaderHandler {
         handlers: (RegExp | Loader)[];
 
         add(regex: RegExp, loader: Loader): void;
@@ -2027,6 +2030,7 @@ declare namespace THREE {
 
         manager: LoadingManager;
         crossOrigin: string;
+        withCredentials: string;
         path: string;
 
         /**
@@ -2035,7 +2039,8 @@ declare namespace THREE {
          */
         load(url: string, onLoad?: (image: HTMLImageElement) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): HTMLImageElement;
         setCrossOrigin(crossOrigin: string): ImageLoader;
-        setPath(value: any): ImageLoader;
+        setWithCredentials(value: string): ImageLoader;
+        setPath(value: string): ImageLoader;
     }
 
     /**
@@ -2134,6 +2139,7 @@ declare namespace THREE {
 
         manager: LoadingManager;
         crossOrigin: string;
+        withCredentials: string;
         path: string;
 
         /**
@@ -2143,6 +2149,7 @@ declare namespace THREE {
          */
         load(url: string, onLoad?: (texture: Texture) => void): Texture;
         setCrossOrigin(crossOrigin: string): TextureLoader;
+        setWithCredentials(value: string): TextureLoader;
         setPath(path: string): TextureLoader;
     }
 
@@ -2747,7 +2754,7 @@ declare namespace THREE {
 
     export interface ShaderMaterialParameters extends MaterialParameters {
         defines?: any;
-        uniforms?: any; 
+        uniforms?: any;
         vertexShader?: string;
         fragmentShader?: string;
         lineWidth?: number;
@@ -2881,7 +2888,7 @@ declare namespace THREE {
         applyMatrix4(matrix: Matrix4): Box3;
         translate(offset: Vector3): Box3;
         equals(box: Box3): boolean;
-        
+
         empty(): any; // deprecated, use isEmpty()
         isIntersectionBox(b: any): any; // deprecated, use intersectsBox()
         isIntersectionSphere(s: any): any; // deprecated, use intersectsSphere()
@@ -3169,7 +3176,7 @@ declare namespace THREE {
 
     export class Euler {
         constructor(x?: number, y?: number, z?: number, order?: string);
-        
+
         x: number;
         y: number;
         z: number;
@@ -3180,7 +3187,7 @@ declare namespace THREE {
         clone(): Euler;
         copy(euler: Euler): Euler;
         setFromRotationMatrix(m: Matrix4, order?: string, update?: boolean): Euler;
-        setFromQuaternion(q:Quaternion, order?: string, update?: boolean): Euler;
+        setFromQuaternion(q: Quaternion, order?: string, update?: boolean): Euler;
         setFromVector3( v: Vector3, order?: string ): Euler;
         reorder(newOrder: string): Euler;
         equals(euler: Euler): boolean;
@@ -3482,7 +3489,7 @@ declare namespace THREE {
          * Sets the position component for this matrix from vector v.
          */
         setPosition(v: Vector3): Matrix4;
-        
+
 
         /**
          * Sets this matrix to the inverse of matrix m.
@@ -3718,7 +3725,7 @@ declare namespace THREE {
          * Adapted from http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/slerp/.
          */
         static slerp(qa: Quaternion, qb: Quaternion, qm: Quaternion, t: number): Quaternion;
-        
+
         static slerpFlat(dst: number[], dstOffset: number, src0: number[], srcOffset: number, src1: number[], stcOffset1: number, t: number): Quaternion;
 
         // deprecated
@@ -3751,7 +3758,7 @@ declare namespace THREE {
         intersectTriangle(a: Vector3, b: Vector3, c: Vector3, backfaceCulling: boolean, optionalTarget?: Vector3): Vector3;
         applyMatrix4(matrix4: Matrix4): Ray;
         equals(ray: Ray): boolean;
-        
+
         // deprecated
         isIntersectionBox(b: any): any;
         isIntersectionPlane(p: any): any;
@@ -4348,7 +4355,7 @@ declare namespace THREE {
          * Sets all values of this vector.
          */
         setScalar(scalar: number): Vector4;
-        
+
         /**
          * Sets X component of this vector.
          */
@@ -4501,7 +4508,7 @@ declare namespace THREE {
 
         interpolate_(i1: number, t0: number, t: number, t1: number): any;
     }
-    
+
     export class DiscreteInterpolant extends Interpolant {
         constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
 
@@ -4721,7 +4728,7 @@ declare namespace THREE {
         domElement: HTMLCanvasElement;
 
         render(scene: Scene, camera: Camera): void;
-        setSize(width:number, height:number, updateStyle?:boolean): void;
+        setSize(width: number, height: number, updateStyle?: boolean): void;
     }
 
     export interface WebGLRendererParameters {
@@ -4899,7 +4906,7 @@ declare namespace THREE {
         getPrecision(): string;
         getPixelRatio(): number;
         setPixelRatio(value: number): void;
-        
+
         getSize(): { width: number; height: number; };
 
         /**
@@ -4933,12 +4940,12 @@ declare namespace THREE {
         setClearColor(color: Color, alpha?: number): void;
         setClearColor(color: string, alpha?: number): void;
         setClearColor(color: number, alpha?: number): void;
-        
+
         /**
          * Returns a float with the current clear alpha. Ranges from 0 to 1.
          */
         getClearAlpha(): number;
-        
+
         setClearAlpha(alpha: number): void;
 
         /**
@@ -4950,7 +4957,7 @@ declare namespace THREE {
         clearColor(): void;
         clearDepth(): void;
         clearStencil(): void;
-        clearTarget(renderTarget:WebGLRenderTarget, color: boolean, depth: boolean, stencil: boolean): void;
+        clearTarget(renderTarget: WebGLRenderTarget, color: boolean, depth: boolean, stencil: boolean): void;
         resetGLState(): void;
         dispose(): void;
 
@@ -5163,7 +5170,7 @@ declare namespace THREE {
         uv_pars_vertex: string;
         uv_vertex: string;
         worldpos_vertex: string;
-    }
+    };
 
     export interface Shader {
         uniforms: IUniform;
@@ -5307,7 +5314,7 @@ declare namespace THREE {
         export function clone(uniforms_src: any): any;
     }
 
-    export class Uniform { 
+    export class Uniform {
         constructor(value: any);
         constructor(type: string, value: any); // deprecated
 
@@ -5335,7 +5342,7 @@ declare namespace THREE {
         init(planes: any[], enableLocalClipping: boolean, camera: Camera): boolean;
         beginShadows(): void;
         endShadows(): void;
-        setState(planes: any[], clipShadows: boolean, camera: Camera, cache: boolean, fromCache: boolean): void; 
+        setState(planes: any[], clipShadows: boolean, camera: Camera, cache: boolean, fromCache: boolean): void;
     }
 
     export interface WebGLCapabilitiesParameters {
@@ -5378,7 +5385,7 @@ declare namespace THREE {
 
     export class WebGLLights {
         constructor(gl: WebGLRenderingContext, properties: any, info: any);
-        
+
         get(light: any): any;
     }
 
@@ -5390,7 +5397,7 @@ declare namespace THREE {
         render(start: any, count: number): void;
         renderInstances(geometry: any, start: any, count: number): void;
     }
-    
+
     export class WebGLObjects {
         constructor(gl: WebGLRenderingContext, properties: any, info: any);
 
@@ -5401,7 +5408,7 @@ declare namespace THREE {
 
     export class WebGLProgram {
         constructor(renderer: WebGLRenderer, code: string, material: ShaderMaterial, parameters: WebGLRendererParameters);
-        
+
         id: number;
         code: string;
         usedTimes: number;
@@ -5428,7 +5435,7 @@ declare namespace THREE {
     }
 
     export class WebGLTextures {
-        constructor(gl: any, extensions: any, state: any, properties:any, capabilities: any, paramThreeToGL: Function, info: any);
+        constructor(gl: any, extensions: any, state: any, properties: any, capabilities: any, paramThreeToGL: Function, info: any);
 
         setTexture2D(texture: any, slot: number): void;
         setTextureCube(texture: any, slot: number): void;
@@ -5451,7 +5458,7 @@ declare namespace THREE {
         static splitDynamic(seq: any, values: any[]): any[];
         static evalDynamic(seq: any, values: any[], object: any, camera: any): any[];
     }
-    
+
     export class WebGLProperties {
         constructor();
 
@@ -5479,7 +5486,7 @@ declare namespace THREE {
         // deprecated
         cullFace: any;
     }
-    
+
     export class WebGLState {
         constructor(gl: any, extensions: any, paramThreeToGL: Function);
 
@@ -5559,7 +5566,7 @@ declare namespace THREE {
     // Renderers / WebGL / Plugins /////////////////////////////////////////////////////////////////////
     export class LensFlarePlugin {
         constructor(renderer: WebGLRenderer, flares: any[]);
-        
+
         render(scene: Scene, camera: Camera, viewportWidth: number, viewportHeight: number): void;
     }
 
@@ -5570,7 +5577,7 @@ declare namespace THREE {
     }
 
     // Scenes /////////////////////////////////////////////////////////////////////
-    
+
     /**
      * Scenes allow you to set up what and where is to be rendered by three.js. This is where you place objects, lights and cameras.
      */
@@ -5590,12 +5597,14 @@ declare namespace THREE {
         background: any;
 
         copy(source: Scene, recursive?: boolean): Scene;
+        toJSON(meta?: any): any;
     }
 
     export interface IFog {
-        name:string;
+        name: string;
         color: Color;
-        clone():IFog;
+        clone(): IFog;
+        toJSON(): any;
     }
 
     /**
@@ -5604,7 +5613,7 @@ declare namespace THREE {
     export class Fog implements IFog {
         constructor(hex: number, near?: number, far?: number);
 
-        name:string;
+        name: string;
 
         /**
          * Fog color.
@@ -5623,6 +5632,7 @@ declare namespace THREE {
         far: number;
 
         clone(): Fog;
+        toJSON(): any;
     }
 
     /**
@@ -5641,6 +5651,7 @@ declare namespace THREE {
         density: number;
 
         clone(): FogExp2;
+        toJSON(): any;
     }
 
     // Textures /////////////////////////////////////////////////////////////////////
@@ -5949,7 +5960,7 @@ declare namespace THREE {
          * Returns a vector for point at relative position in curve according to arc length
          * getPointAt(u: number): T;
          */
-        getPointAt(u: number):T;
+        getPointAt(u: number): T;
 
         /**
          * Get sequence of points using getPoint( t )
@@ -6096,7 +6107,7 @@ declare namespace THREE {
 
     export class ClosedSplineCurve3 extends CatmullRomCurve3 {} // deprecated, use CatmullRomCurve3
     export class SplineCurve3 extends CatmullRomCurve3 {} // will be deprecated, use CatmullRomCurve3
-        
+
     export class CubicBezierCurve extends Curve<Vector2> {
         constructor(v0: Vector2, v1: Vector2, v2: Vector2, v3: Vector2);
 
@@ -6116,7 +6127,7 @@ declare namespace THREE {
 
         getPoint(t: number): Vector3;
     }
-    
+
     export class EllipseCurve extends Curve<Vector2> {
         constructor(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number);
 
@@ -6148,7 +6159,7 @@ declare namespace THREE {
 
         getPoint(t: number): Vector3;
     }
-    
+
     export class QuadraticBezierCurve extends Curve<Vector2> {
         constructor( v0: Vector2, v1: Vector2, v2: Vector2 );
 
@@ -6172,7 +6183,7 @@ declare namespace THREE {
 
         points: Vector2[];
     }
-    
+
 
     // Extras / Geometries /////////////////////////////////////////////////////////////////////
     export class BoxBufferGeometry extends BufferGeometry {
@@ -6487,7 +6498,7 @@ declare namespace THREE {
             bevelEnabled: boolean;
             bevelThickness: number;
             bevelSize: number;
-        }
+        };
     }
 
     export class TorusBufferGeometry extends BufferGeometry {
@@ -6735,6 +6746,6 @@ declare namespace THREE {
     }
 }
 
-declare module 'three' {
+declare module "three" {
     export = THREE;
 }
diff --git a/twilio/twilio.d.ts b/twilio/twilio.d.ts
index 8ef14760b8..d6c2dfebf7 100644
--- a/twilio/twilio.d.ts
+++ b/twilio/twilio.d.ts
@@ -449,7 +449,7 @@ declare module twilio {
   export function webhook(options?: string | webhookOptions): MiddlewareFunction;
 
   export function validateRequest(authToken: string, twilioHeader: string, url: string, params?: any): boolean;
-  export function validateExpressRequest(request: Express.Request, authToken: string, options?: WebhookExpressOptions): boolean;
+  export function validateExpressRequest(request: express.Request, authToken: string, options?: WebhookExpressOptions): boolean;
 
   /// resources/Accounts.js
   export interface OutgoingCallerIdInstance extends InstanceResource {
diff --git a/typescript-stl/typescript-stl.d.ts b/typescript-stl/typescript-stl.d.ts
index 96d22ceb8f..36ad79e4a1 100644
--- a/typescript-stl/typescript-stl.d.ts
+++ b/typescript-stl/typescript-stl.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for TypeScript-STL v1.0.1
+// Type definitions for TypeScript-STL v1.0.8
 // Project: https://github.com/samchon/typescript-stl
 // Definitions by: Jeongho Nam <http://samchon.org>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -2984,7 +2984,7 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected abstract create_neighbor(): This;
+        protected abstract create_neighbor(base: Base): This;
         /**
          * <p> Get value of the iterator is pointing. </p>
          *
@@ -3292,7 +3292,7 @@ declare namespace std {
          * @param container Another container object of the same type (with the same class template
          *					arguments <i>T</i>), whose contents are either copied or acquired.
          */
-        constructor(container: base.IContainer<T>);
+        constructor(container: Deque<T>);
         /**
          * <p> Range Constructor. </p>
          *
@@ -3339,6 +3339,10 @@ declare namespace std {
          * @inheritdoc
          */
         size(): number;
+        /**
+         * @inheritdoc
+         */
+        empty(): boolean;
         /**
          * @inheritdoc
          */
@@ -3360,11 +3364,9 @@ declare namespace std {
          */
         back(): T;
         /**
-         * <p> Fetch row and column's index. </p>
-         *
-         * <p> Fetches index of row and column of {@link matrix_} from sequence number. </p>
-         *
-         * @param index Sequence number
+        // Fetch row and column's index.
+        /**
+         * @hidden
          */
         private fetch_index(index);
         /**
@@ -3418,11 +3420,11 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_repeating_val(position: DequeIterator<T>, n: number, val: T): DequeIterator<T>;
+        protected _Insert_by_repeating_val(position: DequeIterator<T>, n: number, val: T): DequeIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends Iterator<U>>(position: DequeIterator<T>, begin: InputIterator, end: InputIterator): DequeIterator<T>;
+        protected _Insert_by_range<U extends T, InputIterator extends Iterator<U>>(position: DequeIterator<T>, begin: InputIterator, end: InputIterator): DequeIterator<T>;
         /**
          * @hidden
          */
@@ -3446,15 +3448,29 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected erase_by_range(first: DequeIterator<T>, last: DequeIterator<T>): DequeIterator<T>;
+        protected _Erase_by_range(first: DequeIterator<T>, last: DequeIterator<T>): DequeIterator<T>;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link Deque container} object with same type of elements. Sizes and container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were in <i>obj</i>
+         * before the call, and the elements of <i>obj</i> are those which were in this. All iterators, references and
+         * pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link Deque container} of the same type of elements (i.e., instantiated
+         *			  with the same template parameter, <b>T</b>) whose content is swapped with that of this
+         *			  {@link container Deque}.
+         */
+        swap(obj: Deque<T>): void;
         /**
          * @inheritdoc
          */
         swap(obj: base.IContainer<T>): void;
-        /**
-         * @hidden
-         */
-        private swap_deque(obj);
     }
 }
 declare namespace std {
@@ -3556,7 +3572,10 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected create_neighbor(): DequeReverseIterator<T>;
+        protected create_neighbor(base: DequeIterator<T>): DequeReverseIterator<T>;
+        /**
+         * @inheritdoc
+         */
         /**
          * Set value of the iterator is pointing to.
          *
@@ -4438,7 +4457,7 @@ declare namespace std.base {
      *
      * @author Jeongho Nam <http://samchon.org>
      */
-    abstract class MapContainer<Key, T> extends base.Container<Pair<Key, T>> {
+    abstract class MapContainer<Key, T> extends Container<Pair<Key, T>> {
         /**
          * <p> {@link List} storing elements. </p>
          *
@@ -4447,45 +4466,11 @@ declare namespace std.base {
          * by storing {@link ListIterator iterators} ({@link MapIterator} references {@link ListIterator}) who are
          * created from {@link data_ here}. </p>
          */
-        protected data_: List<Pair<Key, T>>;
+        private data_;
         /**
          * Default Constructor.
          */
         constructor();
-        /**
-         * Construct from elements.
-         */
-        constructor(items: Array<Pair<Key, T>>);
-        /**
-         * Contruct from tuples.
-         *
-         * @param array Tuples to be contained.
-         */
-        constructor(array: Array<[Key, T]>);
-        /**
-         * Copy Constructor.
-         */
-        constructor(container: IContainer<Pair<Key, T>>);
-        /**
-         * Construct from range iterators.
-         */
-        constructor(begin: Iterator<Pair<Key, T>>, end: Iterator<Pair<Key, T>>);
-        /**
-         * @hidden
-         */
-        protected init(): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_array(items: Array<Pair<Key, T> | [Key, T]>): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_container(container: IContainer<Pair<Key, T>>): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_range<InputIterator extends Iterator<Pair<Key, T>>>(begin: InputIterator, end: InputIterator): void;
         /**
          * @inheritdoc
          */
@@ -4595,6 +4580,7 @@ declare namespace std.base {
          * Return the number of elements in the map.
          */
         size(): number;
+        protected _Get_data(): List<Pair<Key, T>>;
         /**
          * @inheritdoc
          */
@@ -4670,7 +4656,7 @@ declare namespace std.base {
         /**
          * @hidden
          */
-        protected abstract insert_by_pair<L extends Key, U extends T>(pair: Pair<L, U>): any;
+        protected abstract _Insert_by_pair<L extends Key, U extends T>(pair: Pair<L, U>): any;
         /**
          * @hidden
          */
@@ -4678,7 +4664,7 @@ declare namespace std.base {
         /**
          * @hidden
          */
-        protected abstract insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
+        protected abstract _Insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
         /**
          * @hidden
          */
@@ -4686,7 +4672,7 @@ declare namespace std.base {
         /**
          * @hidden
          */
-        protected abstract insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
+        protected abstract _Insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
         /**
          * <p> Erase an elemet by key. </p>
          *
@@ -4785,7 +4771,7 @@ declare namespace std.base {
          *			   [<i>first</i>, <i>last</i>), which contains all the elements between <i>first</i> and <i>last</i>,
          *			   including the element pointed by <i>first</i> but not the element pointed by <i>last</i>.
          */
-        protected abstract handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected abstract _Handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
         /**
          * <p> Abstract method handling deletions for indexing. </p>
          *
@@ -4806,7 +4792,11 @@ declare namespace std.base {
          *			   [<i>first</i>, <i>last</i>), which contains all the elements between <i>first</i> and <i>last</i>,
          *			   including the element pointed by <i>first</i> but not the element pointed by <i>last</i>.
          */
-        protected abstract handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected abstract _Handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        /**
+         * @hidden
+         */
+        protected _Swap(obj: MapContainer<Key, T>): void;
     }
 }
 declare namespace std {
@@ -4899,7 +4889,7 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected create_neighbor(): MapReverseIterator<Key, T>;
+        protected create_neighbor(base: MapIterator<Key, T>): MapReverseIterator<Key, T>;
         /**
          * Get first, key element.
          */
@@ -5160,24 +5150,6 @@ declare namespace std.base {
          * @hidden
          */
         private insert_or_assign_with_hint(hint, key, value);
-        /**
-         * <p> Swap content. </p>
-         *
-         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
-         * {@link UniqueMap map} of the same type. Sizes abd container type may differ. </p>
-         *
-         * <p> After the call to this member function, the elements in this container are those which were
-         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
-         * iterators, references and pointers remain valid for the swapped objects. </p>
-         *
-         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
-         * algorithm with an optimization that behaves like this member function. </p>
-         *
-         * @param obj Another {@link UniqueMap map container} of the same type of elements as this (i.e.,
-         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
-         *			  with that of this {@link UniqueMap container}.
-         */
-        swap(obj: UniqueMap<Key, T>): void;
     }
 }
 declare namespace std.base {
@@ -5268,24 +5240,6 @@ declare namespace std.base {
          * @inheritdoc
          */
         insert<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
-        /**
-         * <p> Swap content. </p>
-         *
-         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
-         * {@link UniqueMap map} of the same type. Sizes abd container type may differ. </p>
-         *
-         * <p> After the call to this member function, the elements in this container are those which were
-         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
-         * iterators, references and pointers remain valid for the swapped objects. </p>
-         *
-         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
-         * algorithm with an optimization that behaves like this member function. </p>
-         *
-         * @param obj Another {@link MultiMap map container} of the same type of elements as this (i.e.,
-         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
-         *			  with that of this {@link MultiMap container}.
-         */
-        swap(obj: MultiMap<Key, T>): void;
     }
 }
 declare namespace std.HashMap {
@@ -5348,13 +5302,27 @@ declare namespace std {
          */
         private hash_buckets_;
         /**
-         * @hidden
+         * Default Constructor.
          */
-        protected init(): void;
+        constructor();
         /**
-         * @hidden
+         * Construct from elements.
          */
-        protected construct_from_array(items: Array<Pair<Key, T>>): void;
+        constructor(items: Pair<Key, T>[]);
+        /**
+         * Contruct from tuples.
+         *
+         * @param array Tuples to be contained.
+         */
+        constructor(array: [Key, T][]);
+        /**
+         * Copy Constructor.
+         */
+        constructor(container: HashMap<Key, T>);
+        /**
+         * Construct from range iterators.
+         */
+        constructor(begin: Iterator<Pair<Key, T>>, end: Iterator<Pair<Key, T>>);
         /**
          * @inheritdoc
          */
@@ -5426,31 +5394,45 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_pair(pair: Pair<Key, T>): any;
+        protected _Insert_by_pair(pair: Pair<Key, T>): any;
         /**
          * @hidden
          */
-        protected insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
+        protected _Insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
         /**
          * @hidden
          */
-        protected insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
+        protected _Insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link HashMap map} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link HashMap map container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link HashMap container}.
+         */
+        swap(obj: HashMap<Key, T>): void;
         /**
          * @inheritdoc
          */
-        swap(obj: base.UniqueMap<Key, T>): void;
-        /**
-         * @hidden
-         */
-        private swap_hash_map(obj);
+        swap(obj: base.IContainer<Pair<Key, T>>): void;
     }
 }
 declare namespace std.HashMultiMap {
@@ -5461,15 +5443,15 @@ declare namespace std {
     /**
      * <p> Hashed, unordered Multimap. </p>
      *
-     * <p> {@link HashMap}s are associative containers that store elements formed by the combination of
-     * a <i>key value</i> and a <i>mapped value</i>, much like {@link HashMap} containers, but allowing
+     * <p> {@link HashMultiMap}s are associative containers that store elements formed by the combination of
+     * a <i>key value</i> and a <i>mapped value</i>, much like {@link HashMultiMap} containers, but allowing
      * different elements to have equivalent <i>keys</i>. </p>
      *
-     * <p> In an {@link HashMap}, the <i>key value</i> is generally used to uniquely identify the
+     * <p> In an {@link HashMultiMap}, the <i>key value</i> is generally used to uniquely identify the
      * element, while the <i>mapped value</i> is an object with the content associated to this <i>key</i>.
      * Types of <i>key</i> and <i>mapped value</i> may differ. </p>
      *
-     * <p> Internally, the elements in the {@link HashMap} are not sorted in any particular order with
+     * <p> Internally, the elements in the {@link HashMultiMap} are not sorted in any particular order with
      * respect to either their <i>key</i> or <i>mapped values</i>, but organized into <i>buckets</i> depending on
      * their hash values to allow for fast access to individual elements directly by their <i>key values</i>
      * (with a constant average time complexity on average). </p>
@@ -5500,9 +5482,9 @@ declare namespace std {
      * </dl>
      *
      * @param <Key> Type of the key values.
-     *				Each element in an {@link HashMap} is identified by a key value.
+     *				Each element in an {@link HashMultiMap} is identified by a key value.
      * @param <T> Type of the mapped value.
-     *			  Each element in an {@link HashMap} is used to store some data as its mapped value.
+     *			  Each element in an {@link HashMultiMap} is used to store some data as its mapped value.
      *
      * @reference http://www.cplusplus.com/reference/unordered_map/unordered_multimap
      * @author Jeongho Nam <http://samchon.org>
@@ -5513,13 +5495,27 @@ declare namespace std {
          */
         private hash_buckets_;
         /**
-         * @hidden
+         * Default Constructor.
          */
-        protected init(): void;
+        constructor();
         /**
-         * @hidden
+         * Construct from elements.
          */
-        protected construct_from_array(items: Array<Pair<Key, T>>): void;
+        constructor(items: Pair<Key, T>[]);
+        /**
+         * Contruct from tuples.
+         *
+         * @param array Tuples to be contained.
+         */
+        constructor(array: [Key, T][]);
+        /**
+         * Copy Constructor.
+         */
+        constructor(container: HashMultiMap<Key, T>);
+        /**
+         * Construct from range iterators.
+         */
+        constructor(begin: Iterator<Pair<Key, T>>, end: Iterator<Pair<Key, T>>);
         /**
          * @inheritdoc
          */
@@ -5595,31 +5591,45 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_pair(pair: Pair<Key, T>): any;
+        protected _Insert_by_pair(pair: Pair<Key, T>): any;
         /**
          * @hidden
          */
-        protected insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
+        protected _Insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
         /**
          * @hidden
          */
-        protected insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
+        protected _Insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link HashMultiMap map} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link HashMultiMap map container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link HashMultiMap container}.
+         */
+        swap(obj: HashMultiMap<Key, T>): void;
         /**
          * @inheritdoc
          */
-        swap(obj: base.MultiMap<Key, T>): void;
-        /**
-         * @hidden
-         */
-        private swap_hash_multimap(obj);
+        swap(obj: base.IContainer<Pair<Key, T>>): void;
     }
 }
 declare namespace std.base {
@@ -5666,39 +5676,11 @@ declare namespace std.base {
          * by storing {@link ListIterator iterators} ({@link SetIterator} references {@link ListIterator}) who are
          * created from {@link data_ here}. </p>
          */
-        protected data_: List<T>;
+        private data_;
         /**
          * Default Constructor.
          */
         constructor();
-        /**
-         * Construct from elements.
-         */
-        constructor(items: Array<T>);
-        /**
-         * Copy Constructor.
-         */
-        constructor(container: IContainer<T>);
-        /**
-         * Construct from range iterators.
-         */
-        constructor(begin: Iterator<T>, end: Iterator<T>);
-        /**
-         * @hidden
-         */
-        protected init(): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_array(items: Array<T>): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_container(container: IContainer<T>): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_range<InputIterator extends Iterator<T>>(begin: InputIterator, end: InputIterator): void;
         /**
          * @inheritdoc
          */
@@ -5762,6 +5744,10 @@ declare namespace std.base {
          * @inheritdoc
          */
         size(): number;
+        /**
+         * @hidden
+         */
+        _Get_data(): List<T>;
         /**
          * @inheritdoc
          */
@@ -5805,15 +5791,15 @@ declare namespace std.base {
         /**
          * @hidden
          */
-        protected abstract insert_by_val(val: T): any;
+        protected abstract _Insert_by_val(val: T): any;
         /**
          * @hidden
          */
-        protected abstract insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
+        protected abstract _Insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
         /**
          * @hidden
          */
-        protected abstract insert_by_range<U extends T, InputIterator extends Iterator<U>>(begin: InputIterator, end: InputIterator): void;
+        protected abstract _Insert_by_range<U extends T, InputIterator extends Iterator<U>>(begin: InputIterator, end: InputIterator): void;
         /**
          * <p> Erase an element. </p>
          * <p> Removes from the set container the elements whose value is <i>key</i>. </p>
@@ -5886,7 +5872,7 @@ declare namespace std.base {
          *			   [<i>first</i>, <i>last</i>), which contains all the elements between <i>first</i> and <i>last</i>,
          *			   including the element pointed by <i>first</i> but not the element pointed by <i>last</i>.
          */
-        protected abstract handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected abstract _Handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
         /**
          * <p> Abstract method handling deletions for indexing. </p>
          *
@@ -5907,7 +5893,11 @@ declare namespace std.base {
          *			   [<i>first</i>, <i>last</i>), which contains all the elements between <i>first</i> and <i>last</i>,
          *			   including the element pointed by <i>first</i> but not the element pointed by <i>last</i>.
          */
-        protected abstract handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected abstract _Handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        /**
+         * @hidden
+         */
+        protected _Swap(obj: SetContainer<T>): void;
     }
 }
 declare namespace std {
@@ -5990,7 +5980,7 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected create_neighbor(): SetReverseIterator<T>;
+        protected create_neighbor(base: SetIterator<T>): SetReverseIterator<T>;
     }
 }
 declare namespace std.base {
@@ -6055,10 +6045,6 @@ declare namespace std.base {
          * @inheritdoc
          */
         insert<U extends T, InputIterator extends Iterator<U>>(begin: InputIterator, end: InputIterator): void;
-        /**
-         * @inheritdoc
-         */
-        swap(obj: MultiSet<T>): void;
     }
 }
 declare namespace std.HashMultiSet {
@@ -6070,7 +6056,7 @@ declare namespace std {
      * <p> Hashed, unordered Multiset. </p>
      *
      * <p> {@link HashMultiSet HashMultiSets} are containers that store elements in no particular order, allowing fast
-     * retrieval of individual elements based on their value, much like {@link HashSet} containers,
+     * retrieval of individual elements based on their value, much like {@link HashMultiSet} containers,
      * but allowing different elements to have equivalent values. </p>
      *
      * <p> In an {@link HashMultiSet}, the value of an element is at the same time its <i>key</i>, used to
@@ -6116,13 +6102,21 @@ declare namespace std {
          */
         private hash_buckets_;
         /**
-         * @hidden
+         * Default Constructor.
          */
-        protected init(): void;
+        constructor();
         /**
-         * @hidden
+         * Construct from elements.
          */
-        protected construct_from_array(items: Array<T>): void;
+        constructor(items: T[]);
+        /**
+         * Copy Constructor.
+         */
+        constructor(container: HashMultiSet<T>);
+        /**
+         * Construct from range iterators.
+         */
+        constructor(begin: Iterator<T>, end: Iterator<T>);
         /**
          * @inheritdoc
          */
@@ -6198,31 +6192,45 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_val(val: T): any;
+        protected _Insert_by_val(val: T): any;
         /**
          * @hidden
          */
-        protected insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
+        protected _Insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
+        protected _Insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected _Handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected _Handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link HashMultiSet set} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link HashMultiSet set container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link HashMultiSet container}.
+         */
+        swap(obj: HashMultiSet<T>): void;
         /**
          * @inheritdoc
          */
-        swap(obj: base.MultiSet<T>): void;
-        /**
-         * @hidden
-         */
-        private swap_tree_set(obj);
+        swap(obj: base.IContainer<T>): void;
     }
 }
 declare namespace std.base {
@@ -6344,10 +6352,6 @@ declare namespace std.base {
          * @inheritdoc
          */
         insert<U extends T, InputIterator extends Iterator<U>>(begin: InputIterator, end: InputIterator): void;
-        /**
-         * @inheritdoc
-         */
-        swap(obj: UniqueSet<T>): void;
     }
 }
 declare namespace std.HashSet {
@@ -6399,19 +6403,27 @@ declare namespace std {
      * @reference http://www.cplusplus.com/reference/unordered_set/unordered_set
      * @author Jeongho Nam <http://samchon.org>
      */
-    class HashSet<T> extends base.UniqueSet<T> {
+    class HashSet<T> extends base.UniqueSet<T> implements base.IHashSet<T> {
         /**
          * @hidden
          */
         private hash_buckets_;
         /**
-         * @hidden
+         * Default Constructor.
          */
-        protected init(): void;
+        constructor();
         /**
-         * @hidden
+         * Construct from elements.
          */
-        protected construct_from_array(items: Array<T>): void;
+        constructor(items: T[]);
+        /**
+         * Copy Constructor.
+         */
+        constructor(container: HashSet<T>);
+        /**
+         * Construct from range iterators.
+         */
+        constructor(begin: Iterator<T>, end: Iterator<T>);
         /**
          * @inheritdoc
          */
@@ -6483,31 +6495,45 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_val(val: T): any;
+        protected _Insert_by_val(val: T): any;
         /**
          * @hidden
          */
-        protected insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
+        protected _Insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
+        protected _Insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected _Handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected _Handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link HashSet set} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link HashSet set container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link HashSet container}.
+         */
+        swap(obj: HashSet<T>): void;
         /**
          * @inheritdoc
          */
-        swap(obj: base.UniqueSet<T>): void;
-        /**
-         * @hidden
-         */
-        private swap_tree_set(obj);
+        swap(obj: base.IContainer<T>): void;
     }
 }
 declare namespace std.List {
@@ -6563,15 +6589,15 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected begin_: ListIterator<T>;
+        private begin_;
         /**
          * @hidden
          */
-        protected end_: ListIterator<T>;
+        private end_;
         /**
          * @hidden
          */
-        protected size_: number;
+        private size_;
         /**
          * <p> Default Constructor. </p>
          *
@@ -6604,7 +6630,7 @@ declare namespace std {
          * @param container Another container object of the same type (with the same class template
          *					arguments <i>T</i>), whose contents are either copied or acquired.
          */
-        constructor(container: base.IContainer<T>);
+        constructor(container: List<T>);
         /**
          * <p> Range Constructor. </p>
          *
@@ -6794,11 +6820,11 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_repeating_val(position: ListIterator<T>, size: number, val: T): ListIterator<T>;
+        protected _Insert_by_repeating_val(position: ListIterator<T>, size: number, val: T): ListIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends Iterator<U>>(position: ListIterator<T>, begin: InputIterator, end: InputIterator): ListIterator<T>;
+        protected _Insert_by_range<U extends T, InputIterator extends Iterator<U>>(position: ListIterator<T>, begin: InputIterator, end: InputIterator): ListIterator<T>;
         /**
          * <p> Erase an element. </p>
          *
@@ -6868,7 +6894,7 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected erase_by_range(first: ListIterator<T>, last: ListIterator<T>): ListIterator<T>;
+        protected _Erase_by_range(first: ListIterator<T>, last: ListIterator<T>): ListIterator<T>;
         /**
          * <p> Remove duplicate values. </p>
          *
@@ -7105,14 +7131,28 @@ declare namespace std {
          * @hidden
          */
         private partition(first, last, compare);
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link List container} object with same type of elements. Sizes and container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were in <i>obj</i>
+         * before the call, and the elements of <i>obj</i> are those which were in this. All iterators, references and
+         * pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link List container} of the same type of elements (i.e., instantiated
+         *			  with the same template parameter, <b>T</b>) whose content is swapped with that of this
+         *			  {@link container List}.
+         */
+        swap(obj: List<T>): void;
         /**
          * @inheritdoc
          */
         swap(obj: base.IContainer<T>): void;
-        /**
-         * @hidden
-         */
-        private swap_list(obj);
     }
 }
 declare namespace std {
@@ -7142,14 +7182,6 @@ declare namespace std {
          * @param value Value to be stored in the node (iterator).
          */
         constructor(source: List<T>, prev: ListIterator<T>, next: ListIterator<T>, value: T);
-        /**
-         * @inheritdoc
-         */
-        set_prev(it: ListIterator<T>): void;
-        /**
-         * @inheritdoc
-         */
-        set_next(next: ListIterator<T>): void;
         private list();
         /**
          * @inheritdoc
@@ -7172,6 +7204,14 @@ declare namespace std {
          * @param val Value to set.
          */
         value: T;
+        /**
+         * @hidden
+         */
+        _Set_prev(it: ListIterator<T>): void;
+        /**
+         * @hidden
+         */
+        _Set_next(it: ListIterator<T>): void;
         /**
          * @inheritdoc
          */
@@ -7204,7 +7244,10 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected create_neighbor(): ListReverseIterator<T>;
+        protected create_neighbor(base: ListIterator<T>): ListReverseIterator<T>;
+        /**
+         * @inheritdoc
+         */
         /**
          * Set value of the iterator is pointing to.
          *
@@ -7213,6 +7256,192 @@ declare namespace std {
         value: T;
     }
 }
+declare namespace std {
+    /**
+     * <p> Priority queue. </p>
+     *
+     * <p> {@link PriorityQueue Priority queues} are a type of container adaptors, specifically designed such that its
+     * first element is always the greatest of the elements it contains, according to some <i>strict weak ordering</i>
+     * criterion. </p>
+     *
+     * <p> This context is similar to a <i>heap</i>, where elements can be inserted at any moment, and only the
+     * <i>max heap</i> element can be retrieved (the one at the top in the {@link PriorityQueue priority queue}). </p>
+     *
+     * <p> {@link PriorityQueue Priority queues} are implemented as <i>container adaptors</i>, which are classes that
+     * use an encapsulated object of a specific container class as its {@link container_ underlying container},
+     * providing a specific set of member functions to access its elements. Elements are popped from the <i>"back"</i>
+     * of the specific container, which is known as the <i>top</i> of the {@link PriorityQueue Priority queue}. </p>
+     *
+     * <p> The {@link container_ underlying container} may be any of the standard container class templates or some
+     * other specifically designed container class. The container shall be accessible through
+     * {@link IArrayIterator random access iterators} and support the following operations: </p>
+     *
+     * <ul>
+     *	<li> empty() </li>
+     *	<li> size() </li>
+     *	<li> front() </li>
+     *	<li> push_back() </li>
+     *	<li> pop_back() </li>
+     * </ul>
+     *
+     * <p> The standard container classes {@link Vector} and {@link Deque} fulfill these requirements. By default, if
+     * no container class is specified for a particular {@link PriorityQueue} class instantiation, the standard
+     * container {@link Vector} is used. </p>
+     *
+     * <p> Support of {@link IArrayIterator random access iterators} is required to keep a heap structure internally
+     * at all times. This is done automatically by the container adaptor by automatically calling the algorithm
+     * functions <i>make_heap</i>, <i>push_heap</i> and <i>pop_heap</i> when needed. </p>
+     *
+     * @param <T> Type of the elements.
+     *
+     * @reference http://www.cplusplus.com/reference/queue/priority_queue/
+     * @author Jeongho Nam
+     */
+    class PriorityQueue<T> {
+        /**
+         * <p> The <i>underlying container</i> for implementing the <i>priority queue</i>. </p>
+         *
+         * <p> Following standard definition from the C++ committee, the <i>underlying container</i> should be one of
+         * {@link Vector} or {@link Deque}, however, I've adopted {@link TreeMultiSet} instead of them. Of course,
+         * there are proper reasons for adapting the {@link TreeMultiSet} even violating standard advice. </p>
+         *
+         * <p> <i>Underlying container</i> of {@link PriorityQueue} must keep a condition; the highest (or lowest)
+         * element must be placed on the terminal node for fast retrieval and deletion. To keep the condition with
+         * {@link Vector} or {@link Deque}, lots of times will only be spent for re-arranging elements. It calls
+         * rearrangement functions like <i>make_heap</i>, <i>push_heap</i> and <i>pop_head</i> for rearrangement. </p>
+         *
+         * <p> However, the {@link TreeMultiSet} container always keeps arrangment automatically without additional
+         * operations and it even meets full criteria of {@link PriorityQueue}. Those are the reason why I've adopted
+         * {@link TreeMultiSet} as the <i>underlying container</i> of {@link PriorityQueue}. </p>
+         */
+        private container_;
+        /**
+         * Default Constructor.
+         */
+        constructor();
+        /**
+         * Construct from compare.
+         *
+         * @param compare A binary predicate determines order of elements.
+         */
+        constructor(compare: (left: T, right: T) => boolean);
+        /**
+         * Contruct from elements.
+         *
+         * @param array Elements to be contained.
+         */
+        constructor(array: Array<T>);
+        /**
+         * Contruct from elements with compare.
+         *
+         * @param array Elements to be contained.
+         * @param compare A binary predicate determines order of elements.
+         */
+        constructor(array: Array<T>, compare: (left: T, right: T) => boolean);
+        /**
+         * Copy Constructor.
+         */
+        constructor(container: base.IContainer<T>);
+        /**
+         * Copy Constructor with compare.
+         *
+         * @param container A container to be copied.
+         * @param compare A binary predicate determines order of elements.
+         */
+        constructor(container: base.IContainer<T>, compare: (left: T, right: T) => boolean);
+        /**
+         * Range Constructor.
+         *
+         * @param begin Input interator of the initial position in a sequence.
+         * @param end Input interator of the final position in a sequence.
+         */
+        constructor(begin: Iterator<T>, end: Iterator<T>);
+        /**
+         * Range Constructor with compare.
+         *
+         * @param begin Input interator of the initial position in a sequence.
+         * @param end Input interator of the final position in a sequence.
+         * @param compare A binary predicate determines order of elements.
+         */
+        constructor(begin: Iterator<T>, end: Iterator<T>, compare: (left: T, right: T) => boolean);
+        /**
+         * <p> Return size. </p>
+         *
+         * <p> Returns the number of elements in the {@link PriorityQueue}. </p>
+         *
+         * <p> This member function effectively calls member {@link IArray.size size} of the
+         * {@link container_ underlying container} object. </p>
+         *
+         * @return The number of elements in the underlying
+         */
+        size(): number;
+        /**
+         * <p> Test whether container is empty. </p>
+         *
+         * <p> Returns whether the {@link PriorityQueue} is empty: i.e. whether its {@link size} is zero. </p>
+         *
+         * <p> This member function effectively calls member {@link IARray.empty empty} of the
+         * {@link container_ underlying container} object. </p>
+         */
+        empty(): boolean;
+        /**
+         * <p> Access top element. </p>
+         *
+         * <p> Returns a constant reference to the top element in the {@link PriorityQueue}. </p>
+         *
+         * <p> The top element is the element that compares higher in the {@link PriorityQueue}, and the next that is
+         * removed from the container when {@link PriorityQueue.pop} is called. </p>
+         *
+         * <p> This member function effectively calls member {@link IArray.front front} of the
+         * {@link container_ underlying container} object. </p>
+         *
+         * @return A reference to the top element in the {@link PriorityQueue}.
+         */
+        top(): T;
+        /**
+         * <p> Insert element. </p>
+         *
+         * <p> Inserts a new element in the {@link PriorityQueue}. The content of this new element is initialized to
+         * <i>val</i>.
+         *
+         * <p> This member function effectively calls the member function {@link IArray.push_back push_back} of the
+         * {@link container_ underlying container} object, and then reorders it to its location in the heap by calling
+         * the <i>push_heap</i> algorithm on the range that includes all the elements of the  </p>
+         *
+         * @param val Value to which the inserted element is initialized.
+         */
+        push(val: T): void;
+        /**
+         * <p> Remove top element. </p>
+         *
+         * <p> Removes the element on top of the {@link PriorityQueue}, effectively reducing its {@link size} by one.
+         * The element removed is the one with the highest (or lowest) value. </p>
+         *
+         * <p> The value of this element can be retrieved before being popped by calling member
+         * {@link PriorityQueue.top}. </p>
+         *
+         * <p> This member function effectively calls the <i>pop_heap</i> algorithm to keep the heap property of
+         * {@link PriorityQueue PriorityQueues} and then calls the member function {@link IArray.pop_back pop_back} of
+         * the {@link container_ underlying container} object to remove the element. </p>
+         */
+        pop(): void;
+        /**
+         * <p> Swap contents. </p>
+         *
+         * <p> Exchanges the contents of the container adaptor by those of <i>obj</i>, swapping both the
+         * {@link container_ underlying container} value and their comparison function using the corresponding
+         * {@link std.swap swap} non-member functions (unqualified). </p>
+         *
+         * <p> This member function has a <i>noexcept</i> specifier that matches the combined <i>noexcept</i> of the
+         * {@link IArray.swap swap} operations on the {@link container_ underlying container} and the comparison
+         * functions. </p>
+         *
+         * @param obj {@link PriorityQueue} container adaptor of the same type (i.e., instantiated with the same
+         *			  template parameters, <b>T</b>). Sizes may differ.
+         */
+        swap(obj: PriorityQueue<T>): void;
+    }
+}
 declare namespace std {
     /**
      * <p> FIFO queue. </p>
@@ -7349,204 +7578,6 @@ declare namespace std {
         swap(obj: Queue<T>): void;
     }
 }
-declare namespace std {
-    /**
-     * <p> Priority queue. </p>
-     *
-     * <p> {@link PriorityQueue Priority queues} are a type of container adaptors, specifically designed such that its
-     * first element is always the greatest of the elements it contains, according to some <i>strict weak ordering</i>
-     * criterion. </p>
-     *
-     * <p> This context is similar to a <i>heap</i>, where elements can be inserted at any moment, and only the
-     * <i>max heap</i> element can be retrieved (the one at the top in the {@link PriorityQueue priority queue}). </p>
-     *
-     * <p> {@link PriorityQueue Priority queues} are implemented as <i>container adaptors</i>, which are classes that
-     * use an encapsulated object of a specific container class as its {@link container_ underlying container},
-     * providing a specific set of member functions to access its elements. Elements are popped from the <i>"back"</i>
-     * of the specific container, which is known as the <i>top</i> of the {@link PriorityQueue Priority queue}. </p>
-     *
-     * <p> The {@link container_ underlying container} may be any of the standard container class templates or some
-     * other specifically designed container class. The container shall be accessible through
-     * {@link IArrayIterator random access iterators} and support the following operations: </p>
-     *
-     * <ul>
-     *	<li> empty() </li>
-     *	<li> size() </li>
-     *	<li> front() </li>
-     *	<li> push_back() </li>
-     *	<li> pop_back() </li>
-     * </ul>
-     *
-     * <p> The standard container classes {@link Vector} and {@link Deque} fulfill these requirements. By default, if
-     * no container class is specified for a particular {@link PriorityQueue} class instantiation, the standard
-     * container {@link Vector} is used. </p>
-     *
-     * <p> Support of {@link IArrayIterator random access iterators} is required to keep a heap structure internally
-     * at all times. This is done automatically by the container adaptor by automatically calling the algorithm
-     * functions <i>make_heap</i>, <i>push_heap</i> and <i>pop_heap</i> when needed. </p>
-     *
-     * @param <T> Type of the elements.
-     *
-     * @reference http://www.cplusplus.com/reference/queue/priority_queue/
-     * @author Jeongho Nam
-     */
-    class PriorityQueue<T> {
-        /**
-         * <p> The <i>underlying container</i> for implementing the <i>priority queue</i>. </p>
-         *
-         * <p> Following standard definition from the C++ committee, the <i>underlying container</i> should be one of
-         * {@link Vector} or {@link Deque}, however, I've adopted {@link TreeMultiSet} instead of them. Of course,
-         * there are proper reasons for adapting the {@link TreeMultiSet} even violating standard advice. </p>
-         *
-         * <p> <i>Underlying container</i> of {@link PriorityQueue} must keep a condition; the highest (or lowest)
-         * element must be placed on the terminal node for fast retrieval and deletion. To keep the condition with
-         * {@link Vector} or {@link Deque}, lots of times will only be spent for re-arranging elements. It calls
-         * rearrangement functions like <i>make_heap</i>, <i>push_heap</i> and <i>pop_head</i> for rearrangement. </p>
-         *
-         * <p> However, the {@link TreeMultiSet} container always keeps arrangment automatically without additional
-         * operations and it even meets full criteria of {@link PriorityQueue}. Those are the reason why I've adopted
-         * {@link TreeMultiSet} as the <i>underlying container</i> of {@link PriorityQueue}. </p>
-         */
-        private container_;
-        /**
-         * Default Constructor.
-         */
-        constructor();
-        /**
-         * Construct from compare.
-         *
-         * @param compare A binary predicate determines order of elements.
-         */
-        constructor(compare: (left: T, right: T) => boolean);
-        /**
-         * Contruct from elements.
-         *
-         * @param array Elements to be contained.
-         */
-        constructor(array: Array<T>);
-        /**
-         * Contruct from elements with compare.
-         *
-         * @param array Elements to be contained.
-         * @param compare A binary predicate determines order of elements.
-         */
-        constructor(array: Array<T>, compare: (left: T, right: T) => boolean);
-        /**
-         * Copy Constructor.
-         */
-        constructor(container: base.Container<T>);
-        /**
-         * Copy Constructor with compare.
-         *
-         * @param container A container to be copied.
-         * @param compare A binary predicate determines order of elements.
-         */
-        constructor(container: base.Container<T>, compare: (left: T, right: T) => boolean);
-        /**
-         * Range Constructor.
-         *
-         * @param begin Input interator of the initial position in a sequence.
-         * @param end Input interator of the final position in a sequence.
-         */
-        constructor(begin: Iterator<T>, end: Iterator<T>);
-        /**
-         * Range Constructor with compare.
-         *
-         * @param begin Input interator of the initial position in a sequence.
-         * @param end Input interator of the final position in a sequence.
-         * @param compare A binary predicate determines order of elements.
-         */
-        constructor(begin: Iterator<T>, end: Iterator<T>, compare: (left: T, right: T) => boolean);
-        /**
-         * @hidden
-         */
-        protected construct_from_array(items: Array<T>): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_container(container: base.IContainer<T>): void;
-        /**
-         * @hidden
-         */
-        protected construct_from_range(begin: Iterator<T>, end: Iterator<T>): void;
-        /**
-         * <p> Return size. </p>
-         *
-         * <p> Returns the number of elements in the {@link PriorityQueue}. </p>
-         *
-         * <p> This member function effectively calls member {@link IArray.size size} of the
-         * {@link container_ underlying container} object. </p>
-         *
-         * @return The number of elements in the underlying
-         */
-        size(): number;
-        /**
-         * <p> Test whether container is empty. </p>
-         *
-         * <p> Returns whether the {@link PriorityQueue} is empty: i.e. whether its {@link size} is zero. </p>
-         *
-         * <p> This member function effectively calls member {@link IARray.empty empty} of the
-         * {@link container_ underlying container} object. </p>
-         */
-        empty(): boolean;
-        /**
-         * <p> Access top element. </p>
-         *
-         * <p> Returns a constant reference to the top element in the {@link PriorityQueue}. </p>
-         *
-         * <p> The top element is the element that compares higher in the {@link PriorityQueue}, and the next that is
-         * removed from the container when {@link PriorityQueue.pop} is called. </p>
-         *
-         * <p> This member function effectively calls member {@link IArray.front front} of the
-         * {@link container_ underlying container} object. </p>
-         *
-         * @return A reference to the top element in the {@link PriorityQueue}.
-         */
-        top(): T;
-        /**
-         * <p> Insert element. </p>
-         *
-         * <p> Inserts a new element in the {@link PriorityQueue}. The content of this new element is initialized to
-         * <i>val</i>.
-         *
-         * <p> This member function effectively calls the member function {@link IArray.push_back push_back} of the
-         * {@link container_ underlying container} object, and then reorders it to its location in the heap by calling
-         * the <i>push_heap</i> algorithm on the range that includes all the elements of the  </p>
-         *
-         * @param val Value to which the inserted element is initialized.
-         */
-        push(val: T): void;
-        /**
-         * <p> Remove top element. </p>
-         *
-         * <p> Removes the element on top of the {@link PriorityQueue}, effectively reducing its {@link size} by one.
-         * The element removed is the one with the highest (or lowest) value. </p>
-         *
-         * <p> The value of this element can be retrieved before being popped by calling member
-         * {@link PriorityQueue.top}. </p>
-         *
-         * <p> This member function effectively calls the <i>pop_heap</i> algorithm to keep the heap property of
-         * {@link PriorityQueue PriorityQueues} and then calls the member function {@link IArray.pop_back pop_back} of
-         * the {@link container_ underlying container} object to remove the element. </p>
-         */
-        pop(): void;
-        /**
-         * <p> Swap contents. </p>
-         *
-         * <p> Exchanges the contents of the container adaptor by those of <i>obj</i>, swapping both the
-         * {@link container_ underlying container} value and their comparison function using the corresponding
-         * {@link std.swap swap} non-member functions (unqualified). </p>
-         *
-         * <p> This member function has a <i>noexcept</i> specifier that matches the combined <i>noexcept</i> of the
-         * {@link IArray.swap swap} operations on the {@link container_ underlying container} and the comparison
-         * functions. </p>
-         *
-         * @param obj {@link PriorityQueue} container adaptor of the same type (i.e., instantiated with the same
-         *			  template parameters, <b>T</b>). Sizes may differ.
-         */
-        swap(obj: PriorityQueue<T>): void;
-    }
-}
 declare namespace std {
     /**
      * <p> LIFO stack. </p>
@@ -8142,14 +8173,14 @@ declare namespace std {
          *
          * @param container Another map to copy.
          */
-        constructor(container: base.MapContainer<Key, T>);
+        constructor(container: TreeMap<Key, T>);
         /**
          * Copy Constructor.
          *
          * @param container Another map to copy.
          * @param compare A binary predicate determines order of elements.
          */
-        constructor(container: base.MapContainer<Key, T>, compare: (x: Key, y: Key) => boolean);
+        constructor(container: TreeMap<Key, T>, compare: (x: Key, y: Key) => boolean);
         /**
          * Range Constructor.
          *
@@ -8196,31 +8227,45 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_pair(pair: Pair<Key, T>): any;
+        protected _Insert_by_pair(pair: Pair<Key, T>): any;
         /**
          * @hidden
          */
-        protected insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
+        protected _Insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
         /**
          * @hidden
          */
-        protected insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
+        protected _Insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link TreeMap map} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link TreeMap map container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link TreeMap container}.
+         */
+        swap(obj: TreeMap<Key, T>): void;
         /**
          * @inheritdoc
          */
-        swap(obj: base.UniqueMap<Key, T>): void;
-        /**
-         * @hidden
-         */
-        private swap_tree_map(obj);
+        swap(obj: base.IContainer<Pair<Key, T>>): void;
     }
 }
 declare namespace std.TreeMultiMap {
@@ -8330,14 +8375,14 @@ declare namespace std {
          *
          * @param container Another map to copy.
          */
-        constructor(container: base.MapContainer<Key, T>);
+        constructor(container: TreeMultiMap<Key, T>);
         /**
          * Copy Constructor.
          *
          * @param container Another map to copy.
          * @param compare A binary predicate determines order of elements.
          */
-        constructor(container: base.MapContainer<Key, T>, compare: (x: Key, y: Key) => boolean);
+        constructor(container: TreeMultiMap<Key, T>, compare: (x: Key, y: Key) => boolean);
         /**
          * Range Constructor.
          *
@@ -8388,31 +8433,45 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_pair(pair: Pair<Key, T>): any;
+        protected _Insert_by_pair(pair: Pair<Key, T>): any;
         /**
          * @hidden
          */
-        protected insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
+        protected _Insert_by_hint(hint: MapIterator<Key, T>, pair: Pair<Key, T>): MapIterator<Key, T>;
         /**
          * @hidden
          */
-        protected insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
+        protected _Insert_by_range<L extends Key, U extends T, InputIterator extends Iterator<Pair<L, U>>>(first: InputIterator, last: InputIterator): void;
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_insert(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        protected _Handle_erase(first: MapIterator<Key, T>, last: MapIterator<Key, T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link TreeMapMulti map} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link TreeMapMulti map container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link TreeMapMulti container}.
+         */
+        swap(obj: TreeMultiMap<Key, T>): void;
         /**
          * @inheritdoc
          */
-        swap(obj: base.MultiMap<Key, T>): void;
-        /**
-         * @hidden
-         */
-        private swap_tree_multimap(obj);
+        swap(obj: base.IContainer<Pair<Key, T>>): void;
     }
 }
 declare namespace std.TreeMultiSet {
@@ -8501,14 +8560,14 @@ declare namespace std {
         /**
          * Copy Constructor.
          */
-        constructor(container: base.Container<T>);
+        constructor(container: TreeMultiSet<T>);
         /**
          * Copy Constructor with compare.
          *
          * @param container A container to be copied.
          * @param compare A binary predicate determines order of elements.
          */
-        constructor(container: base.Container<T>, compare: (x: T, y: T) => boolean);
+        constructor(container: TreeMultiSet<T>, compare: (x: T, y: T) => boolean);
         /**
          * Range Constructor.
          *
@@ -8559,31 +8618,49 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_val(val: T): any;
+        _Get_tree(): base.AtomicTree<T>;
         /**
          * @hidden
          */
-        protected insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
+        protected _Insert_by_val(val: T): any;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
-        /**
-         * @inheritdoc
-         */
-        protected handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
-        /**
-         * @inheritdoc
-         */
-        protected handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
-        /**
-         * @inheritdoc
-         */
-        swap(obj: base.MultiSet<T>): void;
+        protected _Insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
         /**
          * @hidden
          */
-        private swap_tree_set(obj);
+        protected _Insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
+        /**
+         * @inheritdoc
+         */
+        protected _Handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
+        /**
+         * @inheritdoc
+         */
+        protected _Handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link TreeMultiSet set} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link TreeMultiSet set container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link TreeMultiSet container}.
+         */
+        swap(obj: TreeMultiSet<T>): void;
+        /**
+         * @inheritdoc
+         */
+        swap(obj: base.IContainer<T>): void;
     }
 }
 declare namespace std.TreeSet {
@@ -8671,14 +8748,14 @@ declare namespace std {
         /**
          * Copy Constructor.
          */
-        constructor(container: base.IContainer<T>);
+        constructor(container: TreeMultiSet<T>);
         /**
          * Copy Constructor with compare.
          *
          * @param container A container to be copied.
          * @param compare A binary predicate determines order of elements.
          */
-        constructor(container: base.IContainer<T>, compare: (x: T, y: T) => boolean);
+        constructor(container: TreeMultiSet<T>, compare: (x: T, y: T) => boolean);
         /**
          * Range Constructor.
          *
@@ -8687,7 +8764,7 @@ declare namespace std {
          */
         constructor(begin: Iterator<T>, end: Iterator<T>);
         /**
-         * Range Constructor with compare.
+         * Construct from range and compare.
          *
          * @param begin Input interator of the initial position in a sequence.
          * @param end Input interator of the final position in a sequence.
@@ -8725,28 +8802,42 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_val(val: T): any;
-        protected insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
+        protected _Insert_by_val(val: T): any;
+        protected _Insert_by_hint(hint: SetIterator<T>, val: T): SetIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
+        protected _Insert_by_range<U extends T, InputIterator extends Iterator<U>>(first: InputIterator, last: InputIterator): void;
         /**
          * @inheritdoc
          */
-        protected handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected _Handle_insert(first: SetIterator<T>, last: SetIterator<T>): void;
         /**
          * @inheritdoc
          */
-        protected handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        protected _Handle_erase(first: SetIterator<T>, last: SetIterator<T>): void;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link TreeSet set} of the same type. Sizes abd container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were
+         * in <i>obj</i> before the call, and the elements of <i>obj</i> are those which were in this. All
+         * iterators, references and pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link TreeSet set container} of the same type of elements as this (i.e.,
+         *			  with the same template parameters, <b>Key</b> and <b>T</b>) whose content is swapped
+         *			  with that of this {@link TreeSet container}.
+         */
+        swap(obj: TreeSet<T>): void;
         /**
          * @inheritdoc
          */
-        swap(obj: base.UniqueSet<T>): void;
-        /**
-         * @hidden
-         */
-        private swap_tree_set(obj);
+        swap(obj: base.IContainer<T>): void;
     }
 }
 declare namespace std {
@@ -8880,7 +8971,7 @@ declare namespace std {
      * @reference http://www.cplusplus.com/reference/vector/vector
      * @author Jeongho Nam <http://samchon.org>
      */
-    class Vector<T> extends Array<T> implements base.IArrayContainer<T> {
+    class Vector<T> extends Array<T> implements base.IContainer<T>, base.IArrayContainer<T> {
         /**
          * <p> Default Constructor. </p>
          *
@@ -8917,7 +9008,7 @@ declare namespace std {
          * @param container Another container object of the same type (with the same class template
          *					arguments <i>T</i>), whose contents are either copied or acquired.
          */
-        constructor(container: base.IContainer<T>);
+        constructor(container: Vector<T>);
         /**
          * <p> Range Constructor. </p>
          *
@@ -9137,11 +9228,11 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected insert_by_repeating_val(position: VectorIterator<T>, n: number, val: T): VectorIterator<T>;
+        protected _Insert_by_repeating_val(position: VectorIterator<T>, n: number, val: T): VectorIterator<T>;
         /**
          * @hidden
          */
-        protected insert_by_range<InputIterator extends Iterator<T>>(position: VectorIterator<T>, first: InputIterator, last: InputIterator): VectorIterator<T>;
+        protected _Insert_by_range<InputIterator extends Iterator<T>>(position: VectorIterator<T>, first: InputIterator, last: InputIterator): VectorIterator<T>;
         /**
          * @inheritdoc
          */
@@ -9227,7 +9318,25 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected erase_by_range(first: VectorIterator<T>, last: VectorIterator<T>): VectorIterator<T>;
+        protected _Erase_by_range(first: VectorIterator<T>, last: VectorIterator<T>): VectorIterator<T>;
+        /**
+         * <p> Swap content. </p>
+         *
+         * <p> Exchanges the content of the container by the content of <i>obj</i>, which is another
+         * {@link Vector container} object with same type of elements. Sizes and container type may differ. </p>
+         *
+         * <p> After the call to this member function, the elements in this container are those which were in <i>obj</i>
+         * before the call, and the elements of <i>obj</i> are those which were in this. All iterators, references and
+         * pointers remain valid for the swapped objects. </p>
+         *
+         * <p> Notice that a non-member function exists with the same name, {@link std.swap swap}, overloading that
+         * algorithm with an optimization that behaves like this member function. </p>
+         *
+         * @param obj Another {@link Vector container} of the same type of elements (i.e., instantiated
+         *			  with the same template parameter, <b>T</b>) whose content is swapped with that of this
+         *			  {@link container Vector}.
+         */
+        obj(obj: Vector<T>): void;
         /**
          * @inheritdoc
          */
@@ -9335,7 +9444,10 @@ declare namespace std {
         /**
          * @hidden
          */
-        protected create_neighbor(): VectorReverseIterator<T>;
+        protected create_neighbor(base: VectorIterator<T>): VectorReverseIterator<T>;
+        /**
+         * @inheritdoc
+         */
         /**
          * Set value of the iterator is pointing to.
          *
@@ -11328,6 +11440,7 @@ declare namespace std.base {
          * Default Constructor.
          */
         constructor(map: TreeMap<Key, T> | TreeMultiMap<Key, T>, compare?: (x: Key, y: Key) => boolean);
+        _Set_compare(val: (x: Key, y: Key) => boolean): void;
         find(key: Key): XTreeNode<MapIterator<Key, T>>;
         find(it: MapIterator<Key, T>): XTreeNode<MapIterator<Key, T>>;
         /**
@@ -11628,6 +11741,7 @@ declare namespace std.base {
          * Default Constructor.
          */
         constructor(set: TreeSet<T> | TreeMultiSet<T>, compare?: (x: T, y: T) => boolean);
+        _Set_compare(val: (x: T, y: T) => boolean): void;
         find(val: T): XTreeNode<SetIterator<T>>;
         find(it: SetIterator<T>): XTreeNode<SetIterator<T>>;
         /**
diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index fd335b7361..432b47ea04 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -166,6 +166,8 @@ _.some({ a: 'a', b: 'B', c: 'C', d: 'd' }, l => l === l.toUpperCase());
 
 _.contains([1, 2, 3], 3);
 
+_.contains([1, 2, 3], 3, 1);
+
 _.invoke([[5, 1, 7], [3, 2, 1]], 'sort');
 
 var stooges = [{ name: 'moe', age: 40 }, { name: 'larry', age: 50 }, { name: 'curly', age: 60 }];
@@ -278,10 +280,12 @@ _.defer(function () { alert('deferred'); });
 var updatePosition = (param:string) => alert('updating position... Param: ' + param);
 var throttled = _.throttle(updatePosition, 100);
 $(window).scroll(throttled);
+throttled.cancel();
 
 var calculateLayout = (param:string) => alert('calculating layout... Param: ' + param);
 var lazyLayout = _.debounce(calculateLayout, 300);
 $(window).resize(lazyLayout);
+lazyLayout.cancel();
 
 var createApplication = (param:string) => alert('creating application... Param: ' + param);
 var initialize = _.once(createApplication);
@@ -406,6 +410,7 @@ function useBoolean(arg: Boolean) {};
 function useDate(arg: Date) {};
 function useRegExp(arg: RegExp) {};
 function useArray<T>(arg: T[]) {};
+function useSymbol(arg: symbol) {};
 
 var guardedType: {};
 if(_.isElement(guardedType)) useElement(guardedType);
@@ -419,6 +424,7 @@ if(_.isNumber(guardedType)) useNumber(guardedType);
 if(_.isBoolean(guardedType)) useBoolean(guardedType);
 if(_.isDate(guardedType)) useDate(guardedType);
 if(_.isRegExp(guardedType)) useRegExp(guardedType);
+if(_.isSymbol(guardedType)) useSymbol(guardedType);
 
 ///////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index cb5dfaa393..d8d08a3b75 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Underscore 1.7.0
+// Type definitions for Underscore 1.8.3
 // Project: http://underscorejs.org/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>, Christopher Currens <https://github.com/ccurrens/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -74,6 +74,10 @@ declare module _ {
 	interface MemoObjectIterator<T, TResult> {
 		(prev: TResult, curr: T, key: string, list: Dictionary<T>): TResult;
 	}
+
+	interface Cancelable {
+		cancel() : void;
+	}
 }
 
 interface UnderscoreStatic {
@@ -458,10 +462,10 @@ interface UnderscoreStatic {
 		object: _.Dictionary<T>,
 		iterator?: _.ObjectIterator<T, boolean>,
 		context?: any): boolean;
-		
+
 	any<T>(
 		list: _.List<T>,
-		value: T): boolean;		
+		value: T): boolean;
 
 	/**
 	* Returns true if the value is present in the list. Uses indexOf internally,
@@ -472,7 +476,8 @@ interface UnderscoreStatic {
 	**/
 	contains<T>(
 		list: _.List<T>,
-		value: T): boolean;
+		value: T,
+		fromIndex?: number): boolean;
 
 	/**
 	* @see _.contains
@@ -486,7 +491,8 @@ interface UnderscoreStatic {
 	**/
 	include<T>(
 		list: _.Collection<T>,
-		value: T): boolean;
+		value: T,
+		fromIndex?: number): boolean;
 
 	/**
 	* @see _.contains
@@ -495,6 +501,21 @@ interface UnderscoreStatic {
 		object: _.Dictionary<T>,
 		value: T): boolean;
 
+	/**
+	* @see _.contains
+	**/
+	includes<T>(
+		list: _.Collection<T>,
+		value: T,
+		fromIndex?: number): boolean;
+
+	/**
+	* @see _.contains
+	**/
+	includes<T>(
+		object: _.Dictionary<T>,
+		value: T): boolean;
+
 	/**
 	* Calls the method named by methodName on each value in the list. Any extra arguments passed to
 	* invoke will be forwarded on to the method invocation.
@@ -1055,6 +1076,14 @@ interface UnderscoreStatic {
 	**/
 	range(stop: number): number[];
 
+	/**
+	* Split an **array** into several arrays containing **count** or less elements
+	* of initial array.
+	* @param array The array to split
+	* @param count The maximum size of the inner arrays.
+	*/
+	chunk<T>(array: _.Collection<T>, count: number): (_.Collection<T>)[]
+
 	/*************
 	 * Functions *
 	 *************/
@@ -3433,7 +3462,7 @@ interface UnderscoreStatic {
 	throttle<T extends Function>(
 		func: T,
 		wait: number,
-		options?: _.ThrottleSettings): T;
+		options?: _.ThrottleSettings): T & _.Cancelable;
 
 	/**
 	* Creates and returns a new debounced version of the passed function that will postpone its execution
@@ -3452,7 +3481,7 @@ interface UnderscoreStatic {
 	debounce<T extends Function>(
 		fn: T,
 		wait: number,
-		immediate?: boolean): T;
+		immediate?: boolean): T & _.Cancelable;
 
 	/**
 	* Creates a version of the function that can only be called one time. Repeated calls to the modified
@@ -3463,6 +3492,12 @@ interface UnderscoreStatic {
 	**/
 	once<T extends Function>(fn: T): T;
 
+	/**
+	* Similar to ES6's rest param (http://ariya.ofilabs.com/2013/03/es6-and-rest-parameter.html)
+	* This accumulates the arguments passed into an array, after a given index.
+	**/
+	restArgs(func: Function, starIndex?: number) : Function;
+
 	/**
 	* Creates a version of the function that will only be run after first being called count times. Useful
 	* for grouping asynchronous responses, where you want to be sure that all the async calls have finished,
@@ -3624,6 +3659,14 @@ interface UnderscoreStatic {
 		destination: any,
 		...source: any[]): any;
 
+	/**
+	* Returns the first key on an object that passes a predicate test.
+	* @param obj the object to search in
+	* @param predicate Predicate function.
+	* @param context `this` object in `iterator`, optional.
+	*/
+	findKey<T>(obj: _.Dictionary<T>, predicate: _.ObjectIterator<T, boolean>, context? : any): T
+
 	/**
 	* Return a copy of the object, filtered to only have values for the whitelisted keys
 	* (or array of valid keys).
@@ -3677,6 +3720,16 @@ interface UnderscoreStatic {
 		object: any,
 		...defaults: any[]): any;
 
+
+	/**
+	* Creates an object that inherits from the given prototype object.
+	* If additional properties are provided then they will be added to the
+	* created object.
+	* @param prototype The prototype that the returned object will inherit from.
+	* @param props Additional props added to the returned object.
+	**/
+	create(prototype: any, props?: Object): any;
+
 	/**
 	* Create a shallow-copied clone of the object.
 	* Any nested objects or arrays will be copied by reference, not duplicated.
@@ -3710,6 +3763,14 @@ interface UnderscoreStatic {
 	**/
 	matches<T, TResult>(attrs: T): _.ListIterator<T, TResult>;
 
+	/**
+	* Returns a predicate function that will tell you if a passed in object contains all of the key/value properties present in attrs.
+	* @see _.matches
+	* @param attrs Object with key values pair
+	* @return Predicate function
+	**/
+	matcher<T, TResult>(attrs: T): _.ListIterator<T, TResult>;
+
 	/**
 	* Returns a function that will itself return the key property of any passed-in object.
 	* @param key Property of the object.
@@ -3760,7 +3821,7 @@ interface UnderscoreStatic {
 	* @param object Check if this object is an Array.
 	* @return True if `object` is an Array, otherwise false.
 	**/
-	isArray(object: any): object is [];
+	isArray(object: any): object is any[];
 
 	/**
 	* Returns true if object is an Array.
@@ -3769,6 +3830,13 @@ interface UnderscoreStatic {
 	**/
 	isArray<T>(object: any): object is T[];
 
+	/**
+	 * Returns true if object is a Symbol.
+	 * @param object Check if this object is a Symbol.
+	 * @return True if `object` is a Symbol, otherwise false.
+	 **/
+	isSymbol(object: any): object is symbol;
+
 	/**
 	* Returns true if value is an Object. Note that JavaScript arrays and functions are objects,
 	* while (normal) strings and numbers are not.
@@ -3935,11 +4003,10 @@ interface UnderscoreStatic {
 	* a property matcher, or a propetery accessor.
 	* @param string|Function|Object value The value to iterate over, usually the key.
 	* @param any context
-	* @param number argCount
 	* @return Callback that can be applied to each element in a collection.
 	**/
 	iteratee(value: string): Function;
-	iteratee(value: Function, context?: any, argCount?: number): Function;
+	iteratee(value: Function, context?: any): Function;
 	iteratee(value: Object): Function;
 
 	/**
@@ -4178,13 +4245,19 @@ interface Underscore<T> {
 	* Wrapped type `any[]`.
 	* @see _.contains
 	**/
-	contains(value: T): boolean;
+	contains(value: T, fromIndex? : number): boolean;
 
 	/**
 	* Alias for 'contains'.
 	* @see contains
 	**/
-	include(value: T): boolean;
+	include(value: T, fromIndex? : number): boolean;
+
+	/**
+	 * Alias for 'contains'.
+	 * @see contains
+	 **/
+	includes(value: T, fromIndex? : number): boolean;
 
 	/**
 	* Wrapped type `any[]`.
@@ -4513,6 +4586,12 @@ interface Underscore<T> {
 	**/
 	range(): number[];
 
+	/**
+	 * Wrapped type any[][].
+	 * @see _.chunk
+	 **/
+	chunk(): any[][];
+
 	/* ***********
 	 * Functions *
 	************ */
@@ -4562,13 +4641,13 @@ interface Underscore<T> {
 	* Wrapped type `Function`.
 	* @see _.throttle
 	**/
-	throttle(wait: number, options?: _.ThrottleSettings): Function;
+	throttle(wait: number, options?: _.ThrottleSettings): Function & _.Cancelable;
 
 	/**
 	* Wrapped type `Function`.
 	* @see _.debounce
 	**/
-	debounce(wait: number, immediate?: boolean): Function;
+	debounce(wait: number, immediate?: boolean): Function & _.Cancelable;
 
 	/**
 	* Wrapped type `Function`.
@@ -4576,6 +4655,12 @@ interface Underscore<T> {
 	**/
 	once(): Function;
 
+	/**
+	* Wrapped type `Function`.
+	* @see _.once
+	**/
+	restArgs(starIndex?: number) : Function;
+
 	/**
 	* Wrapped type `number`.
 	* @see _.after
@@ -4657,6 +4742,12 @@ interface Underscore<T> {
 	**/
 	extend(...sources: any[]): any;
 
+	/**
+	* Wrapped type `object`.
+	* @see _.extend
+	**/
+	findKey(predicate: _.ObjectIterator<any, boolean>, context? : any): any
+
 	/**
 	* Wrapped type `object`.
 	* @see _.pick
@@ -4679,6 +4770,12 @@ interface Underscore<T> {
 	**/
 	defaults(...defaults: any[]): any;
 
+	/**
+	* Wrapped type `any`.
+	* @see _.create
+	**/
+	create(props?: Object): any;
+
 	/**
 	* Wrapped type `any[]`.
 	* @see _.clone
@@ -4703,6 +4800,12 @@ interface Underscore<T> {
 	**/
 	matches<TResult>(): _.ListIterator<T, TResult>;
 
+	/**
+	 * Wrapped type `any[]`.
+	 * @see _.matcher
+	 **/
+	matcher<TResult>(): _.ListIterator<T, TResult>;
+
 	/**
 	* Wrapped type `string`.
 	* @see _.property
@@ -4745,6 +4848,12 @@ interface Underscore<T> {
 	**/
 	isArray(): boolean;
 
+	/**
+	 * Wrapped type `object`.
+	 * @see _.isSymbol
+	 **/
+	isSymbol(): boolean;
+
 	/**
 	* Wrapped type `object`.
 	* @see _.isObject
@@ -4872,7 +4981,7 @@ interface Underscore<T> {
 	* Wrapped type `string|Function|Object`.
 	* @see _.iteratee
 	**/
-	iteratee(context?: any, argCount?: number): Function;
+	iteratee(context?: any): Function;
 
 	/**
 	* Wrapped type `string`.
@@ -5074,7 +5183,7 @@ interface _Chain<T> {
 	* Wrapped type `any[]`.
 	* @see _.all
 	**/
-	all(iterator?: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+	all(iterator?: _.ListIterator<T, boolean>, context?: any): _ChainSingle<boolean>;
 
 	/**
 	* @see _.all
@@ -5096,13 +5205,19 @@ interface _Chain<T> {
 	* Wrapped type `any[]`.
 	* @see _.contains
 	**/
-	contains(value: T): _ChainSingle<boolean>;
+	contains(value: T, fromIndex?: number): _ChainSingle<boolean>;
 
 	/**
 	* Alias for 'contains'.
 	* @see contains
 	**/
-	include(value: T): _ChainSingle<boolean>;
+	include(value: T, fromIndex?: number): _ChainSingle<boolean>;
+
+	/**
+	 * Alias for 'contains'.
+	 * @see contains
+	 **/
+	includes(value: T, fromIndex?: number): _ChainSingle<boolean>;
 
 	/**
 	* Wrapped type `any[]`.
@@ -5390,18 +5505,18 @@ interface _Chain<T> {
 	* Wrapped type `any[]`.
 	* @see _.indexOf
 	**/
-	indexOf(value: T, isSorted?: boolean): _ChainSingle<T>;
+	indexOf(value: T, isSorted?: boolean): _ChainSingle<number>;
 
 	/**
 	* @see _.indexOf
 	**/
-	indexOf(value: T, startFrom: number): _ChainSingle<T>;
+	indexOf(value: T, startFrom: number): _ChainSingle<number>;
 
 	/**
 	* Wrapped type `any[]`.
 	* @see _.lastIndexOf
 	**/
-	lastIndexOf(value: T, from?: number): _ChainSingle<T>;
+	lastIndexOf(value: T, from?: number): _ChainSingle<number>;
 
 	/**
 	* @see _.findIndex
@@ -5417,7 +5532,7 @@ interface _Chain<T> {
 	* Wrapped type `any[]`.
 	* @see _.sortedIndex
 	**/
-	sortedIndex(value: T, iterator?: (x: T) => any, context?: any): _Chain<T>;
+	sortedIndex(value: T, iterator?: (x: T) => any, context?: any): _ChainSingle<number>;
 
 	/**
 	* Wrapped type `number`.
@@ -5431,6 +5546,12 @@ interface _Chain<T> {
 	**/
 	range(): _Chain<T>;
 
+	/**
+	 * Wrapped type `any[][]`.
+	 * @see _.chunk
+	 **/
+	chunk(): _Chain<T>;
+
 	/* ***********
 	 * Functions *
 	************ */
@@ -5494,6 +5615,12 @@ interface _Chain<T> {
 	**/
 	once(): _Chain<T>;
 
+	/**
+	 * Wrapped type `Function`.
+	 * @see _.once
+	 **/
+	restArgs(startIndex? : number): _Chain<T>;
+
 	/**
 	* Wrapped type `number`.
 	* @see _.after
@@ -5575,6 +5702,12 @@ interface _Chain<T> {
 	**/
 	extend(...sources: any[]): _Chain<T>;
 
+	/**
+	* Wrapped type `object`.
+	* @see _.extend
+	**/
+	findKey(predicate: _.ObjectIterator<any, boolean>, context? : any): _Chain<T>
+
 	/**
 	* Wrapped type `object`.
 	* @see _.pick
@@ -5597,6 +5730,12 @@ interface _Chain<T> {
 	**/
 	defaults(...defaults: any[]): _Chain<T>;
 
+	/**
+	 * Wrapped type `any`.
+	 * @see _.create
+	 **/
+	create(props?: Object): _Chain<T>;
+
 	/**
 	* Wrapped type `any[]`.
 	* @see _.clone
@@ -5621,6 +5760,12 @@ interface _Chain<T> {
 	**/
 	matches<TResult>(): _Chain<T>;
 
+	/**
+	 * Wrapped type `any[]`.
+	 * @see _.matcher
+	 **/
+	matcher<TResult>(): _Chain<T>;
+
 	/**
 	* Wrapped type `string`.
 	* @see _.property
@@ -5663,6 +5808,12 @@ interface _Chain<T> {
 	**/
 	isArray(): _Chain<T>;
 
+	/**
+	* Wrapped type `object`.
+	* @see _.isSymbol
+	**/
+	isSymbol(): _Chain<T>;
+
 	/**
 	* Wrapped type `object`.
 	* @see _.isObject
@@ -5790,7 +5941,7 @@ interface _Chain<T> {
 	* Wrapped type `string|Function|Object`.
 	* @see _.iteratee
 	**/
-	iteratee(context?: any, argCount?: number): _Chain<T>;
+	iteratee(context?: any): _Chain<T>;
 
 	/**
 	* Wrapped type `string`.
diff --git a/validate.js/validate.js-tests.ts b/validate.js/validate.js-tests.ts
new file mode 100644
index 0000000000..c9294de25d
--- /dev/null
+++ b/validate.js/validate.js-tests.ts
@@ -0,0 +1,184 @@
+///<reference path="validate.js.d.ts"/>
+import Validator = ValidateJS.Validator;
+import Field = ValidateJS.Field;
+import Constraints = ValidateJS.Constraints;
+
+let validator: Validator;
+validator = {};
+validator = {message: 'test'};
+validator = {message: (value: any, attribute: any, validatorOptions: any, attributes: any, globalOptions: any) => 'test'};
+
+let date: Validator.Date;
+date = {};
+date = {
+	earliest: 'a',
+	latest: 'b',
+	notValid: 'c',
+	tooEarly: 'd',
+	tooLate: 'e',
+	message: 'test',
+};
+
+let dateTime: Validator.DateTime;
+dateTime = {};
+dateTime = {
+	dateOnly: true,
+	earliest: 'a',
+	latest: 'b',
+	notValid: 'c',
+	tooEarly: 'd',
+	tooLate: 'e',
+	message: 'test',
+};
+
+let email: Validator.Email;
+email = {};
+email = {message: 'test'};
+
+let equality: Validator.Equality;
+equality = {};
+equality = {
+	attribute: 'a',
+	comparator: (v1: any, v2: any) => true,
+	message: 'test',
+};
+
+let exclusion: Validator.Exclusion;
+exclusion = {
+	within: ['a', 'b'],
+	message: 'test',
+};
+exclusion = {
+	within: {a: 'b', c: 'd'},
+};
+
+let format: Validator.Format;
+format = {
+	pattern: 'a',
+	message: 'test',
+};
+format = {
+	pattern: /a/g,
+};
+format = {
+	pattern: new RegExp('a'),
+};
+
+let inclusion: Validator.Inclusion;
+inclusion = {
+	within: ['a', 'b'],
+	message: 'test',
+};
+inclusion = {
+	within: {a: 'b', c: 'd'},
+};
+
+let _length: Validator.Length;
+_length = {};
+_length = {
+	is: 1,
+	notValid: 'a',
+	wrongLength: 'b',
+	message: 'test',
+	tokenizer: (value: any[]) => [1, 2],
+};
+_length = {
+	minimum: 2,
+	maximum: 4,
+	tooShort: 'a',
+	tooLong: 'b',
+	tokenizer: (value: string) => 'test',
+};
+
+let numericality: Validator.Numericality;
+numericality = {};
+numericality = {
+	onlyInteger: true,
+	strict: true,
+	equalTo: 8,
+	divisibleBy: 4,
+	even: true,
+	notValid: 'a',
+	notInteger: 'b',
+	notEqualTo: 'c',
+	notDivisibleBy: 'd',
+	notEven: 'e',
+	message: 'test',
+};
+numericality = {
+	greaterThan: 4,
+	lessThan: 10,
+	odd: true,
+	notGreaterThan: 'a',
+	notLessThan: 'b',
+	notOdd: 'c',
+};
+numericality = {
+	greaterThanOrEqualTo: 4,
+	lessThanOrEqualTo: 7,
+	notGreaterThanOrEqualTo: 'a',
+	notLessThanOrEqualTo: 'b',
+};
+
+let presence: Validator.Presence;
+presence = {};
+presence = {message: 'test'};
+
+let url: Validator.Url;
+url = {};
+url = {
+	schemes: ['a', /b/g, new RegExp('c')],
+	allowLocal: true,
+	message: 'test',
+};
+
+let field: Field;
+field = {};
+field = {
+	date: {earliest: 'a'},
+	datetime: {dateOnly: true},
+	email: {message: 'test'},
+	equality: {attribute: 'b'},
+	exclusion: {within: ['c']},
+	format: {pattern: 'd'},
+	inclusion: {within: ['e']},
+	length: {is: 4},
+	numericality: {onlyInteger: true},
+	presence: {message: 'test2'},
+	url: {schemes: ['f']},
+};
+field = {
+	date: true,
+	datetime: true,
+	email: true,
+	equality: 'a',
+	exclusion: ['b'],
+	format: 'c',
+	inclusion: ['d'],
+	numericality: true,
+	presence: true,
+	url: true,
+};
+field = {
+	format: /a/g,
+};
+field = {
+	date: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({earliest: 'a'}),
+	datetime: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({dateOnly: true}),
+	email: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({message: 'test'}),
+	equality: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({attribute: 'b'}),
+	exclusion: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({within: ['c']}),
+	format: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({pattern: 'd'}),
+	inclusion: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({within: ['e']}),
+	length: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({is: 4}),
+	numericality: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({onlyInteger: true}),
+	presence: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({message: 'test2'}),
+	url: (value: any, attributes: any, attributeName: any, options: any, constraints: any) => ({schemes: ['f']}),
+};
+
+let constraints: Constraints;
+constraints = {};
+constraints = {
+	a: {date: true},
+	b: (value: any, attribute: any, attributeName: any, options: any, constraints: any) => ({datetime: true}),
+};
\ No newline at end of file
diff --git a/validate.js/validate.js.d.ts b/validate.js/validate.js.d.ts
new file mode 100644
index 0000000000..35754e844c
--- /dev/null
+++ b/validate.js/validate.js.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for Validate.js
+// Project: https://github.com/ansman/validate.js
+// Definitions by: Travis Hill <https://github.com/HillTravis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace ValidateJS {
+
+  export interface Validator {
+    message?: string | ((value: any, attribute: any, validatorOptions: any, attributes: any, globalOptions: any) => string);
+  }
+
+  namespace Validator {
+
+    export interface Date extends Validator {
+      earliest?: string;
+      latest?: string;
+
+      notValid?: string;
+      tooEarly?: string;
+      tooLate?: string;
+    }
+
+    export interface DateTime extends Date {
+      dateOnly?: boolean;
+    }
+
+    export interface Email extends Validator {}
+
+    export interface Equality extends Validator {
+      attribute?: string;
+      comparator?: (v1: any, v2: any) => boolean;
+    }
+
+    export interface Exclusion extends Validator {
+      within: any[] | {[key: string]: any};
+    }
+
+    export interface Format extends Validator {
+      pattern: string | RegExp;
+      flags?: string;
+    }
+
+    export interface Inclusion extends Validator {
+      within: any[] | {[key: string]: any};
+    }
+
+    export interface Length extends Validator {
+      is?: number;
+      minimum?: number;
+      maximum?: number;
+
+      notValid?: string;
+      tooLong?: string;
+      tooShort?: string;
+      wrongLength?: string;
+
+      tokenizer?: (value: string | any[]) => string | any[];
+    }
+
+    export interface Numericality extends Validator {
+      onlyInteger?: boolean;
+      strict?: boolean;
+      greaterThan?: number;
+      greaterThanOrEqualTo?: number;
+      equalTo?: number;
+      lessThanOrEqualTo?: number;
+      lessThan?: number;
+      divisibleBy?: number;
+      odd?: boolean;
+      even?: boolean;
+
+      notValid?: string;
+      notInteger?: string;
+      notGreaterThan?: string;
+      notGreaterThanOrEqualTo?: string;
+      notEqualTo?: string;
+      notLessThanOrEqualTo?: string;
+      notLessThan?: string;
+      notDivisibleBy?: string;
+      notOdd?: string;
+      notEven?: string;
+    }
+
+    export interface Presence extends Validator {}
+
+    export interface Url extends Validator {
+      schemes?: [string | RegExp];
+      allowLocal?: boolean;
+    }
+  }
+
+  export interface Field {
+    date?: Validator.Date | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Date);
+    datetime?: Validator.DateTime | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.DateTime);
+    email?: Validator.Email | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Email);
+    equality?: Validator.Equality | string | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Equality);
+    exclusion?: Validator.Exclusion | any[] | {[key: string]: any} | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Exclusion);
+    format?: Validator.Format | string | RegExp | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Format);
+    inclusion?: Validator.Inclusion | any[] | {[key: string]: any} | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Inclusion);
+    length?: Validator.Length | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Length);
+    numericality?: Validator.Numericality | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Numericality);
+    presence?: Validator.Presence | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Presence);
+    url?: Validator.Url | boolean | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Validator.Url);
+  }
+
+  export interface Constraints {
+    [attribute: string]: Field | ((value: any, attributes: any, attributeName: any, options: any, constraints: any) => Field);
+  }
+}
diff --git a/validator/validator-tests.ts b/validator/validator-tests.ts
index 8afabc2099..96d5bc761a 100644
--- a/validator/validator-tests.ts
+++ b/validator/validator-tests.ts
@@ -4,9 +4,9 @@ import * as validator from 'validator';
 
 let any: any;
 
-/**************
- * Validators *
- **************/
+// **************
+// * Validators *
+// **************
 
 {
   let result: boolean;
@@ -16,7 +16,7 @@ let any: any;
   result = validator.equals('sample', 'sample');
 
   result = validator.isAfter('sample');
-  result = validator.isAfter('sample', new Date());
+  result = validator.isAfter('sample', new Date().toString());
 
   result = validator.isAlpha('sample');
 
@@ -27,7 +27,7 @@ let any: any;
   result = validator.isBase64('sample');
 
   result = validator.isBefore('sample');
-  result = validator.isBefore('sample', new Date());
+  result = validator.isBefore('sample', new Date().toString());
 
   result = validator.isBoolean('sample');
 
@@ -42,6 +42,8 @@ let any: any;
   result = validator.isCurrency('sample');
   result = validator.isCurrency('sample', isCurrencyOptions);
 
+  result = validator.isDataURI('sample');
+
   result = validator.isDate('sample');
 
   result = validator.isDecimal('sample');
@@ -95,6 +97,8 @@ let any: any;
 
   result = validator.isMACAddress('sample');
 
+  result = validator.isMD5('sample');
+
   result = validator.isMobilePhone('sample', 'en-US');
 
   result = validator.isMongoId('sample');
@@ -113,6 +117,7 @@ let any: any;
 
   result = validator.isUUID('sample');
   result = validator.isUUID('sample', 5);
+  result = validator.isUUID('sample', 'all');
 
   result = validator.isUppercase('sample');
 
@@ -125,9 +130,9 @@ let any: any;
   result = validator.matches('foobar', 'foo', 'i');
 }
 
-/**************
- * Sanitizers *
- **************/
+// **************
+// * Sanitizers *
+// **************
 
 {
   let result: string;
@@ -136,6 +141,8 @@ let any: any;
 
   result = validator.escape('sample');
 
+  result = validator.unescape('sample');
+
   result = validator.ltrim('sample');
   result = validator.ltrim('sample', ' ');
 
@@ -175,16 +182,14 @@ let any: any;
 {
   let result: string;
 
-  result = validator.toString(any);
-
   result = validator.trim('sample');
   result = validator.trim('sample', ' ');
 
   result = validator.whitelist('sample', 'abc');
 }
 
-/**************
- * Extensions *
- **************/
+// **************
+// * Extensions *
+// **************
 
 validator.extend<(str: string, options: {}) => boolean>('isTest', (str: any, options: {}) => !str);
diff --git a/validator/validator.d.ts b/validator/validator.d.ts
index 0edb5e885b..1ec4711828 100644
--- a/validator/validator.d.ts
+++ b/validator/validator.d.ts
@@ -1,14 +1,14 @@
-// Type definitions for validator.js v4.5.1
+// Type definitions for validator.js v5.7.0
 // Project: https://github.com/chriso/validator.js
-// Definitions by: tgfjt <https://github.com/tgfjt>, Ilya Mochalov <https://github.com/chrootsu>
+// 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: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
   interface ValidatorStatic {
 
-    /**************
-     * Validators *
-     **************/
+    // **************
+    // * Validators *
+    // **************
 
     // check if the string contains the seed.
     contains(str: string, elem: any): boolean;
@@ -17,7 +17,7 @@ declare namespace ValidatorJS {
     equals(str: string, comparison: any): boolean;
 
     // check if the string is a date that's after the specified date (defaults to now).
-    isAfter(str: string, date?: Date): boolean;
+    isAfter(str: string, date?: string): boolean;
 
     // check if the string contains only letters (a-zA-Z).
     isAlpha(str: string): boolean;
@@ -32,7 +32,7 @@ declare namespace ValidatorJS {
     isBase64(str: string): boolean;
 
     // check if the string is a date that's before the specified date.
-    isBefore(str: string, date?: Date): boolean;
+    isBefore(str: string, date?: string): boolean;
 
     // check if a string is a boolean.
     isBoolean(str: string): boolean;
@@ -47,6 +47,9 @@ declare namespace ValidatorJS {
     // check if the string is a valid currency amount.
     isCurrency(str: string, options?: IsCurrencyOptions): boolean;
 
+    // check if the string is a data uri format (https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs)
+    isDataURI(str: string): boolean;
+
     // check if the string is a date.
     isDate(str: string): boolean;
 
@@ -110,8 +113,14 @@ declare namespace ValidatorJS {
     // check if the string is a MAC address.
     isMACAddress(str: string): boolean;
 
-    // check if the string is a mobile phone number, (locale is one of ['zh-CN', 'zh-TW', 'en-ZA', 'en-AU', 'en-HK',
-    // 'pt-PT', 'fr-FR', 'el-GR', 'en-GB', 'en-US', 'en-ZM', 'ru-RU', 'nb-NO', 'nn-NO', 'vi-VN', 'en-NZ', 'en-IN']).
+    // check if the string is a MD5 hash.
+    isMD5(str: string): boolean;
+
+    // check if the string is a mobile phone number, (locale is one of
+    // ['ar-DZ', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR', 'en-AU', 'en-GB', 'en-HK',
+    // 'en-IN', 'en-NZ', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fi-FI', 'fr-FR', 'hu-HU',
+    // 'it-IT', 'ja-JP', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ru-RU', 'sr-RS', 'tr-TR',
+    // 'vi-VN', 'zh-CN', 'zh-TW']).
     isMobilePhone(str: string, locale: string): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -133,8 +142,8 @@ declare namespace ValidatorJS {
     // check if the string is an URL.
     isURL(str: string, options?: IsURLOptions): boolean;
 
-    // check if the string is a UUID (version 3, 4 or 5).
-    isUUID(str: string, version?: number): boolean;
+    // check if the string is a UUID. Must be one of ['3', '4', '5', 'all'], default is all.
+    isUUID(str: string, version?: string|number): boolean;
 
     // check if the string is uppercase.
     isUppercase(str: string): boolean;
@@ -146,11 +155,11 @@ declare namespace ValidatorJS {
     isWhitelisted(str: string, chars: string|string[]): boolean;
 
     // check if string matches the pattern.
-    matches(str: string, pattern: any, modifiers?: string): boolean;
+    matches(str: string, pattern: RegExp|string, modifiers?: string): boolean;
 
-    /**************
-     * Sanitizers *
-     **************/
+    // **************
+    // * Sanitizers *
+    // **************
 
     // remove characters that appear in the blacklist. The characters are used in a RegExp and so you will need
     // to escape some chars, e.g. blacklist(input, '\\[\\]').
@@ -159,6 +168,9 @@ declare namespace ValidatorJS {
     // replace <, >, &, ', " and / with HTML entities.
     escape(input: string): string;
 
+    // replaces HTML encoded entities with <, >, &, ', " and /.
+    unescape(input: string): string;
+
     // trim characters from the left-side of the input.
     ltrim(input: any, chars?: string): string;
 
@@ -185,9 +197,6 @@ declare namespace ValidatorJS {
     // convert the input to an integer, or NaN if the input is not an integer.
     toInt(input: any, radix?: number): number; // number or NaN
 
-    // convert the input to a string.
-    toString(input: any): string;
-
     // trim characters (whitespace by default) from both sides of the input.
     trim(input: any, chars?: string): string;
 
@@ -195,9 +204,9 @@ declare namespace ValidatorJS {
     // need to escape some chars, e.g. whitelist(input, '\\[\\]').
     whitelist(input: string, chars: string): string;
 
-    /**************
-     * Extensions *
-     **************/
+    // **************
+    // * Extensions *
+    // **************
 
     // add your own validators.
     // Note: that the first argument will be automatically coerced to a string.
@@ -263,10 +272,11 @@ declare namespace ValidatorJS {
     protocols?: string[];
     require_tld?: boolean;
     require_protocol?: boolean;
+    require_host: boolean;
     require_valid_protocol?: boolean;
     allow_underscores?: boolean;
-    host_whitelist?: boolean;
-    host_blacklist?: boolean;
+    host_whitelist?: (string|RegExp)[];
+    host_blacklist?: (string|RegExp)[];
     allow_trailing_dot?: boolean;
     allow_protocol_relative_urls?: boolean;
   }
@@ -280,8 +290,7 @@ declare namespace ValidatorJS {
 }
 
 declare module "validator" {
-  let validator: ValidatorJS.ValidatorStatic;
-  namespace validator {}
+  const validator: ValidatorJS.ValidatorStatic;
   export = validator;
 }
 
diff --git a/videojs/videojs.d.ts b/videojs/videojs.d.ts
index 7fb5005092..3ac6007daf 100644
--- a/videojs/videojs.d.ts
+++ b/videojs/videojs.d.ts
@@ -44,9 +44,11 @@ interface VideoJSPlayer {
 	size(width: number, height: number): VideoJSPlayer;
 	requestFullScreen(): VideoJSPlayer;
 	cancelFullScreen(): VideoJSPlayer;
-	ready(callback: () => void ): void;
-	on(eventName: string, callback: () => void ): void;
+	ready(callback: () => void ): VideoJSPlayer;
+	on(eventName: string, callback: (eventObject: Event) => void ): void;
 	off(eventName: string, callback: () => void ): void;
+	off(eventName: string): void;
+	off(): void;
 	dispose(): void;
 	addRemoteTextTrack(options : {}) : HTMLTrackElement;
 	removeRemoteTextTrack(track : HTMLTrackElement) : void;
diff --git a/webpack-dev-server/webpack-dev-server-tests.ts b/webpack-dev-server/webpack-dev-server-tests.ts
new file mode 100644
index 0000000000..df805219f9
--- /dev/null
+++ b/webpack-dev-server/webpack-dev-server-tests.ts
@@ -0,0 +1,67 @@
+/// <reference path="webpack-dev-server.d.ts" />
+/// <reference path="../webpack/webpack.d.ts"/>
+
+import * as webpack from 'webpack';
+import * as WebpackDevServer from 'webpack-dev-server';
+var compiler = webpack({});
+
+// basic example
+var server = new WebpackDevServer(compiler, {
+    publicPath: "/assets/"
+});
+server.listen(8080);
+
+// API example
+server = new WebpackDevServer(compiler, {
+    // webpack-dev-server options
+    contentBase: "/path/to/directory",
+    // or: contentBase: "http://localhost/",
+
+    hot: true,
+    // Enable special support for Hot Module Replacement
+    // Page is no longer updated, but a "webpackHotUpdate" message is send to the content
+    // Use "webpack/hot/dev-server" as additional module in your entry point
+    // Note: this does _not_ add the `HotModuleReplacementPlugin` like the CLI option does. 
+
+    // Set this as true if you want to access dev server from arbitrary url.
+    // This is handy if you are using a html5 router.
+    historyApiFallback: false,
+
+    // Set this if you want to enable gzip compression for assets
+    compress: true,
+
+    // Set this if you want webpack-dev-server to delegate a single path to an arbitrary server.
+    // Use "**" to proxy all paths to the specified server.
+    // This is useful if you want to get rid of 'http://localhost:8080/' in script[src],
+    // and has many other use cases (see https://github.com/webpack/webpack-dev-server/pull/127 ).
+    proxy: {
+        "**": "http://localhost:9090"
+    },
+
+    setup: function (app) {
+        // Here you can access the Express app object and add your own custom middleware to it.
+        // For example, to define custom handlers for some paths:
+        // app.get('/some/path', function(req, res) {
+        //   res.json({ custom: 'response' });
+        // });
+    },
+
+    // pass [static options](http://expressjs.com/en/4x/api.html#express.static) to inner express server
+    staticOptions: {
+    },
+
+    // webpack-dev-middleware options
+    quiet: false,
+    noInfo: false,
+    lazy: true,
+    filename: "bundle.js",
+    watchOptions: {
+        aggregateTimeout: 300,
+        poll: 1000
+    },
+    // It's a required option.
+    publicPath: "/assets/",
+    headers: { "X-Custom-Header": "yes" },
+    stats: { colors: true }
+});
+server.listen(8080, "localhost", function () { });
\ No newline at end of file
diff --git a/webpack-dev-server/webpack-dev-server.d.ts b/webpack-dev-server/webpack-dev-server.d.ts
new file mode 100644
index 0000000000..41abe0f871
--- /dev/null
+++ b/webpack-dev-server/webpack-dev-server.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for webpack-dev-server 1.12.1
+// Project: https://github.com/webpack/webpack-dev-server
+// Definitions by: maestroh <https://github.com/maestroh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../webpack/webpack.d.ts" />
+/// <reference path="../serve-static/serve-static.d.ts" />
+/// <reference path="../express-serve-static-core/express-serve-static-core.d.ts" />
+
+declare module "webpack-dev-server" {
+    import * as webpack from 'webpack';
+    import * as core from 'express-serve-static-core';
+    import * as serveStatic from 'serve-static';
+    import * as http from 'http';
+
+    namespace WebpackDevServer {
+        export interface Configuration {
+            contentBase?: string;
+            hot?: boolean;
+            historyApiFallback?: boolean;
+            compress?: boolean;
+            proxy?: any;
+            staticOptions?: any;
+            quiet?: boolean;
+            noInfo?: boolean;
+            lazy?: boolean;
+            filename?: string;
+            watchOptions?: webpack.WatchOptions;
+            publicPath: string;
+            headers?: any;
+            stats?: webpack.compiler.StatsToJsonOptions | webpack.compiler.StatsToStringOptions;
+
+            setup?(app: core.Express): void;
+        }
+
+        export interface WebpackDevServer {
+            new (
+                webpack: webpack.compiler.Compiler,
+                config: Configuration
+            ):WebpackDevServer;
+
+            listen(port: number,
+                hostname: string,
+                callback?: Function
+            ): http.Server;
+
+            listen(port: number,
+                callback?: Function
+            ): http.Server;
+        }
+    }
+    var wds: WebpackDevServer.WebpackDevServer;
+
+    export = wds;
+}
\ No newline at end of file
diff --git a/ws/ws-tests.ts b/ws/ws-tests.ts
index a8afa8cb99..3c85d678cb 100644
--- a/ws/ws-tests.ts
+++ b/ws/ws-tests.ts
@@ -2,6 +2,7 @@
 
 import * as WebSocket from 'ws';
 import * as http from'http';
+import * as https from'https';
 
 var WebSocketServer = WebSocket.Server;
 
@@ -54,6 +55,12 @@ var WebSocketServer = WebSocket.Server;
     });
 }
 
+{
+    new WebSocket.Server({ server: https.createServer({}) });
+    new WebSocket.Server({ server: http.createServer() });
+}
+
+
 {
     const verifyClient = function(
       info: {
@@ -73,4 +80,4 @@ var WebSocketServer = WebSocket.Server;
     wsv.on('connection', function connection(ws) {
         console.log(ws.protocol)
     })
-}
\ No newline at end of file
+}
diff --git a/ws/ws.d.ts b/ws/ws.d.ts
index 2b16bd52ea..b7ce3bd829 100644
--- a/ws/ws.d.ts
+++ b/ws/ws.d.ts
@@ -8,6 +8,7 @@
 declare module "ws" {
     import * as events from 'events';
     import * as http from 'http';
+    import * as https from 'https';
     import * as net from 'net';
 
     class WebSocket extends events.EventEmitter {
@@ -99,7 +100,7 @@ declare module "ws" {
         export interface IServerOptions {
             host?: string;
             port?: number;
-            server?: http.Server;
+            server?: http.Server | https.Server;
             verifyClient?: VerifyClientCallbackAsync | VerifyClientCallbackSync;
             handleProtocols?: any;
             path?: string;