diff --git a/.gitignore b/.gitignore
index 626bb45..258069b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ npm-debug.log
 
 # compiled output
 typings/
+angular2-websocket.js
+angular2-websocket.js.map
diff --git a/angular2-websocket.js b/angular2-websocket.js
deleted file mode 100644
index af17fbf..0000000
--- a/angular2-websocket.js
+++ /dev/null
@@ -1,229 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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 core_1 = require('@angular/core');
-var Observable_1 = require('rxjs/Observable');
-var Subject_1 = require('rxjs/Subject');
-var $WebSocket = (function () {
-    function $WebSocket(url, protocols, config) {
-        this.url = url;
-        this.protocols = protocols;
-        this.config = config;
-        this.reconnectAttempts = 0;
-        this.sendQueue = [];
-        this.onOpenCallbacks = [];
-        this.onMessageCallbacks = [];
-        this.onErrorCallbacks = [];
-        this.onCloseCallbacks = [];
-        this.readyStateConstants = {
-            'CONNECTING': 0,
-            'OPEN': 1,
-            'CLOSING': 2,
-            'CLOSED': 3,
-            'RECONNECT_ABORTED': 4
-        };
-        this.normalCloseCode = 1000;
-        this.reconnectableStatusCodes = [4000];
-        var match = new RegExp('wss?:\/\/').test(url);
-        if (!match) {
-            throw new Error('Invalid url provided');
-        }
-        this.config = config || { initialTimeout: 500, maxTimeout: 300000, reconnectIfNotNormalClose: false };
-        this.dataStream = new Subject_1.Subject();
-    }
-    $WebSocket.prototype.connect = function (force) {
-        var _this = this;
-        if (force === void 0) { force = false; }
-        var self = this;
-        if (force || !this.socket || this.socket.readyState !== this.readyStateConstants.OPEN) {
-            self.socket = this.protocols ? new WebSocket(this.url, this.protocols) : new WebSocket(this.url);
-            self.socket.onopen = function (ev) {
-                //    console.log('onOpen: %s', ev);
-                _this.onOpenHandler(ev);
-            };
-            self.socket.onmessage = function (ev) {
-                //   console.log('onNext: %s', ev.data);
-                self.onMessageHandler(ev);
-                _this.dataStream.next(ev);
-            };
-            this.socket.onclose = function (ev) {
-                //     console.log('onClose, completed');
-                self.onCloseHandler(ev);
-            };
-            this.socket.onerror = function (ev) {
-                //    console.log('onError', ev);
-                self.onErrorHandler(ev);
-                _this.dataStream.error(ev);
-            };
-        }
-    };
-    $WebSocket.prototype.send = function (data) {
-        var self = this;
-        if (this.getReadyState() !== this.readyStateConstants.OPEN
-            && this.getReadyState() !== this.readyStateConstants.CONNECTING) {
-            this.connect();
-        }
-        return Observable_1.Observable.create(function (observer) {
-            if (self.socket.readyState === self.readyStateConstants.RECONNECT_ABORTED) {
-                observer.next('Socket connection has been closed');
-            }
-            else {
-                self.sendQueue.push({ message: data });
-                self.fireQueue();
-            }
-        });
-    };
-    ;
-    $WebSocket.prototype.getDataStream = function () {
-        return this.dataStream;
-    };
-    $WebSocket.prototype.onOpenHandler = function (event) {
-        this.reconnectAttempts = 0;
-        this.notifyOpenCallbacks(event);
-        this.fireQueue();
-    };
-    ;
-    $WebSocket.prototype.notifyOpenCallbacks = function (event) {
-        for (var i = 0; i < this.onOpenCallbacks.length; i++) {
-            this.onOpenCallbacks[i].call(this, event);
-        }
-    };
-    $WebSocket.prototype.fireQueue = function () {
-        while (this.sendQueue.length && this.socket.readyState === this.readyStateConstants.OPEN) {
-            var data = this.sendQueue.shift();
-            this.socket.send($WebSocket.Helpers.isString(data.message) ? data.message : JSON.stringify(data.message));
-        }
-    };
-    $WebSocket.prototype.notifyCloseCallbacks = function (event) {
-        for (var i = 0; i < this.onCloseCallbacks.length; i++) {
-            this.onCloseCallbacks[i].call(this, event);
-        }
-    };
-    $WebSocket.prototype.notifyErrorCallbacks = function (event) {
-        for (var i = 0; i < this.onErrorCallbacks.length; i++) {
-            this.onErrorCallbacks[i].call(this, event);
-        }
-    };
-    $WebSocket.prototype.onOpen = function (cb) {
-        this.onOpenCallbacks.push(cb);
-        return this;
-    };
-    ;
-    $WebSocket.prototype.onClose = function (cb) {
-        this.onCloseCallbacks.push(cb);
-        return this;
-    };
-    $WebSocket.prototype.onError = function (cb) {
-        this.onErrorCallbacks.push(cb);
-        return this;
-    };
-    ;
-    $WebSocket.prototype.onMessage = function (callback, options) {
-        if (!$WebSocket.Helpers.isFunction(callback)) {
-            throw new Error('Callback must be a function');
-        }
-        this.onMessageCallbacks.push({
-            fn: callback,
-            pattern: options ? options.filter : undefined,
-            autoApply: options ? options.autoApply : true
-        });
-        return this;
-    };
-    $WebSocket.prototype.onMessageHandler = function (message) {
-        var self = this;
-        var currentCallback;
-        for (var i = 0; i < self.onMessageCallbacks.length; i++) {
-            currentCallback = self.onMessageCallbacks[i];
-            currentCallback.fn.apply(self, [message]);
-        }
-    };
-    ;
-    $WebSocket.prototype.onCloseHandler = function (event) {
-        this.notifyCloseCallbacks(event);
-        if ((this.config.reconnectIfNotNormalClose && event.code !== this.normalCloseCode)
-            || this.reconnectableStatusCodes.indexOf(event.code) > -1) {
-            this.reconnect();
-        }
-        else {
-            this.dataStream.complete();
-        }
-    };
-    ;
-    $WebSocket.prototype.onErrorHandler = function (event) {
-        this.notifyErrorCallbacks(event);
-    };
-    ;
-    $WebSocket.prototype.reconnect = function () {
-        this.close(true);
-        var backoffDelay = this.getBackoffDelay(++this.reconnectAttempts);
-        // let backoffDelaySeconds = backoffDelay / 1000;
-        // console.log('Reconnecting in ' + backoffDelaySeconds + ' seconds');
-        setTimeout(this.connect(), backoffDelay);
-        return this;
-    };
-    $WebSocket.prototype.close = function (force) {
-        if (force || !this.socket.bufferedAmount) {
-            this.socket.close();
-        }
-        return this;
-    };
-    ;
-    // Exponential Backoff Formula by Prof. Douglas Thain
-    // http://dthain.blogspot.co.uk/2009/02/exponential-backoff-in-distributed.html
-    $WebSocket.prototype.getBackoffDelay = function (attempt) {
-        var R = Math.random() + 1;
-        var T = this.config.initialTimeout;
-        var F = 2;
-        var N = attempt;
-        var M = this.config.maxTimeout;
-        return Math.floor(Math.min(R * T * Math.pow(F, N), M));
-    };
-    ;
-    $WebSocket.prototype.setInternalState = function (state) {
-        if (Math.floor(state) !== state || state < 0 || state > 4) {
-            throw new Error('state must be an integer between 0 and 4, got: ' + state);
-        }
-        this.internalConnectionState = state;
-    };
-    /**
-     * Could be -1 if not initzialized yet
-     * @returns {number}
-     */
-    $WebSocket.prototype.getReadyState = function () {
-        if (this.socket == null) {
-            return -1;
-        }
-        return this.internalConnectionState || this.socket.readyState;
-    };
-    $WebSocket.Helpers = (function () {
-        function class_1() {
-        }
-        class_1.isPresent = function (obj) {
-            return obj !== undefined && obj !== null;
-        };
-        class_1.isString = function (obj) {
-            return typeof obj === 'string';
-        };
-        class_1.isArray = function (obj) {
-            return Array.isArray(obj);
-        };
-        class_1.isFunction = function (obj) {
-            return typeof obj === 'function';
-        };
-        return class_1;
-    }());
-    $WebSocket = __decorate([
-        core_1.Injectable(), 
-        __metadata('design:paramtypes', [String, Array, Object])
-    ], $WebSocket);
-    return $WebSocket;
-}());
-exports.$WebSocket = $WebSocket;
-//# sourceMappingURL=angular2-websocket.js.map
\ No newline at end of file
diff --git a/angular2-websocket.js.map b/angular2-websocket.js.map
deleted file mode 100644
index 32cf45c..0000000
--- a/angular2-websocket.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"angular2-websocket.js","sourceRoot":"","sources":["src/angular2-websocket.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,qBAAyB,eAAe,CAAC,CAAA;AACzC,2BAAyB,iBAAiB,CAAC,CAAA;AAC3C,wBAAsB,cAAc,CAAC,CAAA;AAIrC;IAsCI,oBAAoB,GAAW,EAAU,SAAyB,EAAU,MAAwB;QAAhF,QAAG,GAAH,GAAG,CAAQ;QAAU,cAAS,GAAT,SAAS,CAAgB;QAAU,WAAM,GAAN,MAAM,CAAkB;QAlB5F,sBAAiB,GAAG,CAAC,CAAC;QACtB,cAAS,GAAG,EAAE,CAAC;QACf,oBAAe,GAAG,EAAE,CAAC;QACrB,uBAAkB,GAAG,EAAE,CAAC;QACxB,qBAAgB,GAAG,EAAE,CAAC;QACtB,qBAAgB,GAAG,EAAE,CAAC;QACtB,wBAAmB,GAAG;YAC1B,YAAY,EAAE,CAAC;YACf,MAAM,EAAE,CAAC;YACT,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,CAAC;YACX,mBAAmB,EAAE,CAAC;SACzB,CAAC;QACM,oBAAe,GAAG,IAAI,CAAC;QACvB,6BAAwB,GAAG,CAAC,IAAI,CAAC,CAAC;QAKtC,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,yBAAyB,EAAE,KAAK,EAAE,CAAC;QACtG,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAO,EAAE,CAAC;IACpC,CAAC;IAED,4BAAO,GAAP,UAAQ,KAAa;QAArB,iBA0BC;QA1BO,qBAAa,GAAb,aAAa;QACjB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;YACpF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEjG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,UAAC,EAAS;gBAC3B,oCAAoC;gBACpC,KAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,UAAC,EAAgB;gBACrC,wCAAwC;gBACxC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;gBAC1B,KAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC7B,CAAC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,UAAC,EAAc;gBACjC,yCAAyC;gBACzC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAC5B,CAAC,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,UAAC,EAAc;gBACjC,iCAAiC;gBACjC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;gBACxB,KAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC9B,CAAC,CAAC;QAEN,CAAC;IACL,CAAC;IACD,yBAAI,GAAJ,UAAK,IAAI;QACL,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,IAAI,CAAC,mBAAmB,CAAC,IAAI;eAC/C,IAAI,CAAC,aAAa,EAAE,KAAK,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;QACD,MAAM,CAAC,uBAAU,CAAC,MAAM,CAAC,UAAC,QAAQ;YAC9B,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBACxE,QAAQ,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;;IAED,kCAAa,GAAb;QACI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,kCAAa,GAAb,UAAc,KAAY;QACtB,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;;IACD,wCAAmB,GAAnB,UAAoB,KAAK;QACrB,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;IACD,8BAAS,GAAT;QACI,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YACvF,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YAElC,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAC1F,CAAC;QAEN,CAAC;IACL,CAAC;IAED,yCAAoB,GAApB,UAAqB,KAAK;QACtB,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAED,yCAAoB,GAApB,UAAqB,KAAK;QACtB,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAED,2BAAM,GAAN,UAAO,EAAE;QACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;;IAED,4BAAO,GAAP,UAAQ,EAAE;QACN,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IAED,4BAAO,GAAP,UAAQ,EAAE;QACN,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;;IAGD,8BAAS,GAAT,UAAU,QAAQ,EAAE,OAAO;QACvB,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;YACzB,EAAE,EAAE,QAAQ;YACZ,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS;YAC7C,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI;SAChD,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IAED,qCAAgB,GAAhB,UAAiB,OAAqB;QAClC,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,eAAe,CAAC;QACpB,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtD,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAC7C,eAAe,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;;IACD,mCAAc,GAAd,UAAe,KAAiB;QAC5B,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,yBAAyB,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,eAAe,CAAC;eACvE,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;;IAED,mCAAc,GAAd,UAAe,KAAK;QAChB,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;;IAMD,8BAAS,GAAT;QACI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAClE,iDAAiD;QACjD,sEAAsE;QACtE,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IAED,0BAAK,GAAL,UAAM,KAAc;QAChB,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;;IACD,qDAAqD;IACrD,+EAA+E;IAC/E,oCAAe,GAAf,UAAgB,OAAO;QACnB,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,CAAC,GAAG,OAAO,CAAC;QAChB,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAE/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;;IAED,qCAAgB,GAAhB,UAAiB,KAAK;QAClB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,iDAAiD,GAAG,KAAK,CAAC,CAAC;QAC/E,CAAC;QAED,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAC;IAEzC,CAAC;IAED;;;OAGG;IACH,kCAAa,GAAb;QACI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC;YACtB,MAAM,CAAC,CAAC,CAAC,CAAC;QACd,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IAClE,CAAC;IAjOc,kBAAO,GAAG;QAAA;QAgBzB,CAAC;QAfU,iBAAS,GAAhB,UAAiB,GAAQ;YACrB,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,CAAC;QAC7C,CAAC;QAEM,gBAAQ,GAAf,UAAgB,GAAQ;YACpB,MAAM,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC;QACnC,CAAC;QAEM,eAAO,GAAd,UAAe,GAAQ;YACnB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QAEM,kBAAU,GAAjB,UAAkB,GAAQ;YACtB,MAAM,CAAC,OAAO,GAAG,KAAK,UAAU,CAAC;QACrC,CAAC;QACL,cAAC;IAAD,CAAC,AAhBwB,GAgBxB,CAAC;IAnBN;QAAC,iBAAU,EAAE;;kBAAA;IAqOb,iBAAC;AAAD,CAAC,AApOD,IAoOC;AApOY,kBAAU,aAoOtB,CAAA"}
\ No newline at end of file
diff --git a/package.json b/package.json
index 37427f9..bed645f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular2-websocket",
   "main": "angular2-websocket",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "compile": "tsc",
@@ -13,13 +13,13 @@
     "url": "git+https://github.com/afrad/angular2-websocket.git"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.4",
-    "@angular/compiler": "2.0.0-rc.4",
-    "@angular/core": "2.0.0-rc.4",
+    "@angular/common": "2.0.0",
+    "@angular/compiler": "2.0.0",
+    "@angular/core": "2.0.0",
     "core-js": "^2.4.1",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12"
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.23"
   },
   "devDependencies": {
     "codelyzer": "~0.0.26",
@@ -28,6 +28,6 @@
     "grunt-contrib-uglify": "~0.2.4",
     "tslint": "3.13.0",
     "typings": "^1.3.2",
-    "typescript": "^1.8.10"
+    "typescript": "^2.0.2"
   }
 }
diff --git a/typings.json b/typings.json
index fa99428..96ff2be 100644
--- a/typings.json
+++ b/typings.json
@@ -1,5 +1,5 @@
 {
   "globalDependencies": {
-    "core-js": "registry:dt/core-js#0.0.0+20160602141332"
+    "core-js": "registry:dt/core-js#0.0.0+20160914114559"
   }
 }