diff --git a/gruntfile.js b/gruntfile.js
index 070b490433..46531e8e70 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -4,14 +4,7 @@ module.exports = function(grunt)
         pkg: grunt.file.readJSON('package.json'),
         ts: {
             typedoc: {
-                options: {
-                    basePath: 'src',
-                    declaration: true,
-                    comments: true,
-                    sourceMap: false
-                },
-                src: ['src/**/*.ts'],
-                out: 'bin/typedoc.js'
+                tsconfig: true
             },
             typescript: {
                 options: {
diff --git a/lib/application.js b/lib/application.js
index 620d5bc99a..480bc91d58 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var FS = require("fs");
 var typescript = require("typescript");
@@ -153,28 +150,24 @@ var Application = (function (_super) {
             help: 'Specify the logger that should be used, \'none\' or \'console\'',
             defaultValue: 'console',
             type: declaration_1.ParameterType.Mixed,
-        }), 
-        __metadata('design:type', Object)
+        })
     ], Application.prototype, "loggerType", void 0);
     __decorate([
         component_1.Option({
             name: 'ignoreCompilerErrors',
             help: 'Should TypeDoc generate documentation pages even after the compiler has returned errors?',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], Application.prototype, "ignoreCompilerErrors", void 0);
     __decorate([
         component_1.Option({
             name: 'exclude',
             help: 'Define a pattern for excluded files when specifying paths.',
             type: declaration_1.ParameterType.String
-        }), 
-        __metadata('design:type', String)
+        })
     ], Application.prototype, "exclude", void 0);
     Application = __decorate([
-        component_1.Component({ name: "application", internal: true }), 
-        __metadata('design:paramtypes', [Object])
+        component_1.Component({ name: "application", internal: true })
     ], Application);
     return Application;
 })(component_1.ChildableComponent);
diff --git a/lib/cli.js b/lib/cli.js
index 0a5bd1138b..ab4dd1a403 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var typescript = require("typescript");
 var application_1 = require("./application");
 var component_1 = require("./utils/component");
