diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..1dce4bad
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: node_js
+node_js:
+ - "6"
+
+script:
+- npm test
+- npm run deploy
+
+addons:
+ firefox: "42.0"
+ apt:
+   sources:
+   - ubuntu-toolchain-r-test
+   # required by node-gyp to build some packages
+   packages:
+   - g++-4.8
\ No newline at end of file
diff --git a/components/file-upload/file-drop.ts b/components/file-upload/file-drop.ts
index 50d4a052..2de4812d 100644
--- a/components/file-upload/file-drop.ts
+++ b/components/file-upload/file-drop.ts
@@ -1,4 +1,4 @@
-import { Directive, EventEmitter, ElementRef } from 'angular2/core';
+import { Directive, EventEmitter, ElementRef } from '@angular/core';
 
 import { FileUploader } from './file-uploader';
 
diff --git a/components/file-upload/file-select.ts b/components/file-upload/file-select.ts
index 66ca2292..0fb75de0 100644
--- a/components/file-upload/file-select.ts
+++ b/components/file-upload/file-select.ts
@@ -1,4 +1,4 @@
-import { Directive, ElementRef } from 'angular2/core';
+import { Directive, ElementRef } from '@angular/core';
 
 import {FileUploader} from './file-uploader';
 
diff --git a/demo/components/file-upload-section.ts b/demo/components/file-upload-section.ts
index 81a2c497..5c3fe76b 100644
--- a/demo/components/file-upload-section.ts
+++ b/demo/components/file-upload-section.ts
@@ -1,7 +1,7 @@
 /// <reference path="../../tsd.d.ts" />
 
