diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526b5d7b..453e0226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 v0.12.0
 ---
+* Added ability to disable and enable obfuscation for specific parts of the code by adding conditional comments. 
 * Added obfuscation of `es2015` class names.
 
 v0.11.0
diff --git a/package.json b/package.json
index 849c13c4..c860b8a6 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@types/mkdirp": "0.5.1",
     "@types/mocha": "2.2.43",
     "@types/node": "8.0.28",
-    "@types/sinon": "2.3.3",
+    "@types/sinon": "2.3.4",
     "@types/string-template": "1.0.2",
     "@types/webpack-env": "1.13.1",
     "awesome-typescript-loader": "3.2.3",
@@ -60,7 +60,7 @@
     "chai": "4.1.2",
     "coveralls": "2.13.1",
     "istanbul": "1.1.0-alpha.1",
-    "mocha": "3.5.1",
+    "mocha": "3.5.3",
     "pre-commit": "1.2.2",
     "sinon": "3.2.1",
     "ts-node": "3.3.0",
diff --git a/webpack.config.js b/webpack.config.js
index 5601d362..12d0c4c2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -69,7 +69,9 @@ module.exports = {
         ),
         new CheckerPlugin(),
         new TSLintPlugin({
-            files: ['./src/**/*.ts']
+            files: ['./src/**/*.ts'],
+            typeCheck: true,
+            project: './tsconfig.json'
         })
     ],
     output: {
diff --git a/yarn.lock b/yarn.lock
index 407236e1..7750191f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -56,17 +56,13 @@
   version "2.2.43"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.43.tgz#03c54589c43ad048cbcbfd63999b55d0424eec27"
 
-"@types/node@*":
-  version "8.0.25"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1"
-
-"@types/node@8.0.28":
+"@types/node@*", "@types/node@8.0.28":
   version "8.0.28"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.28.tgz#86206716f8d9251cf41692e384264cbd7058ad60"
 
-"@types/sinon@2.3.3":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-2.3.3.tgz#1f20b96f954b4997a09c1c0a20264aaba6b00147"
+"@types/sinon@2.3.4":
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-2.3.4.tgz#2b3aa82dfc791eeff1d970b657a77eafff2899ff"
 
 "@types/string-template@1.0.2":
   version "1.0.2"
@@ -2678,9 +2674,9 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mocha@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.1.tgz#9b6d13ac1ccf957edd16f2e439055734b1b60391"
+mocha@3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
   dependencies:
     browser-stdout "1.3.0"
     commander "2.9.0"
@@ -3525,18 +3521,12 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.4.18:
+source-map-support@0.4.18, source-map-support@^0.4.0, source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.4.0, source-map-support@^0.4.15:
-  version "0.4.17"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.17.tgz#6f2150553e6375375d0ccb3180502b78c18ba430"
-  dependencies:
-    source-map "^0.5.6"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"