@@ -80,16 +77,14 @@ var CliApplication = (function (_super) {
             name: 'out',
             help: 'Specifies the location the documentation should be written to.',
             hint: declaration_1.ParameterHint.Directory
-        }), 
-        __metadata('design:type', String)
+        })
     ], CliApplication.prototype, "out", void 0);
     __decorate([
         component_1.Option({
             name: 'json',
             help: 'Specifies the location and file name a json file describing the project is written to.',
             hint: declaration_1.ParameterHint.File
-        }), 
-        __metadata('design:type', String)
+        })
     ], CliApplication.prototype, "json", void 0);
     __decorate([
         component_1.Option({
@@ -97,8 +92,7 @@ var CliApplication = (function (_super) {
             short: 'v',
             help: 'Print the TypeDoc\'s version.',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], CliApplication.prototype, "version", void 0);
     __decorate([
         component_1.Option({
@@ -106,8 +100,7 @@ var CliApplication = (function (_super) {
             short: 'h',
             help: 'Print this message.',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], CliApplication.prototype, "help", void 0);
     return CliApplication;
 })(application_1.Application);
diff --git a/lib/converter/convert-expression.js b/lib/converter/convert-expression.js
index 79a8a5fcf1..c764dabf33 100644
--- a/lib/converter/convert-expression.js
+++ b/lib/converter/convert-expression.js
@@ -14,9 +14,9 @@ function convertExpression(expression) {
             return '"' + expression.text + '"';
         case 8:
             return expression.text;
-        case 97:
+        case 99:
             return 'true';
-        case 82:
+        case 84:
             return 'false';
         default:
             var source = ts.getSourceFileOfNode(expression);
diff --git a/lib/converter/converter.js b/lib/converter/converter.js
index 8b0e9eacdc..09cbd2b8f1 100644
--- a/lib/converter/converter.js
+++ b/lib/converter/converter.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var declaration_1 = require("../utils/options/declaration");
 var context_1 = require("./context");
@@ -68,8 +65,8 @@ var Converter = (function (_super) {
     Converter.prototype.removeNodeConverter = function (converter) {
         var converters = this.nodeConverters;
         var keys = _.keys(this.nodeConverters);
-        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-            var key = keys_1[_i];
+        for (var _i = 0; _i < keys.length; _i++) {
+            var key = keys[_i];
             if (converters[key] === converter) {
                 delete converters[key];
             }
@@ -190,43 +187,37 @@ var Converter = (function (_super) {
         component_1.Option({
             name: "name",
             help: "Set the name of the project that will be used in the header of the template."
-        }), 
-        __metadata('design:type', String)
+        })
     ], Converter.prototype, "name", void 0);
     __decorate([
         component_1.Option({
             name: "externalPattern",
             help: 'Define a pattern for files that should be considered being external.'
-        }), 
-        __metadata('design:type', String)
+        })
     ], Converter.prototype, "externalPattern", void 0);
     __decorate([
         component_1.Option({
             name: "includeDeclarations",
             help: 'Turn on parsing of .d.ts declaration files.',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], Converter.prototype, "includeDeclarations", void 0);
     __decorate([
         component_1.Option({
             name: "excludeExternals",
             help: 'Prevent externally resolved TypeScript files from being documented.',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], Converter.prototype, "excludeExternals", void 0);
     __decorate([
         component_1.Option({
             name: "excludeNotExported",
             help: 'Prevent symbols that are not exported from being documented.',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], Converter.prototype, "excludeNotExported", void 0);
     Converter = __decorate([
-        component_1.Component({ name: "converter", internal: true, childClass: components_1.ConverterComponent }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "converter", internal: true, childClass: components_1.ConverterComponent })
     ], Converter);
     return Converter;
 })(component_1.ChildableComponent);
diff --git a/lib/converter/factories/comment.js b/lib/converter/factories/comment.js
index ef8da9bef8..7cdfff2c1c 100644
--- a/lib/converter/factories/comment.js
+++ b/lib/converter/factories/comment.js
@@ -9,7 +9,7 @@ function createComment(node) {
 }
 exports.createComment = createComment;
 function isTopmostModuleDeclaration(node) {
-    if (node.nextContainer && node.nextContainer.kind == 216) {
+    if (node.nextContainer && node.nextContainer.kind == 218) {
         var next = node.nextContainer;
         if (node.name.end + 1 == next.name.pos) {
             return false;
@@ -18,7 +18,7 @@ function isTopmostModuleDeclaration(node) {
     return true;
 }
 function getRootModuleDeclaration(node) {
-    while (node.parent && node.parent.kind == 216) {
+    while (node.parent && node.parent.kind == 218) {
         var parent_1 = node.parent;
         if (node.name.pos == parent_1.name.end + 1) {
             node = parent_1;
@@ -30,10 +30,10 @@ function getRootModuleDeclaration(node) {
     return node;
 }
 function getRawComment(node) {
-    if (node.parent && node.parent.kind === 210) {
+    if (node.parent && node.parent.kind === 212) {
         node = node.parent.parent;
     }
-    else if (node.kind === 216) {
+    else if (node.kind === 218) {
         if (!isTopmostModuleDeclaration(node)) {
             return null;
         }
@@ -45,7 +45,7 @@ function getRawComment(node) {
     var comments = ts.getJsDocComments(node, sourceFile);
     if (comments && comments.length) {
         var comment;
-        if (node.kind == 246) {
+        if (node.kind == 248) {
             if (comments.length == 1)
                 return null;
             comment = comments[0];
diff --git a/lib/converter/factories/declaration.js b/lib/converter/factories/declaration.js
index bc91d5c092..8a36b4ed6f 100644
--- a/lib/converter/factories/declaration.js
+++ b/lib/converter/factories/declaration.js
@@ -33,7 +33,7 @@ function createDeclaration(context, node, kind, name) {
     if (kind == index_1.ReflectionKind.ExternalModule) {
         isExported = true;
     }
-    else if (node.parent && node.parent.kind == 210) {
+    else if (node.parent && node.parent.kind == 212) {
         isExported = isExported || !!(node.parent.parent.flags & 1);
     }
     else {
@@ -51,10 +51,10 @@ function createDeclaration(context, node, kind, name) {
     if (nonStaticKinds.indexOf(kind) == -1) {
         isStatic = !!(node.flags & 128);
         if (container.kind == index_1.ReflectionKind.Class) {
-            if (node.parent && node.parent.kind == 142) {
+            if (node.parent && node.parent.kind == 144) {
                 isConstructorProperty = true;
             }
-            else if (!node.parent || node.parent.kind != 212) {
+            else if (!node.parent || node.parent.kind != 214) {
                 isStatic = true;
             }
         }
diff --git a/lib/converter/factories/signature.js b/lib/converter/factories/signature.js
index c3831a47be..d769794d22 100644
--- a/lib/converter/factories/signature.js
+++ b/lib/converter/factories/signature.js
@@ -25,7 +25,7 @@ function createSignature(context, node, name, kind) {
 exports.createSignature = createSignature;
 function extractSignatureType(context, node) {
     var checker = context.checker;
-    if (node.kind & 145 || node.kind & 166) {
+    if (node.kind & 147 || node.kind & 168) {
         try {
             var signature = checker.getSignatureFromDeclaration(node);
             return context.converter.convertType(context, node.type, checker.getReturnTypeOfSignature(signature));
diff --git a/lib/converter/nodes/accessor.js b/lib/converter/nodes/accessor.js
index 5f562ae283..5a021fbddf 100644
--- a/lib/converter/nodes/accessor.js
+++ b/lib/converter/nodes/accessor.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -21,14 +18,14 @@ var AccessorConverter = (function (_super) {
     function AccessorConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            143,
-            144
+            145,
+            146
         ];
     }
     AccessorConverter.prototype.convert = function (context, node) {
         var accessor = index_2.createDeclaration(context, node, index_1.ReflectionKind.Accessor);
         context.withScope(accessor, function () {
-            if (node.kind == 143) {
+            if (node.kind == 145) {
                 accessor.getSignature = index_2.createSignature(context, node, '__get', index_1.ReflectionKind.GetSignature);
             }
             else {
@@ -38,8 +35,7 @@ var AccessorConverter = (function (_super) {
         return accessor;
     };
     AccessorConverter = __decorate([
-        components_1.Component({ name: 'node:accessor' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:accessor' })
     ], AccessorConverter);
     return AccessorConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/alias.js b/lib/converter/nodes/alias.js
index d124c02f2a..27962d5cf7 100644
--- a/lib/converter/nodes/alias.js
+++ b/lib/converter/nodes/alias.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -21,7 +18,7 @@ var AliasConverter = (function (_super) {
     function AliasConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            214
+            216
         ];
     }
     AliasConverter.prototype.convert = function (context, node) {
@@ -33,8 +30,7 @@ var AliasConverter = (function (_super) {
         return alias;
     };
     AliasConverter = __decorate([
-        components_1.Component({ name: 'node:alias' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:alias' })
     ], AliasConverter);
     return AliasConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/block.js b/lib/converter/nodes/block.js
index b93c6ad560..e895641535 100644
--- a/lib/converter/nodes/block.js
+++ b/lib/converter/nodes/block.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -19,9 +16,9 @@ var components_1 = require("../components");
 var component_1 = require("../../utils/component");
 var declaration_1 = require("../../utils/options/declaration");
 var prefered = [
-    212,
-    213,
-    215
+    214,
+    215,
+    217
 ];
 (function (SourceFileMode) {
     SourceFileMode[SourceFileMode["File"] = 0] = "File";
@@ -33,13 +30,13 @@ var BlockConverter = (function (_super) {
     function BlockConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            190,
-            217,
-            246
+            192,
+            219,
+            248
         ];
     }
     BlockConverter.prototype.convert = function (context, node) {
-        if (node.kind == 246) {
+        if (node.kind == 248) {
             this.convertSourceFile(context, node);
         }
         else {
@@ -91,12 +88,10 @@ var BlockConverter = (function (_super) {
                 'modules': SourceFileMode.Modules
             },
             defaultValue: SourceFileMode.Modules
-        }), 
-        __metadata('design:type', Number)
+        })
     ], BlockConverter.prototype, "mode", void 0);
     BlockConverter = __decorate([
-        components_1.Component({ name: 'node:block' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:block' })
     ], BlockConverter);
     return BlockConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/class.js b/lib/converter/nodes/class.js
index 8565485257..ccc6aa6294 100644
--- a/lib/converter/nodes/class.js
+++ b/lib/converter/nodes/class.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -21,8 +18,8 @@ var ClassConverter = (function (_super) {
     function ClassConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            184,
-            212
+            186,
+            214
         ];
     }
     ClassConverter.prototype.convert = function (context, node) {
@@ -67,8 +64,7 @@ var ClassConverter = (function (_super) {
         return reflection;
     };
     ClassConverter = __decorate([
-        components_1.Component({ name: 'node:class' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:class' })
     ], ClassConverter);
     return ClassConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/constructor.js b/lib/converter/nodes/constructor.js
index eb6f63bcbc..1c6a1e1db8 100644
--- a/lib/converter/nodes/constructor.js
+++ b/lib/converter/nodes/constructor.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -22,8 +19,8 @@ var ConstructorConverter = (function (_super) {
     function ConstructorConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            142,
-            146
+            144,
+            148
         ];
     }
     ConstructorConverter.prototype.convert = function (context, node) {
@@ -68,8 +65,7 @@ var ConstructorConverter = (function (_super) {
         }
     };
     ConstructorConverter = __decorate([
-        components_1.Component({ name: 'node:constructor' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:constructor' })
     ], ConstructorConverter);
     return ConstructorConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/enum.js b/lib/converter/nodes/enum.js
index 9244f155ed..68daa70364 100644
--- a/lib/converter/nodes/enum.js
+++ b/lib/converter/nodes/enum.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -22,7 +19,7 @@ var EnumConverter = (function (_super) {
     function EnumConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            215
+            217
         ];
     }
     EnumConverter.prototype.convert = function (context, node) {
@@ -46,8 +43,7 @@ var EnumConverter = (function (_super) {
         return member;
     };
     EnumConverter = __decorate([
-        components_1.Component({ name: 'node:enum' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:enum' })
     ], EnumConverter);
     return EnumConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/export.js b/lib/converter/nodes/export.js
index 1d896d0d73..b036aeaa95 100644
--- a/lib/converter/nodes/export.js
+++ b/lib/converter/nodes/export.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var components_1 = require("../components");
@@ -20,7 +17,7 @@ var ExportConverter = (function (_super) {
     function ExportConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            225
+            227
         ];
     }
     ExportConverter.prototype.convert = function (context, node) {
@@ -52,8 +49,7 @@ var ExportConverter = (function (_super) {
         return context.scope;
     };
     ExportConverter = __decorate([
-        components_1.Component({ name: 'node:export' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:export' })
     ], ExportConverter);
     return ExportConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/function.js b/lib/converter/nodes/function.js
index a6dd2fa176..eec0317da2 100644
--- a/lib/converter/nodes/function.js
+++ b/lib/converter/nodes/function.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -22,9 +19,9 @@ var FunctionConverter = (function (_super) {
     function FunctionConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            140,
-            141,
-            211
+            142,
+            143,
+            213
         ];
     }
     FunctionConverter.prototype.convert = function (context, node) {
@@ -46,8 +43,7 @@ var FunctionConverter = (function (_super) {
         return method;
     };
     FunctionConverter = __decorate([
-        components_1.Component({ name: 'node:function' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:function' })
     ], FunctionConverter);
     return FunctionConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/interface.js b/lib/converter/nodes/interface.js
index 1e244caea6..fda033754a 100644
--- a/lib/converter/nodes/interface.js
+++ b/lib/converter/nodes/interface.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -21,7 +18,7 @@ var InterfaceConverter = (function (_super) {
     function InterfaceConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            213
+            215
         ];
     }
     InterfaceConverter.prototype.convert = function (context, node) {
@@ -59,8 +56,7 @@ var InterfaceConverter = (function (_super) {
         return reflection;
     };
     InterfaceConverter = __decorate([
-        components_1.Component({ name: 'node:interface' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:interface' })
     ], InterfaceConverter);
     return InterfaceConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/literal-object.js b/lib/converter/nodes/literal-object.js
index 28b9c8b61e..fffc3a5328 100644
--- a/lib/converter/nodes/literal-object.js
+++ b/lib/converter/nodes/literal-object.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var components_1 = require("../components");
 var ObjectLiteralConverter = (function (_super) {
@@ -19,7 +16,7 @@ var ObjectLiteralConverter = (function (_super) {
     function ObjectLiteralConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            163
+            165
         ];
     }
     ObjectLiteralConverter.prototype.convert = function (context, node) {
@@ -32,8 +29,7 @@ var ObjectLiteralConverter = (function (_super) {
         return context.scope;
     };
     ObjectLiteralConverter = __decorate([
-        components_1.Component({ name: 'node:literal-object' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:literal-object' })
     ], ObjectLiteralConverter);
     return ObjectLiteralConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/literal-type.js b/lib/converter/nodes/literal-type.js
index b137291796..424338e0ac 100644
--- a/lib/converter/nodes/literal-type.js
+++ b/lib/converter/nodes/literal-type.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var components_1 = require("../components");
 var TypeLiteralConverter = (function (_super) {
@@ -19,7 +16,7 @@ var TypeLiteralConverter = (function (_super) {
     function TypeLiteralConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            153
+            155
         ];
     }
     TypeLiteralConverter.prototype.convert = function (context, node) {
@@ -32,8 +29,7 @@ var TypeLiteralConverter = (function (_super) {
         return context.scope;
     };
     TypeLiteralConverter = __decorate([
-        components_1.Component({ name: 'node:literal-type' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:literal-type' })
     ], TypeLiteralConverter);
     return TypeLiteralConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/module.js b/lib/converter/nodes/module.js
index 9796194f77..3d0a88cef4 100644
--- a/lib/converter/nodes/module.js
+++ b/lib/converter/nodes/module.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -21,7 +18,7 @@ var ModuleConverter = (function (_super) {
     function ModuleConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            216
+            218
         ];
     }
     ModuleConverter.prototype.convert = function (context, node) {
@@ -41,8 +38,7 @@ var ModuleConverter = (function (_super) {
         return reflection;
     };
     ModuleConverter = __decorate([
-        components_1.Component({ name: 'node:module' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:module' })
     ], ModuleConverter);
     return ModuleConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/signature-call.js b/lib/converter/nodes/signature-call.js
index 1a948da905..1c11cb4b8c 100644
--- a/lib/converter/nodes/signature-call.js
+++ b/lib/converter/nodes/signature-call.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var components_1 = require("../components");
@@ -21,10 +18,10 @@ var SignatureConverter = (function (_super) {
     function SignatureConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            145,
-            150,
-            171,
-            172
+            147,
+            152,
+            173,
+            174
         ];
     }
     SignatureConverter.prototype.convert = function (context, node) {
@@ -39,8 +36,7 @@ var SignatureConverter = (function (_super) {
         return scope;
     };
     SignatureConverter = __decorate([
-        components_1.Component({ name: 'node:signature-call' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:signature-call' })
     ], SignatureConverter);
     return SignatureConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/signature-index.js b/lib/converter/nodes/signature-index.js
index 7a0823c61f..45215e5817 100644
--- a/lib/converter/nodes/signature-index.js
+++ b/lib/converter/nodes/signature-index.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -21,7 +18,7 @@ var IndexSignatureConverter = (function (_super) {
     function IndexSignatureConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            147
+            149
         ];
     }
     IndexSignatureConverter.prototype.convert = function (context, node) {
@@ -32,8 +29,7 @@ var IndexSignatureConverter = (function (_super) {
         return scope;
     };
     IndexSignatureConverter = __decorate([
-        components_1.Component({ name: 'node:signature-index' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:signature-index' })
     ], IndexSignatureConverter);
     return IndexSignatureConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/variable-statement.js b/lib/converter/nodes/variable-statement.js
index 32b08efbd2..49eae4aaef 100644
--- a/lib/converter/nodes/variable-statement.js
+++ b/lib/converter/nodes/variable-statement.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var components_1 = require("../components");
 var VariableStatementConverter = (function (_super) {
@@ -19,7 +16,7 @@ var VariableStatementConverter = (function (_super) {
     function VariableStatementConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            191
+            193
         ];
     }
     VariableStatementConverter.prototype.convert = function (context, node) {
@@ -46,8 +43,7 @@ var VariableStatementConverter = (function (_super) {
         });
     };
     VariableStatementConverter = __decorate([
-        components_1.Component({ name: 'node:variable-statement' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:variable-statement' })
     ], VariableStatementConverter);
     return VariableStatementConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/nodes/variable.js b/lib/converter/nodes/variable.js
index 7f710d2e00..c86684560b 100644
--- a/lib/converter/nodes/variable.js
+++ b/lib/converter/nodes/variable.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var index_2 = require("../factories/index");
@@ -22,12 +19,12 @@ var VariableConverter = (function (_super) {
     function VariableConverter() {
         _super.apply(this, arguments);
         this.supports = [
-            138,
-            139,
-            243,
-            244,
-            209,
-            161
+            140,
+            141,
+            245,
+            246,
+            211,
+            163
         ];
     }
     VariableConverter.prototype.isSimpleObjectLiteral = function (objectLiteral) {
@@ -64,12 +61,12 @@ var VariableConverter = (function (_super) {
         context.withScope(variable, function () {
             if (node.initializer) {
                 switch (node.initializer.kind) {
-                    case 172:
-                    case 171:
+                    case 174:
+                    case 173:
                         variable.kind = scope.kind & index_1.ReflectionKind.ClassOrInterface ? index_1.ReflectionKind.Method : index_1.ReflectionKind.Function;
                         _this.owner.convertNode(context, node.initializer);
                         break;
-                    case 163:
+                    case 165:
                         if (!_this.isSimpleObjectLiteral(node.initializer)) {
                             variable.kind = index_1.ReflectionKind.ObjectLiteral;
                             variable.type = new index_1.IntrinsicType('object');
@@ -92,8 +89,7 @@ var VariableConverter = (function (_super) {
         return variable;
     };
     VariableConverter = __decorate([
-        components_1.Component({ name: 'node:variable' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'node:variable' })
     ], VariableConverter);
     return VariableConverter;
 })(components_1.ConverterNodeComponent);
diff --git a/lib/converter/plugins/CommentPlugin.js b/lib/converter/plugins/CommentPlugin.js
index 8596f05347..ad00016b01 100644
--- a/lib/converter/plugins/CommentPlugin.js
+++ b/lib/converter/plugins/CommentPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var index_1 = require("../../models/comments/index");
 var index_2 = require("../../models/types/index");
 var index_3 = require("../../models/reflections/index");
@@ -251,8 +248,7 @@ var CommentPlugin = (function (_super) {
         }
     };
     CommentPlugin = __decorate([
-        components_1.Component({ name: 'comment' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'comment' })
     ], CommentPlugin);
     return CommentPlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/DecoratorPlugin.js b/lib/converter/plugins/DecoratorPlugin.js
index add3521878..a5d3907bae 100644
--- a/lib/converter/plugins/DecoratorPlugin.js
+++ b/lib/converter/plugins/DecoratorPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/types/index");
 var components_1 = require("../components");
@@ -56,10 +53,10 @@ var DecoratorPlugin = (function (_super) {
             var callExpression;
             var identifier;
             switch (decorator.expression.kind) {
-                case 67:
+                case 69:
                     identifier = decorator.expression;
                     break;
-                case 166:
+                case 168:
                     callExpression = decorator.expression;
                     identifier = callExpression.expression;
                     break;
@@ -102,8 +99,7 @@ var DecoratorPlugin = (function (_super) {
         }
     };
     DecoratorPlugin = __decorate([
-        components_1.Component({ name: 'decorator' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'decorator' })
     ], DecoratorPlugin);
     return DecoratorPlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/DeepCommentPlugin.js b/lib/converter/plugins/DeepCommentPlugin.js
index c698e1154d..330f6a3716 100644
--- a/lib/converter/plugins/DeepCommentPlugin.js
+++ b/lib/converter/plugins/DeepCommentPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var index_1 = require("../../models/reflections/index");
 var index_2 = require("../../models/comments/index");
 var components_1 = require("../components");
@@ -68,8 +65,7 @@ var DeepCommentPlugin = (function (_super) {
         }
     };
     DeepCommentPlugin = __decorate([
-        components_1.Component({ name: 'deep-comment' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'deep-comment' })
     ], DeepCommentPlugin);
     return DeepCommentPlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/DynamicModulePlugin.js b/lib/converter/plugins/DynamicModulePlugin.js
index 70cbb68fc3..e31be511c7 100644
--- a/lib/converter/plugins/DynamicModulePlugin.js
+++ b/lib/converter/plugins/DynamicModulePlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var abstract_1 = require("../../models/reflections/abstract");
 var components_1 = require("../components");
@@ -56,8 +53,7 @@ var DynamicModulePlugin = (function (_super) {
         });
     };
     DynamicModulePlugin = __decorate([
-        components_1.Component({ name: 'dynamic-module' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'dynamic-module' })
     ], DynamicModulePlugin);
     return DynamicModulePlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/GitHubPlugin.js b/lib/converter/plugins/GitHubPlugin.js
index 3819deceaf..c9e2c5c42c 100644
--- a/lib/converter/plugins/GitHubPlugin.js
+++ b/lib/converter/plugins/GitHubPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ShellJS = require("shelljs");
 var Path = require("path");
 var components_1 = require("../components");
@@ -138,8 +135,7 @@ var GitHubPlugin = (function (_super) {
         }
     };
     GitHubPlugin = __decorate([
-        components_1.Component({ name: 'git-hub' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'git-hub' })
     ], GitHubPlugin);
     return GitHubPlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/GroupPlugin.js b/lib/converter/plugins/GroupPlugin.js
index a0332bdf12..aea5561675 100644
--- a/lib/converter/plugins/GroupPlugin.js
+++ b/lib/converter/plugins/GroupPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var index_1 = require("../../models/reflections/index");
 var ReflectionGroup_1 = require("../../models/ReflectionGroup");
 var components_1 = require("../components");
@@ -174,8 +171,7 @@ var GroupPlugin = (function (_super) {
         return plurals;
     })();
     GroupPlugin = __decorate([
-        components_1.Component({ name: 'group' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'group' })
     ], GroupPlugin);
     return GroupPlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/ImplementsPlugin.js b/lib/converter/plugins/ImplementsPlugin.js
index d1e6b8be50..9b56991b37 100644
--- a/lib/converter/plugins/ImplementsPlugin.js
+++ b/lib/converter/plugins/ImplementsPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var index_1 = require("../../models/reflections/index");
 var index_2 = require("../../models/types/index");
 var components_1 = require("../components");
@@ -90,8 +87,7 @@ var ImplementsPlugin = (function (_super) {
         }
     };
     ImplementsPlugin = __decorate([
-        components_1.Component({ name: 'implements' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'implements' })
     ], ImplementsPlugin);
     return ImplementsPlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/PackagePlugin.js b/lib/converter/plugins/PackagePlugin.js
index e557420fc9..e130910e6f 100644
--- a/lib/converter/plugins/PackagePlugin.js
+++ b/lib/converter/plugins/PackagePlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var FS = require("fs");
 var components_1 = require("../components");
@@ -87,12 +84,10 @@ var PackagePlugin = (function (_super) {
         component_1.Option({
             name: 'readme',
             help: 'Path to the readme file that should be displayed on the index page. Pass `none` to disable the index page and start the documentation on the globals page.'
-        }), 
-        __metadata('design:type', String)
+        })
     ], PackagePlugin.prototype, "readme", void 0);
     PackagePlugin = __decorate([
-        components_1.Component({ name: 'package' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'package' })
     ], PackagePlugin);
     return PackagePlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/SourcePlugin.js b/lib/converter/plugins/SourcePlugin.js
index d5cdb86a97..186cec8960 100644
--- a/lib/converter/plugins/SourcePlugin.js
+++ b/lib/converter/plugins/SourcePlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var ts = require("typescript");
 var index_1 = require("../../models/reflections/index");
@@ -122,8 +119,7 @@ var SourcePlugin = (function (_super) {
         });
     };
     SourcePlugin = __decorate([
-        components_1.Component({ name: 'source' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'source' })
     ], SourcePlugin);
     return SourcePlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/plugins/TypePlugin.js b/lib/converter/plugins/TypePlugin.js
index b5cf472ec5..c4be7ec014 100644
--- a/lib/converter/plugins/TypePlugin.js
+++ b/lib/converter/plugins/TypePlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var index_1 = require("../../models/reflections/index");
 var index_2 = require("../../models/types/index");
 var components_1 = require("../components");
@@ -145,8 +142,7 @@ var TypePlugin = (function (_super) {
         });
     };
     TypePlugin = __decorate([
-        components_1.Component({ name: 'type' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type' })
     ], TypePlugin);
     return TypePlugin;
 })(components_1.ConverterComponent);
diff --git a/lib/converter/types/alias.js b/lib/converter/types/alias.js
index 117d78e9c3..b5c6d5744d 100644
--- a/lib/converter/types/alias.js
+++ b/lib/converter/types/alias.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var components_1 = require("../components");
@@ -45,8 +42,7 @@ var AliasConverter = (function (_super) {
         return new index_1.ReferenceType(name, index_1.ReferenceType.SYMBOL_ID_RESOLVE_BY_NAME);
     };
     AliasConverter = __decorate([
-        components_1.Component({ name: 'type:alias' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:alias' })
     ], AliasConverter);
     return AliasConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/array.js b/lib/converter/types/array.js
index f55a9dd93c..9a13dfb59f 100644
--- a/lib/converter/types/array.js
+++ b/lib/converter/types/array.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var components_1 = require("../components");
@@ -21,7 +18,7 @@ var ArrayConverter = (function (_super) {
         _super.apply(this, arguments);
     }
     ArrayConverter.prototype.supportsNode = function (context, node) {
-        return node.kind === 154;
+        return node.kind === 156;
     };
     ArrayConverter.prototype.convertNode = function (context, node) {
         var result = this.owner.convertType(context, node.elementType);
@@ -34,8 +31,7 @@ var ArrayConverter = (function (_super) {
         return result;
     };
     ArrayConverter = __decorate([
-        components_1.Component({ name: 'type:array' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:array' })
     ], ArrayConverter);
     return ArrayConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/binding-array.js b/lib/converter/types/binding-array.js
index 416271b521..61a088d9c1 100644
--- a/lib/converter/types/binding-array.js
+++ b/lib/converter/types/binding-array.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var components_1 = require("../components");
@@ -21,7 +18,7 @@ var BindingArrayConverter = (function (_super) {
         _super.apply(this, arguments);
     }
     BindingArrayConverter.prototype.supportsNode = function (context, node) {
-        return node.kind === 160;
+        return node.kind === 162;
     };
     BindingArrayConverter.prototype.convertNode = function (context, node) {
         var _this = this;
@@ -32,8 +29,7 @@ var BindingArrayConverter = (function (_super) {
         return new index_1.TupleType(types);
     };
     BindingArrayConverter = __decorate([
-        components_1.Component({ name: 'type:binding-array' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:binding-array' })
     ], BindingArrayConverter);
     return BindingArrayConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/binding-object.js b/lib/converter/types/binding-object.js
index 699e48d8c0..4c58815e80 100644
--- a/lib/converter/types/binding-object.js
+++ b/lib/converter/types/binding-object.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var components_1 = require("../components");
@@ -22,7 +19,7 @@ var BindingObjectConverter = (function (_super) {
         _super.apply(this, arguments);
     }
     BindingObjectConverter.prototype.supportsNode = function (context, node) {
-        return node.kind == 159;
+        return node.kind == 161;
     };
     BindingObjectConverter.prototype.convertNode = function (context, node) {
         var _this = this;
@@ -40,8 +37,7 @@ var BindingObjectConverter = (function (_super) {
         return new index_1.ReflectionType(declaration);
     };
     BindingObjectConverter = __decorate([
-        components_1.Component({ name: 'type:binding-object' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:binding-object' })
     ], BindingObjectConverter);
     return BindingObjectConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/enum.js b/lib/converter/types/enum.js
index 9dafa59b5b..5e3dd3015e 100644
--- a/lib/converter/types/enum.js
+++ b/lib/converter/types/enum.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../factories/index");
 var components_1 = require("../components");
@@ -27,8 +24,7 @@ var EnumConverter = (function (_super) {
         return index_1.createReferenceType(context, type.symbol);
     };
     EnumConverter = __decorate([
-        components_1.Component({ name: 'type:enum' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:enum' })
     ], EnumConverter);
     return EnumConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/intrinsic.js b/lib/converter/types/intrinsic.js
index 656ed451df..ff80cd52c0 100644
--- a/lib/converter/types/intrinsic.js
+++ b/lib/converter/types/intrinsic.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/index");
 var components_1 = require("../components");
@@ -27,8 +24,7 @@ var IntrinsicConverter = (function (_super) {
         return new index_1.IntrinsicType(type.intrinsicName);
     };
     IntrinsicConverter = __decorate([
-        components_1.Component({ name: 'type:intrinsic' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:intrinsic' })
     ], IntrinsicConverter);
     return IntrinsicConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/reference.js b/lib/converter/types/reference.js
index bc27173936..31806d1c9d 100644
--- a/lib/converter/types/reference.js
+++ b/lib/converter/types/reference.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/types/index");
 var index_2 = require("../../models/reflections/index");
@@ -63,8 +60,8 @@ var ReferenceConverter = (function (_super) {
         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
             var declaration_1 = _a[_i];
             if (context.visitStack.indexOf(declaration_1) !== -1) {
-                if (declaration_1.kind == 153 ||
-                    declaration_1.kind == 163) {
+                if (declaration_1.kind == 155 ||
+                    declaration_1.kind == 165) {
                     return index_3.createReferenceType(context, declaration_1.parent.symbol);
                 }
                 else {
@@ -86,8 +83,7 @@ var ReferenceConverter = (function (_super) {
         return new index_1.ReflectionType(declaration);
     };
     ReferenceConverter = __decorate([
-        components_1.Component({ name: 'type:reference' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:reference' })
     ], ReferenceConverter);
     return ReferenceConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/string-literal.js b/lib/converter/types/string-literal.js
index 2e6dca1890..a41c46e59d 100644
--- a/lib/converter/types/string-literal.js
+++ b/lib/converter/types/string-literal.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/types/index");
 var components_1 = require("../components");
@@ -33,8 +30,7 @@ var StringLiteralConverter = (function (_super) {
         return new index_1.StringLiteralType(type.text);
     };
     StringLiteralConverter = __decorate([
-        components_1.Component({ name: 'type:string-literal' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:string-literal' })
     ], StringLiteralConverter);
     return StringLiteralConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/tuple.js b/lib/converter/types/tuple.js
index fef3c6a034..4a44c18bd3 100644
--- a/lib/converter/types/tuple.js
+++ b/lib/converter/types/tuple.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/types/index");
 var components_1 = require("../components");
@@ -21,7 +18,7 @@ var TupleConverter = (function (_super) {
         _super.apply(this, arguments);
     }
     TupleConverter.prototype.supportsNode = function (context, node) {
-        return node.kind === 155;
+        return node.kind === 157;
     };
     TupleConverter.prototype.supportsType = function (context, type) {
         return !!(type.flags & 8192);
@@ -49,8 +46,7 @@ var TupleConverter = (function (_super) {
         return new index_1.TupleType(elements);
     };
     TupleConverter = __decorate([
-        components_1.Component({ name: 'type:tuple' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:tuple' })
     ], TupleConverter);
     return TupleConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/type-parameter.js b/lib/converter/types/type-parameter.js
index 9b79752e79..d070bf1f16 100644
--- a/lib/converter/types/type-parameter.js
+++ b/lib/converter/types/type-parameter.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/types/index");
 var components_1 = require("../components");
@@ -36,8 +33,7 @@ var TypeParameterConverter = (function (_super) {
         }
     };
     TypeParameterConverter = __decorate([
-        components_1.Component({ name: 'type:type-parameter' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:type-parameter' })
     ], TypeParameterConverter);
     return TypeParameterConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/union.js b/lib/converter/types/union.js
index f0f2772aa9..1d5388de9a 100644
--- a/lib/converter/types/union.js
+++ b/lib/converter/types/union.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var index_1 = require("../../models/types/index");
 var components_1 = require("../components");
@@ -21,7 +18,7 @@ var UnionConverter = (function (_super) {
         _super.apply(this, arguments);
     }
     UnionConverter.prototype.supportsNode = function (context, node) {
-        return node.kind === 156;
+        return node.kind === 158;
     };
     UnionConverter.prototype.supportsType = function (context, type) {
         return !!(type.flags & 16384);
@@ -49,8 +46,7 @@ var UnionConverter = (function (_super) {
         return new index_1.UnionType(types);
     };
     UnionConverter = __decorate([
-        components_1.Component({ name: 'type:union' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:union' })
     ], UnionConverter);
     return UnionConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/converter/types/unknown.js b/lib/converter/types/unknown.js
index daf2badfda..36a2df4d39 100644
--- a/lib/converter/types/unknown.js
+++ b/lib/converter/types/unknown.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var index_1 = require("../../models/types/index");
 var components_1 = require("../components");
 var UnknownConverter = (function (_super) {
@@ -28,8 +25,7 @@ var UnknownConverter = (function (_super) {
         return new index_1.UnknownType(name);
     };
     UnknownConverter = __decorate([
-        components_1.Component({ name: 'type:unknown' }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: 'type:unknown' })
     ], UnknownConverter);
     return UnknownConverter;
 })(components_1.ConverterTypeComponent);
diff --git a/lib/output/plugins/AssetsPlugin.js b/lib/output/plugins/AssetsPlugin.js
index 8dafb9d533..6c52cb75c8 100644
--- a/lib/output/plugins/AssetsPlugin.js
+++ b/lib/output/plugins/AssetsPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var FS = require("fs-extra");
 var components_1 = require("../components");
@@ -45,8 +42,7 @@ var AssetsPlugin = (function (_super) {
         }
     };
     AssetsPlugin = __decorate([
-        components_1.Component({ name: "assets" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "assets" })
     ], AssetsPlugin);
     return AssetsPlugin;
 })(components_1.RendererComponent);
diff --git a/lib/output/plugins/JavascriptIndexPlugin.js b/lib/output/plugins/JavascriptIndexPlugin.js
index 24934de0cd..ed632910cc 100644
--- a/lib/output/plugins/JavascriptIndexPlugin.js
+++ b/lib/output/plugins/JavascriptIndexPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var index_1 = require("../../models/reflections/index");
 var GroupPlugin_1 = require("../../converter/plugins/GroupPlugin");
@@ -64,8 +61,7 @@ var JavascriptIndexPlugin = (function (_super) {
         fs_1.writeFile(fileName, data, true);
     };
     JavascriptIndexPlugin = __decorate([
-        components_1.Component({ name: "javascript-index" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "javascript-index" })
     ], JavascriptIndexPlugin);
     return JavascriptIndexPlugin;
 })(components_1.RendererComponent);
diff --git a/lib/output/plugins/LayoutPlugin.js b/lib/output/plugins/LayoutPlugin.js
index d0750b01c9..1eccd91358 100644
--- a/lib/output/plugins/LayoutPlugin.js
+++ b/lib/output/plugins/LayoutPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var components_1 = require("../components");
 var events_1 = require("../events");
 var LayoutPlugin = (function (_super) {
@@ -27,8 +24,7 @@ var LayoutPlugin = (function (_super) {
         page.contents = layout(page);
     };
     LayoutPlugin = __decorate([
-        components_1.Component({ name: "layout" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "layout" })
     ], LayoutPlugin);
     return LayoutPlugin;
 })(components_1.RendererComponent);
diff --git a/lib/output/plugins/MarkedLinksPlugin.js b/lib/output/plugins/MarkedLinksPlugin.js
index 928036b40a..102ceab2fb 100644
--- a/lib/output/plugins/MarkedLinksPlugin.js
+++ b/lib/output/plugins/MarkedLinksPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Util = require("util");
 var components_1 = require("../components");
 var events_1 = require("../events");
@@ -95,8 +92,7 @@ var MarkedLinksPlugin = (function (_super) {
         }
     };
     MarkedLinksPlugin = __decorate([
-        components_1.Component({ name: "marked-links" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "marked-links" })
     ], MarkedLinksPlugin);
     return MarkedLinksPlugin;
 })(components_1.ContextAwareRendererComponent);
diff --git a/lib/output/plugins/MarkedPlugin.js b/lib/output/plugins/MarkedPlugin.js
index 7132049147..c15401c370 100644
--- a/lib/output/plugins/MarkedPlugin.js
+++ b/lib/output/plugins/MarkedPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var FS = require("fs-extra");
 var Path = require("path");
 var Marked = require("marked");
@@ -121,20 +118,17 @@ var MarkedPlugin = (function (_super) {
             name: 'includes',
             help: 'Specifies the location to look for included documents (use [[include:FILENAME]] in comments).',
             hint: declaration_1.ParameterHint.Directory
-        }), 
-        __metadata('design:type', String)
+        })
     ], MarkedPlugin.prototype, "includeSource", void 0);
     __decorate([
         component_1.Option({
             name: 'media',
             help: 'Specifies the location with media files that should be copied to the output directory.',
             hint: declaration_1.ParameterHint.Directory
-        }), 
-        __metadata('design:type', String)
+        })
     ], MarkedPlugin.prototype, "mediaSource", void 0);
     MarkedPlugin = __decorate([
-        components_1.Component({ name: "marked" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "marked" })
     ], MarkedPlugin);
     return MarkedPlugin;
 })(components_1.ContextAwareRendererComponent);
diff --git a/lib/output/plugins/NavigationPlugin.js b/lib/output/plugins/NavigationPlugin.js
index e8a97949e3..060c3a870e 100644
--- a/lib/output/plugins/NavigationPlugin.js
+++ b/lib/output/plugins/NavigationPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var components_1 = require("../components");
 var events_1 = require("../events");
 var NavigationPlugin = (function (_super) {
@@ -66,8 +63,7 @@ var NavigationPlugin = (function (_super) {
         page.navigation = this.navigation;
     };
     NavigationPlugin = __decorate([
-        components_1.Component({ name: "navigation" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "navigation" })
     ], NavigationPlugin);
     return NavigationPlugin;
 })(components_1.RendererComponent);
diff --git a/lib/output/plugins/PrettyPrintPlugin.js b/lib/output/plugins/PrettyPrintPlugin.js
index 3abeca2f18..2faf928c23 100644
--- a/lib/output/plugins/PrettyPrintPlugin.js
+++ b/lib/output/plugins/PrettyPrintPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var components_1 = require("../components");
 var events_1 = require("../events");
 var PrettyPrintState;
@@ -132,8 +129,7 @@ var PrettyPrintPlugin = (function (_super) {
         style: true
     };
     PrettyPrintPlugin = __decorate([
-        components_1.Component({ name: "pretty-print" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "pretty-print" })
     ], PrettyPrintPlugin);
     return PrettyPrintPlugin;
 })(components_1.RendererComponent);
diff --git a/lib/output/plugins/TocPlugin.js b/lib/output/plugins/TocPlugin.js
index 8e4b90c864..3e0b924ef9 100644
--- a/lib/output/plugins/TocPlugin.js
+++ b/lib/output/plugins/TocPlugin.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var index_1 = require("../../models/reflections/index");
 var components_1 = require("../components");
 var events_1 = require("../events");
@@ -66,8 +63,7 @@ var TocPlugin = (function (_super) {
         }
     };
     TocPlugin = __decorate([
-        components_1.Component({ name: "toc" }), 
-        __metadata('design:paramtypes', [])
+        components_1.Component({ name: "toc" })
     ], TocPlugin);
     return TocPlugin;
 })(components_1.RendererComponent);
diff --git a/lib/output/renderer.js b/lib/output/renderer.js
index e1ebc5f9cf..54622a8f92 100644
--- a/lib/output/renderer.js
+++ b/lib/output/renderer.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var FS = require("fs-extra");
 var ProgressBar = require("progress");
@@ -129,6 +126,7 @@ var Renderer = (function (_super) {
         return true;
     };
     Renderer.getThemeDirectory = function () {
+        console.log(Path.dirname(require.resolve('typedoc-default-themes')));
         return Path.dirname(require.resolve('typedoc-default-themes'));
     };
     Renderer.getDefaultTheme = function () {
@@ -140,20 +138,17 @@ var Renderer = (function (_super) {
             help: 'Specify the path to the theme that should be used or \'default\' or \'minimal\' to use built-in themes.',
             type: declaration_1.ParameterType.String,
             defaultValue: 'default'
-        }), 
-        __metadata('design:type', String)
+        })
     ], Renderer.prototype, "themeName", void 0);
     __decorate([
         component_1.Option({
             name: 'disableOutputCheck',
             help: 'Should TypeDoc disable the testing and cleaning of the output directory?',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], Renderer.prototype, "disableOutputCheck", void 0);
     Renderer = __decorate([
-        component_1.Component({ name: "renderer", internal: true, childClass: components_1.RendererComponent }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "renderer", internal: true, childClass: components_1.RendererComponent })
     ], Renderer);
     return Renderer;
 })(component_1.ChildableComponent);
diff --git a/lib/output/theme.js b/lib/output/theme.js
index 797771b517..f094eff925 100644
--- a/lib/output/theme.js
+++ b/lib/output/theme.js
@@ -9,10 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var renderer_1 = require("./renderer");
 var components_1 = require("./components");
 var component_1 = require("../utils/component");
 var resources_1 = require("./utils/resources");
@@ -33,8 +29,7 @@ var Theme = (function (_super) {
         return null;
     };
     Theme = __decorate([
-        component_1.Component({ name: "rendrer:theme", internal: true }), 
-        __metadata('design:paramtypes', [renderer_1.Renderer, String])
+        component_1.Component({ name: "rendrer:theme", internal: true })
     ], Theme);
     return Theme;
 })(components_1.RendererComponent);
diff --git a/lib/output/themes/DefaultTheme.js b/lib/output/themes/DefaultTheme.js
index 090d29eec4..866f07b9c4 100644
--- a/lib/output/themes/DefaultTheme.js
+++ b/lib/output/themes/DefaultTheme.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var FS = require("fs");
 var theme_1 = require("../theme");
@@ -321,32 +318,28 @@ var DefaultTheme = (function (_super) {
         component_1.Option({
             name: 'gaID',
             help: 'Set the Google Analytics tracking ID and activate tracking code.'
-        }), 
-        __metadata('design:type', String)
+        })
     ], DefaultTheme.prototype, "gaID", void 0);
     __decorate([
         component_1.Option({
             name: 'gaSite',
             help: 'Set the site name for Google Analytics. Defaults to `auto`.',
             defaultValue: 'auto'
-        }), 
-        __metadata('design:type', String)
+        })
     ], DefaultTheme.prototype, "gaSite", void 0);
     __decorate([
         component_1.Option({
             name: 'hideGenerator',
             help: 'Do not print the TypeDoc link at the end of the page.',
             type: declaration_1.ParameterType.Boolean
-        }), 
-        __metadata('design:type', Boolean)
+        })
     ], DefaultTheme.prototype, "hideGenerator", void 0);
     __decorate([
         component_1.Option({
             name: 'entryPoint',
             help: 'Specifies the fully qualified name of the root symbol. Defaults to global namespace.',
             type: declaration_1.ParameterType.String
-        }), 
-        __metadata('design:type', String)
+        })
     ], DefaultTheme.prototype, "entryPoint", void 0);
     return DefaultTheme;
 })(theme_1.Theme);
diff --git a/lib/utils/component.js b/lib/utils/component.js
index a3c89519f5..c6bea3317b 100644
--- a/lib/utils/component.js
+++ b/lib/utils/component.js
@@ -27,8 +27,8 @@ function Component(options) {
         }
         var internal = !!options.internal;
         if (name && !internal) {
-            for (var _i = 0, childMappings_1 = childMappings; _i < childMappings_1.length; _i++) {
-                var childMapping = childMappings_1[_i];
+            for (var _i = 0; _i < childMappings.length; _i++) {
+                var childMapping = childMappings[_i];
                 if (!(proto instanceof childMapping.child))
                     continue;
                 var host = childMapping.host;
diff --git a/lib/utils/options/options.js b/lib/utils/options/options.js
index dd16b747ab..7c454c1b0a 100644
--- a/lib/utils/options/options.js
+++ b/lib/utils/options/options.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var _ = require("lodash");
 var Util = require("util");
 var ts = require("typescript");
@@ -169,8 +166,8 @@ var Options = (function (_super) {
         }
     };
     Options.prototype.addDeclarations = function (declarations) {
-        for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
-            var declaration = declarations_1[_i];
+        for (var _i = 0; _i < declarations.length; _i++) {
+            var declaration = declarations[_i];
             this.addDeclaration(declaration);
         }
     };
@@ -193,8 +190,7 @@ var Options = (function (_super) {
         }
     };
     Options = __decorate([
-        component_1.Component({ name: "options", internal: true, childClass: OptionsComponent }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "options", internal: true, childClass: OptionsComponent })
     ], Options);
     return Options;
 })(component_1.ChildableComponent);
diff --git a/lib/utils/options/readers/arguments.js b/lib/utils/options/readers/arguments.js
index 7d53fd4cc1..47ff13894c 100644
--- a/lib/utils/options/readers/arguments.js
+++ b/lib/utils/options/readers/arguments.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var component_1 = require("../../component");
 var options_1 = require("../options");
@@ -31,22 +28,23 @@ var ArgumentsReader = (function (_super) {
     };
     ArgumentsReader.prototype.parseArguments = function (event, args) {
         var index = 0;
+        var owner = this.owner;
         args = args || process.argv.slice(2);
         function readArgument(arg) {
-            var declaration = this.owner.getDeclaration(arg);
+            var declaration = owner.getDeclaration(arg);
             if (!declaration) {
                 event.addError('Unknown option: %s', arg);
             }
-            else if (declaration.getType() !== declaration_1.ParameterType.Boolean) {
+            else if (declaration.type !== declaration_1.ParameterType.Boolean) {
                 if (!args[index]) {
-                    event.addError('Option "%s" expects an argument', declaration.getName());
+                    event.addError('Option "%s" expects an argument', declaration.name);
                 }
                 else {
-                    event.data[declaration.getName()] = args[index++];
+                    event.data[declaration.name] = args[index++];
                 }
             }
             else {
-                event.data[declaration.getName()] = true;
+                event.data[declaration.name] = true;
             }
         }
         while (index < args.length) {
@@ -98,8 +96,7 @@ var ArgumentsReader = (function (_super) {
         this.parseArguments(event, args);
     };
     ArgumentsReader = __decorate([
-        component_1.Component({ name: "options:arguments" }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "options:arguments" })
     ], ArgumentsReader);
     return ArgumentsReader;
 })(options_1.OptionsComponent);
diff --git a/lib/utils/options/readers/tsconfig.js b/lib/utils/options/readers/tsconfig.js
index e199d51152..2ffa62577f 100644
--- a/lib/utils/options/readers/tsconfig.js
+++ b/lib/utils/options/readers/tsconfig.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var FS = require("fs");
 var _ = require("lodash");
@@ -54,8 +51,8 @@ var TSConfigReader = (function (_super) {
         if ("compilerOptions" in data) {
             var ignored = typescript_1.TypeScriptSource.IGNORED;
             var compilerOptions = _.clone(data.compilerOptions);
-            for (var _i = 0, ignored_1 = ignored; _i < ignored_1.length; _i++) {
-                var key = ignored_1[_i];
+            for (var _i = 0; _i < ignored.length; _i++) {
+                var key = ignored[_i];
                 delete compilerOptions[key];
             }
             _.merge(event.data, compilerOptions);
@@ -71,12 +68,10 @@ var TSConfigReader = (function (_super) {
             help: 'Specify a js option file that should be loaded. If not specified TypeDoc will look for \'typedoc.js\' in the current directory.',
             type: declaration_1.ParameterType.String,
             hint: declaration_1.ParameterHint.File
-        }), 
-        __metadata('design:type', String)
+        })
     ], TSConfigReader.prototype, "options", void 0);
     TSConfigReader = __decorate([
-        component_1.Component({ name: "options:tsconfig" }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "options:tsconfig" })
     ], TSConfigReader);
     return TSConfigReader;
 })(options_1.OptionsComponent);
diff --git a/lib/utils/options/readers/typedoc.js b/lib/utils/options/readers/typedoc.js
index 97dd8b8061..00be4f6d3b 100644
--- a/lib/utils/options/readers/typedoc.js
+++ b/lib/utils/options/readers/typedoc.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var Path = require("path");
 var FS = require("fs");
 var _ = require("lodash");
@@ -72,12 +69,10 @@ var TypedocReader = (function (_super) {
             help: 'Specify a js option file that should be loaded. If not specified TypeDoc will look for \'typedoc.js\' in the current directory.',
             type: declaration_1.ParameterType.String,
             hint: declaration_1.ParameterHint.File
-        }), 
-        __metadata('design:type', String)
+        })
     ], TypedocReader.prototype, "options", void 0);
     TypedocReader = __decorate([
-        component_1.Component({ name: "options:typedoc" }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "options:typedoc" })
     ], TypedocReader);
     return TypedocReader;
 })(options_1.OptionsComponent);
diff --git a/lib/utils/options/sources/component.js b/lib/utils/options/sources/component.js
index b06dfd74e3..cff8663c77 100644
--- a/lib/utils/options/sources/component.js
+++ b/lib/utils/options/sources/component.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var component_1 = require("../../component");
 var options_1 = require("../options");
 var ComponentSource = (function (_super) {
@@ -68,14 +65,13 @@ var ComponentSource = (function (_super) {
     };
     ComponentSource.prototype.onComponentRemoved = function (e) {
         var declarations = e.component.getOptionDeclarations();
-        for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
-            var declaration = declarations_1[_i];
+        for (var _i = 0; _i < declarations.length; _i++) {
+            var declaration = declarations[_i];
             this.owner.removeDeclarationByName(declaration.name);
         }
     };
     ComponentSource = __decorate([
-        component_1.Component({ name: "options:component" }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "options:component" })
     ], ComponentSource);
     return ComponentSource;
 })(options_1.OptionsComponent);
diff --git a/lib/utils/options/sources/typescript.js b/lib/utils/options/sources/typescript.js
index 904868349e..267cfec2b2 100644
--- a/lib/utils/options/sources/typescript.js
+++ b/lib/utils/options/sources/typescript.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var ts = require("typescript");
 var component_1 = require("../../component");
 var options_1 = require("../options");
@@ -55,8 +52,8 @@ var TypeScriptSource = (function (_super) {
             default:
                 param.type = declaration_1.ParameterType.Map;
                 param.map = option.type;
-                if (option.error) {
-                    var error = ts.createCompilerDiagnostic(option.error);
+                if (option['error']) {
+                    var error = ts.createCompilerDiagnostic(option['error']);
                     param.mapError = ts.flattenDiagnosticMessageText(error.messageText, ', ');
                 }
         }
@@ -76,8 +73,7 @@ var TypeScriptSource = (function (_super) {
         'sourceMap', 'removeComments'
     ];
     TypeScriptSource = __decorate([
-        component_1.Component({ name: "options:typescript" }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: "options:typescript" })
     ], TypeScriptSource);
     return TypeScriptSource;
 })(options_1.OptionsComponent);
diff --git a/lib/utils/plugins.js b/lib/utils/plugins.js
index cd1d3287ae..f99fc5df81 100644
--- a/lib/utils/plugins.js
+++ b/lib/utils/plugins.js
@@ -9,9 +9,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var FS = require("fs");
 var Path = require("path");
 var Util = require("util");
@@ -112,12 +109,10 @@ var PluginHost = (function (_super) {
             help: 'Specify the npm plugins that should be loaded. Omit to load all installed plugins, set to \'none\' to load no plugins.',
             type: declaration_1.ParameterType.String,
             isArray: true
-        }), 
-        __metadata('design:type', Array)
+        })
     ], PluginHost.prototype, "plugins", void 0);
     PluginHost = __decorate([
-        component_1.Component({ name: 'plugin-host', internal: true }), 
-        __metadata('design:paramtypes', [])
+        component_1.Component({ name: 'plugin-host', internal: true })
     ], PluginHost);
     return PluginHost;
 })(component_1.AbstractComponent);
diff --git a/tsconfig.json b/tsconfig.json
index 7a5c96c43c..63bce5c960 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,11 +2,11 @@
     "compilerOptions": {
         "module": "commonjs",
         "target": "ES5",
-        "noImplicitAny": true,
+        "noImplicitAny": false,
         "removeComments": true,
         "preserveConstEnums": true,
         "sourceMap": false,
-        "outDir": "../",
+        "outDir": "./",
         "rootDir": "./src/",
         "experimentalDecorators": true
     },
@@ -20,145 +20,145 @@
         "./src/index.ts"
     ],
     "files": [
-        "./src/typings/fs-extra/fs-extra.d.ts",
-        "./src/typings/handlebars/handlebars.d.ts",
-        "./src/typings/highlightjs/highlightjs.d.ts",
-        "./src/typings/lodash/lodash.d.ts",
-        "./src/typings/marked/marked.d.ts",
-        "./src/typings/minimatch/minimatch.d.ts",
-        "./src/typings/node-progress/node-progress.d.ts",
-        "./src/typings/node/node.d.ts",
-        "./src/typings/shelljs/shelljs.d.ts",
-        "./src/typings/tsd.d.ts",
-        "./src/typings/typescript/typescript.d.ts",
-        "./src/lib/application.ts",
-        "./src/lib/cli.ts",
-        "./src/lib/converter/components.ts",
-        "./src/lib/converter/context.ts",
-        "./src/lib/converter/convert-expression.ts",
-        "./src/lib/converter/converter.ts",
-        "./src/lib/converter/factories/comment.ts",
-        "./src/lib/converter/factories/declaration.ts",
-        "./src/lib/converter/factories/index.ts",
-        "./src/lib/converter/factories/parameter.ts",
-        "./src/lib/converter/factories/reference.ts",
-        "./src/lib/converter/factories/signature.ts",
-        "./src/lib/converter/factories/type-parameter.ts",
-        "./src/lib/converter/index.ts",
-        "./src/lib/converter/nodes/accessor.ts",
-        "./src/lib/converter/nodes/alias.ts",
-        "./src/lib/converter/nodes/block.ts",
-        "./src/lib/converter/nodes/class.ts",
-        "./src/lib/converter/nodes/constructor.ts",
-        "./src/lib/converter/nodes/enum.ts",
-        "./src/lib/converter/nodes/export.ts",
-        "./src/lib/converter/nodes/function.ts",
-        "./src/lib/converter/nodes/index.ts",
-        "./src/lib/converter/nodes/interface.ts",
-        "./src/lib/converter/nodes/literal-object.ts",
-        "./src/lib/converter/nodes/literal-type.ts",
-        "./src/lib/converter/nodes/module.ts",
-        "./src/lib/converter/nodes/signature-call.ts",
-        "./src/lib/converter/nodes/signature-index.ts",
-        "./src/lib/converter/nodes/variable-statement.ts",
-        "./src/lib/converter/nodes/variable.ts",
-        "./src/lib/converter/plugins/CommentPlugin.ts",
-        "./src/lib/converter/plugins/DecoratorPlugin.ts",
-        "./src/lib/converter/plugins/DeepCommentPlugin.ts",
-        "./src/lib/converter/plugins/DynamicModulePlugin.ts",
-        "./src/lib/converter/plugins/GitHubPlugin.ts",
-        "./src/lib/converter/plugins/GroupPlugin.ts",
-        "./src/lib/converter/plugins/ImplementsPlugin.ts",
-        "./src/lib/converter/plugins/index.ts",
-        "./src/lib/converter/plugins/PackagePlugin.ts",
-        "./src/lib/converter/plugins/SourcePlugin.ts",
-        "./src/lib/converter/plugins/TypePlugin.ts",
-        "./src/lib/converter/types/alias.ts",
-        "./src/lib/converter/types/array.ts",
-        "./src/lib/converter/types/binding-array.ts",
-        "./src/lib/converter/types/binding-object.ts",
-        "./src/lib/converter/types/enum.ts",
-        "./src/lib/converter/types/index.ts",
-        "./src/lib/converter/types/intrinsic.ts",
-        "./src/lib/converter/types/reference.ts",
-        "./src/lib/converter/types/string-literal.ts",
-        "./src/lib/converter/types/tuple.ts",
-        "./src/lib/converter/types/type-parameter.ts",
-        "./src/lib/converter/types/union.ts",
-        "./src/lib/converter/types/unknown.ts",
-        "./src/lib/converter/utils/base-path.ts",
-        "./src/lib/converter/utils/compiler-host.ts",
-        "./src/lib/models/comments/comment.ts",
-        "./src/lib/models/comments/index.ts",
-        "./src/lib/models/comments/tag.ts",
-        "./src/lib/models/index.ts",
-        "./src/lib/models/ReflectionGroup.ts",
-        "./src/lib/models/reflections/abstract.ts",
-        "./src/lib/models/reflections/container.ts",
-        "./src/lib/models/reflections/declaration.ts",
-        "./src/lib/models/reflections/index.ts",
-        "./src/lib/models/reflections/parameter.ts",
-        "./src/lib/models/reflections/project.ts",
-        "./src/lib/models/reflections/signature.ts",
-        "./src/lib/models/reflections/type-parameter.ts",
-        "./src/lib/models/sources/directory.ts",
-        "./src/lib/models/sources/file.ts",
-        "./src/lib/models/sources/index.ts",
-        "./src/lib/models/types/abstract.ts",
-        "./src/lib/models/types/index.ts",
-        "./src/lib/models/types/intrinsic.ts",
-        "./src/lib/models/types/reference.ts",
-        "./src/lib/models/types/reflection.ts",
-        "./src/lib/models/types/string-literal.ts",
-        "./src/lib/models/types/tuple.ts",
-        "./src/lib/models/types/type-parameter.ts",
-        "./src/lib/models/types/union.ts",
-        "./src/lib/models/types/unknown.ts",
-        "./src/lib/output/components.ts",
-        "./src/lib/output/events.ts",
-        "./src/lib/output/helpers/compact.ts",
-        "./src/lib/output/helpers/if-cond.ts",
-        "./src/lib/output/helpers/if-signature.ts",
-        "./src/lib/output/helpers/wbr.ts",
-        "./src/lib/output/models/NavigationItem.ts",
-        "./src/lib/output/models/UrlMapping.ts",
-        "./src/lib/output/plugins/AssetsPlugin.ts",
-        "./src/lib/output/plugins/index.ts",
-        "./src/lib/output/plugins/JavascriptIndexPlugin.ts",
-        "./src/lib/output/plugins/LayoutPlugin.ts",
-        "./src/lib/output/plugins/MarkedLinksPlugin.ts",
-        "./src/lib/output/plugins/MarkedPlugin.ts",
-        "./src/lib/output/plugins/NavigationPlugin.ts",
-        "./src/lib/output/plugins/PrettyPrintPlugin.ts",
-        "./src/lib/output/plugins/TocPlugin.ts",
-        "./src/lib/output/renderer.ts",
-        "./src/lib/output/theme.ts",
-        "./src/lib/output/themes/DefaultTheme.ts",
-        "./src/lib/output/themes/MinimalTheme.ts",
-        "./src/lib/output/utils/resources.ts",
-        "./src/lib/output/utils/resources/helpers.ts",
-        "./src/lib/output/utils/resources/stack.ts",
-        "./src/lib/output/utils/resources/templates.ts",
-        "./src/lib/utils/component.ts",
-        "./src/lib/utils/events.ts",
-        "./src/lib/utils/fs.ts",
-        "./src/lib/utils/index.ts",
-        "./src/lib/utils/loggers.ts",
-        "./src/lib/utils/options/declaration.ts",
-        "./src/lib/utils/options/help.ts",
-        "./src/lib/utils/options/index.ts",
-        "./src/lib/utils/options/options.ts",
-        "./src/lib/utils/options/readers/arguments.ts",
-        "./src/lib/utils/options/readers/index.ts",
-        "./src/lib/utils/options/readers/tsconfig.ts",
-        "./src/lib/utils/options/readers/typedoc.ts",
-        "./src/lib/utils/options/sources/component.ts",
-        "./src/lib/utils/options/sources/index.ts",
-        "./src/lib/utils/options/sources/typescript.ts",
-        "./src/lib/utils/plugins.ts",
-        "./src/index.ts"
+        "src/typings/fs-extra/fs-extra.d.ts",
+        "src/typings/handlebars/handlebars.d.ts",
+        "src/typings/highlightjs/highlightjs.d.ts",
+        "src/typings/lodash/lodash.d.ts",
+        "src/typings/marked/marked.d.ts",
+        "src/typings/minimatch/minimatch.d.ts",
+        "src/typings/node-progress/node-progress.d.ts",
+        "src/typings/node/node.d.ts",
+        "src/typings/shelljs/shelljs.d.ts",
+        "src/typings/tsd.d.ts",
+        "src/typings/typescript/typescript.d.ts",
+        "src/lib/application.ts",
+        "src/lib/cli.ts",
+        "src/lib/converter/components.ts",
+        "src/lib/converter/context.ts",
+        "src/lib/converter/convert-expression.ts",
+        "src/lib/converter/converter.ts",
+        "src/lib/converter/factories/comment.ts",
+        "src/lib/converter/factories/declaration.ts",
+        "src/lib/converter/factories/index.ts",
+        "src/lib/converter/factories/parameter.ts",
+        "src/lib/converter/factories/reference.ts",
+        "src/lib/converter/factories/signature.ts",
+        "src/lib/converter/factories/type-parameter.ts",
+        "src/lib/converter/index.ts",
+        "src/lib/converter/nodes/accessor.ts",
+        "src/lib/converter/nodes/alias.ts",
+        "src/lib/converter/nodes/block.ts",
+        "src/lib/converter/nodes/class.ts",
+        "src/lib/converter/nodes/constructor.ts",
+        "src/lib/converter/nodes/enum.ts",
+        "src/lib/converter/nodes/export.ts",
+        "src/lib/converter/nodes/function.ts",
+        "src/lib/converter/nodes/index.ts",
+        "src/lib/converter/nodes/interface.ts",
+        "src/lib/converter/nodes/literal-object.ts",
+        "src/lib/converter/nodes/literal-type.ts",
+        "src/lib/converter/nodes/module.ts",
+        "src/lib/converter/nodes/signature-call.ts",
+        "src/lib/converter/nodes/signature-index.ts",
+        "src/lib/converter/nodes/variable-statement.ts",
+        "src/lib/converter/nodes/variable.ts",
+        "src/lib/converter/plugins/CommentPlugin.ts",
+        "src/lib/converter/plugins/DecoratorPlugin.ts",
+        "src/lib/converter/plugins/DeepCommentPlugin.ts",
+        "src/lib/converter/plugins/DynamicModulePlugin.ts",
+        "src/lib/converter/plugins/GitHubPlugin.ts",
+        "src/lib/converter/plugins/GroupPlugin.ts",
+        "src/lib/converter/plugins/ImplementsPlugin.ts",
+        "src/lib/converter/plugins/PackagePlugin.ts",
+        "src/lib/converter/plugins/SourcePlugin.ts",
+        "src/lib/converter/plugins/TypePlugin.ts",
+        "src/lib/converter/plugins/index.ts",
+        "src/lib/converter/types/alias.ts",
+        "src/lib/converter/types/array.ts",
+        "src/lib/converter/types/binding-array.ts",
+        "src/lib/converter/types/binding-object.ts",
+        "src/lib/converter/types/enum.ts",
+        "src/lib/converter/types/index.ts",
+        "src/lib/converter/types/intrinsic.ts",
+        "src/lib/converter/types/reference.ts",
+        "src/lib/converter/types/string-literal.ts",
+        "src/lib/converter/types/tuple.ts",
+        "src/lib/converter/types/type-parameter.ts",
+        "src/lib/converter/types/union.ts",
+        "src/lib/converter/types/unknown.ts",
+        "src/lib/converter/utils/base-path.ts",
+        "src/lib/converter/utils/compiler-host.ts",
+        "src/lib/models/ReflectionGroup.ts",
+        "src/lib/models/comments/comment.ts",
+        "src/lib/models/comments/index.ts",
+        "src/lib/models/comments/tag.ts",
+        "src/lib/models/index.ts",
+        "src/lib/models/reflections/abstract.ts",
+        "src/lib/models/reflections/container.ts",
+        "src/lib/models/reflections/declaration.ts",
+        "src/lib/models/reflections/index.ts",
+        "src/lib/models/reflections/parameter.ts",
+        "src/lib/models/reflections/project.ts",
+        "src/lib/models/reflections/signature.ts",
+        "src/lib/models/reflections/type-parameter.ts",
+        "src/lib/models/sources/directory.ts",
+        "src/lib/models/sources/file.ts",
+        "src/lib/models/sources/index.ts",
+        "src/lib/models/types/abstract.ts",
+        "src/lib/models/types/index.ts",
+        "src/lib/models/types/intrinsic.ts",
+        "src/lib/models/types/reference.ts",
+        "src/lib/models/types/reflection.ts",
+        "src/lib/models/types/string-literal.ts",
+        "src/lib/models/types/tuple.ts",
+        "src/lib/models/types/type-parameter.ts",
+        "src/lib/models/types/union.ts",
+        "src/lib/models/types/unknown.ts",
+        "src/lib/output/components.ts",
+        "src/lib/output/events.ts",
+        "src/lib/output/helpers/compact.ts",
+        "src/lib/output/helpers/if-cond.ts",
+        "src/lib/output/helpers/if-signature.ts",
+        "src/lib/output/helpers/wbr.ts",
+        "src/lib/output/models/NavigationItem.ts",
+        "src/lib/output/models/UrlMapping.ts",
+        "src/lib/output/plugins/AssetsPlugin.ts",
+        "src/lib/output/plugins/JavascriptIndexPlugin.ts",
+        "src/lib/output/plugins/LayoutPlugin.ts",
+        "src/lib/output/plugins/MarkedLinksPlugin.ts",
+        "src/lib/output/plugins/MarkedPlugin.ts",
+        "src/lib/output/plugins/NavigationPlugin.ts",
+        "src/lib/output/plugins/PrettyPrintPlugin.ts",
+        "src/lib/output/plugins/TocPlugin.ts",
+        "src/lib/output/plugins/index.ts",
+        "src/lib/output/renderer.ts",
+        "src/lib/output/theme.ts",
+        "src/lib/output/themes/DefaultTheme.ts",
+        "src/lib/output/themes/MinimalTheme.ts",
+        "src/lib/output/utils/resources.ts",
+        "src/lib/output/utils/resources/helpers.ts",
+        "src/lib/output/utils/resources/stack.ts",
+        "src/lib/output/utils/resources/templates.ts",
+        "src/lib/utils/component.ts",
+        "src/lib/utils/events.ts",
+        "src/lib/utils/fs.ts",
+        "src/lib/utils/index.ts",
+        "src/lib/utils/loggers.ts",
+        "src/lib/utils/options/declaration.ts",
+        "src/lib/utils/options/help.ts",
+        "src/lib/utils/options/index.ts",
+        "src/lib/utils/options/options.ts",
+        "src/lib/utils/options/readers/arguments.ts",
+        "src/lib/utils/options/readers/index.ts",
+        "src/lib/utils/options/readers/tsconfig.ts",
+        "src/lib/utils/options/readers/typedoc.ts",
+        "src/lib/utils/options/sources/component.ts",
+        "src/lib/utils/options/sources/index.ts",
+        "src/lib/utils/options/sources/typescript.ts",
+        "src/lib/utils/plugins.ts",
+        "src/index.ts"
     ],
     "atom": {
         "rewriteTsconfig": true
     }
-}
+}
\ No newline at end of file