-import {Component, View} from 'angular2/core';
-import {CORE_DIRECTIVES} from 'angular2/common';
+import {Component} from '@angular/core';
+import {CORE_DIRECTIVES} from '@angular/common';
 
 import {TAB_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap';
 import {SimpleDemo} from './file-upload/simple-demo';
diff --git a/demo/components/file-upload/simple-demo.html b/demo/components/file-upload/simple-demo.html
index 135f1e28..f59cb7a6 100644
--- a/demo/components/file-upload/simple-demo.html
+++ b/demo/components/file-upload/simple-demo.html
@@ -59,7 +59,7 @@ <h3>Upload queue</h3>
                 </tr>
                 </thead>
                 <tbody>
-                <tr *ngFor="#item of uploader.queue">
+                <tr *ngFor="let item of uploader.queue">
                     <td><strong>{{ item?.file?.name }}</strong></td>
                     <td *ngIf="uploader.isHTML5" nowrap>{{ item?.file?.size/1024/1024 | number:'.2' }} MB</td>
                     <td *ngIf="uploader.isHTML5">
diff --git a/demo/components/file-upload/simple-demo.ts b/demo/components/file-upload/simple-demo.ts
index cddc0433..3d031c5f 100644
--- a/demo/components/file-upload/simple-demo.ts
+++ b/demo/components/file-upload/simple-demo.ts
@@ -1,7 +1,7 @@
 /// <reference path="../../../tsd.d.ts" />
 
-import {Component} from 'angular2/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from 'angular2/common';
+import {Component} from '@angular/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from '@angular/common';
 import {FILE_UPLOAD_DIRECTIVES, FileUploader} from '../../../ng2-file-upload';
 
 // webpack html imports
diff --git a/demo/index.ts b/demo/index.ts
index 3a70956a..6de7dee0 100644
--- a/demo/index.ts
+++ b/demo/index.ts
@@ -1,16 +1,14 @@
 /// <reference path="../tsd.d.ts" />
-import {bootstrap} from 'angular2/platform/browser';
-import {Component, View} from 'angular2/core';
-import {NgClass} from 'angular2/common';
+import {bootstrap} from '@angular/platform-browser-dynamic';
+import {Component} from '@angular/core';
+import {NgClass} from '@angular/common';
 
 import {FileUploadSection} from './components/file-upload-section';
 
 let gettingStarted = require('./getting-started.md');
 
 @Component({
-  selector: 'app'
-})
-@View({
+  selector: 'app',
   template: `
   <main class="bd-pageheader">
     <div class="container">
diff --git a/package.json b/package.json
index ab9a2317..5fcfa7a4 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "angular2 file upload directives",
   "scripts": {
     "deploy": "NODE_ENV=production webpack -p --progress --color --optimize-minimize --optimize-dedupe --optimize-occurence-order",
-    "prepublish": "gulp clean && tsc",
+    "prepublish": "gulp clean && ./node_modules/.bin/typings install && tsc",
     "server": "webpack-dev-server --hot --inline --colors --display-error-details --display-cached",
     "start": "npm run server",
     "test": "gulp lint"
@@ -27,16 +27,23 @@
     "url": "https://github.com/valor-software/ng2-file-upload/issues"
   },
   "homepage": "https://github.com/valor-software/ng2-file-upload#readme",
-  "dependencies": {},
+  "dependencies": {
+  },
+  "peerDependencies": {
+    "@angular/common": "^2.0.0-rc.1",
+    "@angular/core": "^2.0.0-rc.1"
+  },
   "devDependencies": {
-    "angular2": "2.0.0-beta.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.0",
-    "zone.js": "0.6.10",
-    "es6-shim": "0.33.13",
+    "@angular/common": "^2.0.0-rc.1",
+    "@angular/compiler": "^2.0.0-rc.1",
+    "@angular/core": "^2.0.0-rc.1",
+    "@angular/platform-browser": "^2.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "^2.0.0-rc.1",
     "bootstrap": "3.3.6",
-    "clean-webpack-plugin": "0.1.8",
+    "clean-webpack-plugin": "0.1.9",
     "compression-webpack-plugin": "0.3.1",
+    "es6-promise": "^3.1.2",
+    "es6-shim": "^0.35.0",
     "eslint": "1.10.3",
     "exports-loader": "0.6.3",
     "file-loader": "0.8.5",
@@ -44,23 +51,27 @@
     "gulp-clean": "0.3.2",
     "gulp-eslint": "1.1.1",
     "gulp-size": "2.1.0",
-    "gulp-tsc": "1.1.4",
-    "gulp-tslint": "4.3.5",
+    "gulp-tsc": "1.1.5",
+    "gulp-tslint": "5.0.0",
     "html-loader": "0.4.3",
     "markdown-loader": "0.1.7",
     "marked": "0.3.5",
-    "moment": "2.11.2",
-    "ng2-bootstrap": "1.0.11",
+    "moment": "2.13.0",
+    "ng2-bootstrap": "1.0.16",
     "pre-commit": "1.1.2",
     "prismjs": "valorkin/prism",
     "prismjs-loader": "0.0.2",
     "raw-loader": "0.5.1",
+    "reflect-metadata": "0.1.2",
     "require-dir": "0.3.0",
+    "rxjs": "5.0.0-beta.6",
     "ts-loader": "0.8.2",
-    "tslint": "3.7.1",
-    "typescript": "1.8.9",
-    "webpack": "1.12.15",
-    "webpack-dev-server": "1.14.0"
+    "tslint": "3.9.0",
+    "typescript": "1.8.10",
+    "typings": "^0.8.1",
+    "webpack": "1.13.0",
+    "webpack-dev-server": "1.14.1",
+    "zone.js": "^0.6.12"
   },
   "contributors": [
     {
diff --git a/tsconfig.json b/tsconfig.json
index f3203937..69720d0a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,21 +1,22 @@
 {
-  "version": "1.7.5",
   "compilerOptions": {
     "target": "es5",
     "module": "commonjs",
-    "sourceMap": true,
+    "moduleResolution": "node",
+    "sourceMap": false,
     "declaration": true,
-    "removeComments": true,
+    "removeComments": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "noImplicitAny": true,
     "listFiles": false,
-    "noLib": false,
-    "noImplicitAny": true
+    "noLib": false
   },
   "exclude": [
     "node_modules"
   ],
   "files": [
-    "ng2-file-upload.ts"
+    "./typings/browser.d.ts",
+    "./ng2-file-upload.ts"
   ]
-}
+}
\ No newline at end of file
diff --git a/typings.json b/typings.json
new file mode 100644
index 00000000..8279f82a
--- /dev/null
+++ b/typings.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "webpack": "registry:npm/webpack#1.12.9+20160219013405"
+  },
+  "devDependencies": {},
+  "ambientDependencies": {
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"
+  }
+}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index b98b7c18..8ee6d46c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -48,10 +48,12 @@ var config = {
   entry: {
     angular2: [
       // Angular 2 Deps
-      'zone.js/dist/zone-microtask',
+      'es6-shim',
+      'es6-promise',
+      'zone.js',
       'reflect-metadata',
-      'angular2/common',
-      'angular2/core'
+      '@angular/common',
+      '@angular/core'
     ],
     'angular2-file-upload': ['ng2-file-upload'],
     'angular2-file-upload-demo': 'demo'