diff --git a/bundles/ng2-toasty.js b/bundles/ng2-toasty.js
index fc5988f..68fe20e 100644
--- a/bundles/ng2-toasty.js
+++ b/bundles/ng2-toasty.js
@@ -1,4 +1,5 @@
-System.registerDynamic("src/toasty.container", ["@angular/core", "@angular/common", "lodash", "./toasty.config", "./toasty.service", "./toasty.component"], true, function($__require, exports, module) {
+System.registerDynamic("src/toasty.container", ["@angular/core", "@angular/common", "@angular/common/src/facade/lang", "./toasty.config", "./toasty.service", "./toasty.component"], true, function($__require, exports, module) {
+  "use strict";
   ;
   var define,
       global = this,
@@ -21,7 +22,7 @@ System.registerDynamic("src/toasty.container", ["@angular/core", "@angular/commo
   };
   var core_1 = $__require('@angular/core');
   var common_1 = $__require('@angular/common');
-  var lodash_1 = $__require('lodash');
+  var lang_1 = $__require('@angular/common/src/facade/lang');
   var toasty_config_1 = $__require('./toasty.config');
   var toasty_service_1 = $__require('./toasty.service');
   var toasty_component_1 = $__require('./toasty.component');
@@ -69,7 +70,7 @@ System.registerDynamic("src/toasty.container", ["@angular/core", "@angular/commo
       if (id) {
         this.toasts.forEach(function(value, key) {
           if (value.id === id) {
-            if (value.onRemove && lodash_1.isFunction(value.onRemove))
+            if (value.onRemove && lang_1.isFunction(value.onRemove))
               value.onRemove.call(_this, value);
             _this.toasts.splice(key, 1);
           }
@@ -81,7 +82,7 @@ System.registerDynamic("src/toasty.container", ["@angular/core", "@angular/commo
     Toasty.prototype.clearAll = function() {
       var _this = this;
       this.toasts.forEach(function(value, key) {
-        if (value.onRemove && lodash_1.isFunction(value.onRemove))
+        if (value.onRemove && lang_1.isFunction(value.onRemove))
           value.onRemove.call(_this, value);
       });
       this.toasts = [];
@@ -102,12 +103,13 @@ System.registerDynamic("src/toasty.container", ["@angular/core", "@angular/commo
       template: "\n    <div id=\"toasty\" [ngClass]=\"[position]\">\n        <ng2-toast *ngFor=\"let toast of toasts\" [toast]=\"toast\" (closeToast)=\"closeToast(toast)\"></ng2-toast>\n    </div>"
     }), __metadata('design:paramtypes', [toasty_config_1.ToastyConfig, toasty_service_1.ToastyService])], Toasty);
     return Toasty;
-  })();
+  }());
   exports.Toasty = Toasty;
   return module.exports;
 });
 
 System.registerDynamic("src/toasty.component", ["@angular/core", "@angular/common"], true, function($__require, exports, module) {
+  "use strict";
   ;
   var define,
       global = this,
@@ -146,12 +148,13 @@ System.registerDynamic("src/toasty.component", ["@angular/core", "@angular/commo
       template: "\n        <div class=\"toast\" [ngClass]=\"[toast.type, toast.theme]\">\n            <div *ngIf=\"toast.showClose\" class=\"close-button\" (click)=\"close($event)\"></div>\n            <div *ngIf=\"toast.title || toast.msg\" class=\"toast-text\">\n                <span *ngIf=\"toast.title\" class=\"toast-title\">{{toast.title}}</span>\n                <br *ngIf=\"toast.title && toast.msg\" />\n                <span *ngIf=\"toast.msg\" class=\"toast-msg\">{{toast.msg}}</span>\n            </div>\n        </div>"
     }), __metadata('design:paramtypes', [])], Toast);
     return Toast;
-  })();
+  }());
   exports.Toast = Toast;
   return module.exports;
 });
 
 System.registerDynamic("src/toasty.config", ["@angular/core"], true, function($__require, exports, module) {
+  "use strict";
   ;
   var define,
       global = this,
@@ -183,12 +186,13 @@ System.registerDynamic("src/toasty.config", ["@angular/core"], true, function($_
     }
     ToastyConfig = __decorate([core_1.Injectable(), __metadata('design:paramtypes', [])], ToastyConfig);
     return ToastyConfig;
-  })();
+  }());
   exports.ToastyConfig = ToastyConfig;
   return module.exports;
 });
 
-System.registerDynamic("src/toasty.service", ["@angular/core", "lodash", "rxjs/Observable", "./toasty.config"], true, function($__require, exports, module) {
+System.registerDynamic("src/toasty.service", ["@angular/core", "@angular/common/src/facade/lang", "rxjs/Observable", "./toasty.config"], true, function($__require, exports, module) {
+  "use strict";
   ;
   var define,
       global = this,
@@ -210,7 +214,7 @@ System.registerDynamic("src/toasty.service", ["@angular/core", "lodash", "rxjs/O
       return Reflect.metadata(k, v);
   };
   var core_1 = $__require('@angular/core');
-  var lodash_1 = $__require('lodash');
+  var lang_1 = $__require('@angular/common/src/facade/lang');
   var Observable_1 = $__require('rxjs/Observable');
   var toasty_config_1 = $__require('./toasty.config');
   var ToastyService = (function() {
@@ -251,7 +255,7 @@ System.registerDynamic("src/toasty.service", ["@angular/core", "lodash", "rxjs/O
     };
     ToastyService.prototype.add = function(options, type) {
       var toastyOptions;
-      if (lodash_1.isString(options) && options !== '' || lodash_1.isNumber(options)) {
+      if (lang_1.isString(options) && options !== '' || lang_1.isNumber(options)) {
         toastyOptions = {title: options.toString()};
       } else {
         toastyOptions = options;
@@ -275,8 +279,8 @@ System.registerDynamic("src/toasty.service", ["@angular/core", "lodash", "rxjs/O
         showClose: showClose,
         type: 'toasty-type-' + type,
         theme: 'toasty-theme-' + theme,
-        onAdd: toastyOptions.onAdd && lodash_1.isFunction(toastyOptions.onAdd) ? toastyOptions.onAdd : null,
-        onRemove: toastyOptions.onRemove && lodash_1.isFunction(toastyOptions.onRemove) ? toastyOptions.onRemove : null
+        onAdd: toastyOptions.onAdd && lang_1.isFunction(toastyOptions.onAdd) ? toastyOptions.onAdd : null,
+        onRemove: toastyOptions.onRemove && lang_1.isFunction(toastyOptions.onRemove) ? toastyOptions.onRemove : null
       };
       if (toastyOptions.timeout) {
         toast.timeout = toastyOptions.timeout || this.config.timeout;
@@ -285,7 +289,7 @@ System.registerDynamic("src/toasty.service", ["@angular/core", "lodash", "rxjs/O
       }
       try {
         this.toastsSubscriber.next(toast);
-        if (toastyOptions.onAdd && lodash_1.isFunction(toastyOptions.onAdd)) {
+        if (toastyOptions.onAdd && lang_1.isFunction(toastyOptions.onAdd)) {
           toastyOptions.onAdd.call(this, toast);
         }
       } catch (e) {
@@ -308,7 +312,7 @@ System.registerDynamic("src/toasty.service", ["@angular/core", "lodash", "rxjs/O
     ToastyService.THEMES = ['default', 'material', 'bootstrap'];
     ToastyService = __decorate([core_1.Injectable(), __metadata('design:paramtypes', [toasty_config_1.ToastyConfig])], ToastyService);
     return ToastyService;
-  })();
+  }());
   exports.ToastyService = ToastyService;
   return module.exports;
 });
diff --git a/bundles/ng2-toasty.min.js b/bundles/ng2-toasty.min.js
index 6b9f110..cf0a7a1 100644
--- a/bundles/ng2-toasty.min.js
+++ b/bundles/ng2-toasty.min.js
@@ -1,2 +1,2 @@
-System.registerDynamic("src/toasty.container",["@angular/core","@angular/common","lodash","./toasty.config","./toasty.service","./toasty.component"],!0,function(t,e,o){var s=this&&this.__decorate||function(t,e,o,s){var n,i=arguments.length,a=3>i?e:null===s?s=Object.getOwnPropertyDescriptor(e,o):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,s);else for(var r=t.length-1;r>=0;r--)(n=t[r])&&(a=(3>i?n(a):i>3?n(e,o,a):n(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},n=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=t("@angular/common"),r=t("lodash"),c=t("./toasty.config"),l=t("./toasty.service"),f=t("./toasty.component"),u=function(){function t(t,e){this.config=t,this.toastyService=e,this.toasts=[]}return t.prototype.ngOnInit=function(){var e=this;if(this.toastyService.getToasts().subscribe(function(t){e.toasts.length>=e.config.limit&&e.toasts.shift(),e.toasts.push(t),t.timeout&&e._setTimeout(t)}),this.toastyService.getClear().subscribe(function(){e.clearAll()}),this.position){for(var o=!0,s=0;s<t.POSITIONS.length;s++)if(t.POSITIONS[s]===this.position){o=!1;break}o&&(this.position=this.config.position)}else this.position=this.config.position;this.position="toasty-position-"+this.position},t.prototype.closeToast=function(t){this.clear(t.id)},t.prototype.clear=function(t){var e=this;if(!t)throw new Error("Please provide id of Toast to close");this.toasts.forEach(function(o,s){o.id===t&&(o.onRemove&&r.isFunction(o.onRemove)&&o.onRemove.call(e,o),e.toasts.splice(s,1))})},t.prototype.clearAll=function(){var t=this;this.toasts.forEach(function(e,o){e.onRemove&&r.isFunction(e.onRemove)&&e.onRemove.call(t,e)}),this.toasts=[]},t.prototype._setTimeout=function(t){var e=this;window.setTimeout(function(){console.log("clear",t.id),e.clear(t.id)},t.timeout)},t.POSITIONS=["bottom-right","bottom-left","top-right","top-left","top-center","bottom-center"],s([i.Input(),n("design:type",String)],t.prototype,"position",void 0),t=s([i.Component({selector:"ng2-toasty",encapsulation:i.ViewEncapsulation.None,directives:[a.CORE_DIRECTIVES,f.Toast],template:'\n    <div id="toasty" [ngClass]="[position]">\n        <ng2-toast *ngFor="let toast of toasts" [toast]="toast" (closeToast)="closeToast(toast)"></ng2-toast>\n    </div>'}),n("design:paramtypes",[c.ToastyConfig,l.ToastyService])],t)}();return e.Toasty=u,o.exports}),System.registerDynamic("src/toasty.component",["@angular/core","@angular/common"],!0,function(t,e,o){var s=this&&this.__decorate||function(t,e,o,s){var n,i=arguments.length,a=3>i?e:null===s?s=Object.getOwnPropertyDescriptor(e,o):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,s);else for(var r=t.length-1;r>=0;r--)(n=t[r])&&(a=(3>i?n(a):i>3?n(e,o,a):n(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},n=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=t("@angular/common"),r=function(){function t(){this.closeToastEvent=new i.EventEmitter}return t.prototype.close=function(t){t.preventDefault(),this.closeToastEvent.next(this.toast)},s([i.Input(),n("design:type",Object)],t.prototype,"toast",void 0),s([i.Output("closeToast"),n("design:type",Object)],t.prototype,"closeToastEvent",void 0),t=s([i.Component({selector:"ng2-toast",directives:[a.CORE_DIRECTIVES],template:'\n        <div class="toast" [ngClass]="[toast.type, toast.theme]">\n            <div *ngIf="toast.showClose" class="close-button" (click)="close($event)"></div>\n            <div *ngIf="toast.title || toast.msg" class="toast-text">\n                <span *ngIf="toast.title" class="toast-title">{{toast.title}}</span>\n                <br *ngIf="toast.title && toast.msg" />\n                <span *ngIf="toast.msg" class="toast-msg">{{toast.msg}}</span>\n            </div>\n        </div>'}),n("design:paramtypes",[])],t)}();return e.Toast=r,o.exports}),System.registerDynamic("src/toasty.config",["@angular/core"],!0,function(t,e,o){var s=this&&this.__decorate||function(t,e,o,s){var n,i=arguments.length,a=3>i?e:null===s?s=Object.getOwnPropertyDescriptor(e,o):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,s);else for(var r=t.length-1;r>=0;r--)(n=t[r])&&(a=(3>i?n(a):i>3?n(e,o,a):n(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},n=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=function(){function t(){this.limit=5,this.showClose=!0,this.position="bottom-right",this.timeout=5e3,this.theme="default"}return t=s([i.Injectable(),n("design:paramtypes",[])],t)}();return e.ToastyConfig=a,o.exports}),System.registerDynamic("src/toasty.service",["@angular/core","lodash","rxjs/Observable","./toasty.config"],!0,function(t,e,o){var s=this&&this.__decorate||function(t,e,o,s){var n,i=arguments.length,a=3>i?e:null===s?s=Object.getOwnPropertyDescriptor(e,o):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,s);else for(var r=t.length-1;r>=0;r--)(n=t[r])&&(a=(3>i?n(a):i>3?n(e,o,a):n(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},n=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=t("lodash"),r=t("rxjs/Observable"),c=t("./toasty.config"),l=function(){function t(t){var e=this;this.config=t,this.uniqueCounter=0,this.toastsObservable=new r.Observable(function(t){e.toastsSubscriber=t}),this.clearObservable=new r.Observable(function(t){e.clearSubscriber=t})}return t.prototype.getToasts=function(){return this.toastsObservable},t.prototype.getClear=function(){return this.clearObservable},t.prototype["default"]=function(t){this.add(t,"default")},t.prototype.info=function(t){this.add(t,"info")},t.prototype.success=function(t){this.add(t,"success")},t.prototype.wait=function(t){this.add(t,"wait")},t.prototype.error=function(t){this.add(t,"error")},t.prototype.warning=function(t){this.add(t,"warning")},t.prototype.add=function(e,o){var s;if(s=a.isString(e)&&""!==e||a.isNumber(e)?{title:e.toString()}:e,!s||!s.title&&!s.msg)throw new Error("ng2-toasty: No toast title or message specified!");o=o||"default",this.uniqueCounter++;var n,i=this._checkConfigItem(this.config,s,"showClose");n=s.theme&&t.THEMES.indexOf(s.theme)>-1?s.theme:this.config.theme;var r={id:this.uniqueCounter,title:s.title,msg:s.msg,showClose:i,type:"toasty-type-"+o,theme:"toasty-theme-"+n,onAdd:s.onAdd&&a.isFunction(s.onAdd)?s.onAdd:null,onRemove:s.onRemove&&a.isFunction(s.onRemove)?s.onRemove:null};s.timeout?r.timeout=s.timeout||this.config.timeout:r.timeout=null;try{this.toastsSubscriber.next(r),s.onAdd&&a.isFunction(s.onAdd)&&s.onAdd.call(this,r)}catch(c){console.log(c),console.log("!!! Suggestion: Seems you forget add <ng2-toasty></ng2-toasty> into your html?")}},t.prototype.clearAll=function(){this.clearSubscriber.next()},t.prototype._checkConfigItem=function(t,e,o){return e[o]===!1?!1:e[o]?!0:t[o]},t.THEMES=["default","material","bootstrap"],t=s([i.Injectable(),n("design:paramtypes",[c.ToastyConfig])],t)}();return e.ToastyService=l,o.exports}),System.registerDynamic("ng2-toasty",["./src/toasty.container","./src/toasty.component","./src/toasty.config","./src/toasty.service"],!0,function(t,e,o){"use strict";function s(t){for(var o in t)e.hasOwnProperty(o)||(e[o]=t[o])}var n=t("./src/toasty.container"),i=t("./src/toasty.component"),a=t("./src/toasty.config"),r=t("./src/toasty.service");return s(t("./src/toasty.container")),s(t("./src/toasty.component")),s(t("./src/toasty.config")),s(t("./src/toasty.service")),Object.defineProperty(e,"__esModule",{value:!0}),e["default"]={providers:[a.ToastyConfig,r.ToastyService],directives:[n.Toasty,i.Toast]},o.exports});
+System.registerDynamic("src/toasty.container",["@angular/core","@angular/common","@angular/common/src/facade/lang","./toasty.config","./toasty.service","./toasty.component"],!0,function(t,e,o){"use strict";var n=this&&this.__decorate||function(t,e,o,n){var s,i=arguments.length,a=3>i?e:null===n?n=Object.getOwnPropertyDescriptor(e,o):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,n);else for(var r=t.length-1;r>=0;r--)(s=t[r])&&(a=(3>i?s(a):i>3?s(e,o,a):s(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},s=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=t("@angular/common"),r=t("@angular/common/src/facade/lang"),c=t("./toasty.config"),l=t("./toasty.service"),f=t("./toasty.component"),u=function(){function t(t,e){this.config=t,this.toastyService=e,this.toasts=[]}return t.prototype.ngOnInit=function(){var e=this;if(this.toastyService.getToasts().subscribe(function(t){e.toasts.length>=e.config.limit&&e.toasts.shift(),e.toasts.push(t),t.timeout&&e._setTimeout(t)}),this.toastyService.getClear().subscribe(function(){e.clearAll()}),this.position){for(var o=!0,n=0;n<t.POSITIONS.length;n++)if(t.POSITIONS[n]===this.position){o=!1;break}o&&(this.position=this.config.position)}else this.position=this.config.position;this.position="toasty-position-"+this.position},t.prototype.closeToast=function(t){this.clear(t.id)},t.prototype.clear=function(t){var e=this;if(!t)throw new Error("Please provide id of Toast to close");this.toasts.forEach(function(o,n){o.id===t&&(o.onRemove&&r.isFunction(o.onRemove)&&o.onRemove.call(e,o),e.toasts.splice(n,1))})},t.prototype.clearAll=function(){var t=this;this.toasts.forEach(function(e,o){e.onRemove&&r.isFunction(e.onRemove)&&e.onRemove.call(t,e)}),this.toasts=[]},t.prototype._setTimeout=function(t){var e=this;window.setTimeout(function(){console.log("clear",t.id),e.clear(t.id)},t.timeout)},t.POSITIONS=["bottom-right","bottom-left","top-right","top-left","top-center","bottom-center"],n([i.Input(),s("design:type",String)],t.prototype,"position",void 0),t=n([i.Component({selector:"ng2-toasty",encapsulation:i.ViewEncapsulation.None,directives:[a.CORE_DIRECTIVES,f.Toast],template:'\n    <div id="toasty" [ngClass]="[position]">\n        <ng2-toast *ngFor="let toast of toasts" [toast]="toast" (closeToast)="closeToast(toast)"></ng2-toast>\n    </div>'}),s("design:paramtypes",[c.ToastyConfig,l.ToastyService])],t)}();return e.Toasty=u,o.exports}),System.registerDynamic("src/toasty.component",["@angular/core","@angular/common"],!0,function(t,e,o){"use strict";var n=this&&this.__decorate||function(t,e,o,n){var s,i=arguments.length,a=3>i?e:null===n?n=Object.getOwnPropertyDescriptor(e,o):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,n);else for(var r=t.length-1;r>=0;r--)(s=t[r])&&(a=(3>i?s(a):i>3?s(e,o,a):s(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},s=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=t("@angular/common"),r=function(){function t(){this.closeToastEvent=new i.EventEmitter}return t.prototype.close=function(t){t.preventDefault(),this.closeToastEvent.next(this.toast)},n([i.Input(),s("design:type",Object)],t.prototype,"toast",void 0),n([i.Output("closeToast"),s("design:type",Object)],t.prototype,"closeToastEvent",void 0),t=n([i.Component({selector:"ng2-toast",directives:[a.CORE_DIRECTIVES],template:'\n        <div class="toast" [ngClass]="[toast.type, toast.theme]">\n            <div *ngIf="toast.showClose" class="close-button" (click)="close($event)"></div>\n            <div *ngIf="toast.title || toast.msg" class="toast-text">\n                <span *ngIf="toast.title" class="toast-title">{{toast.title}}</span>\n                <br *ngIf="toast.title && toast.msg" />\n                <span *ngIf="toast.msg" class="toast-msg">{{toast.msg}}</span>\n            </div>\n        </div>'}),s("design:paramtypes",[])],t)}();return e.Toast=r,o.exports}),System.registerDynamic("src/toasty.config",["@angular/core"],!0,function(t,e,o){"use strict";var n=this&&this.__decorate||function(t,e,o,n){var s,i=arguments.length,a=3>i?e:null===n?n=Object.getOwnPropertyDescriptor(e,o):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,n);else for(var r=t.length-1;r>=0;r--)(s=t[r])&&(a=(3>i?s(a):i>3?s(e,o,a):s(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},s=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=function(){function t(){this.limit=5,this.showClose=!0,this.position="bottom-right",this.timeout=5e3,this.theme="default"}return t=n([i.Injectable(),s("design:paramtypes",[])],t)}();return e.ToastyConfig=a,o.exports}),System.registerDynamic("src/toasty.service",["@angular/core","@angular/common/src/facade/lang","rxjs/Observable","./toasty.config"],!0,function(t,e,o){"use strict";var n=this&&this.__decorate||function(t,e,o,n){var s,i=arguments.length,a=3>i?e:null===n?n=Object.getOwnPropertyDescriptor(e,o):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,o,n);else for(var r=t.length-1;r>=0;r--)(s=t[r])&&(a=(3>i?s(a):i>3?s(e,o,a):s(e,o))||a);return i>3&&a&&Object.defineProperty(e,o,a),a},s=this&&this.__metadata||function(t,e){return"object"==typeof Reflect&&"function"==typeof Reflect.metadata?Reflect.metadata(t,e):void 0},i=t("@angular/core"),a=t("@angular/common/src/facade/lang"),r=t("rxjs/Observable"),c=t("./toasty.config"),l=function(){function t(t){var e=this;this.config=t,this.uniqueCounter=0,this.toastsObservable=new r.Observable(function(t){e.toastsSubscriber=t}),this.clearObservable=new r.Observable(function(t){e.clearSubscriber=t})}return t.prototype.getToasts=function(){return this.toastsObservable},t.prototype.getClear=function(){return this.clearObservable},t.prototype["default"]=function(t){this.add(t,"default")},t.prototype.info=function(t){this.add(t,"info")},t.prototype.success=function(t){this.add(t,"success")},t.prototype.wait=function(t){this.add(t,"wait")},t.prototype.error=function(t){this.add(t,"error")},t.prototype.warning=function(t){this.add(t,"warning")},t.prototype.add=function(e,o){var n;if(n=a.isString(e)&&""!==e||a.isNumber(e)?{title:e.toString()}:e,!n||!n.title&&!n.msg)throw new Error("ng2-toasty: No toast title or message specified!");o=o||"default",this.uniqueCounter++;var s,i=this._checkConfigItem(this.config,n,"showClose");s=n.theme&&t.THEMES.indexOf(n.theme)>-1?n.theme:this.config.theme;var r={id:this.uniqueCounter,title:n.title,msg:n.msg,showClose:i,type:"toasty-type-"+o,theme:"toasty-theme-"+s,onAdd:n.onAdd&&a.isFunction(n.onAdd)?n.onAdd:null,onRemove:n.onRemove&&a.isFunction(n.onRemove)?n.onRemove:null};n.timeout?r.timeout=n.timeout||this.config.timeout:r.timeout=null;try{this.toastsSubscriber.next(r),n.onAdd&&a.isFunction(n.onAdd)&&n.onAdd.call(this,r)}catch(c){console.log(c),console.log("!!! Suggestion: Seems you forget add <ng2-toasty></ng2-toasty> into your html?")}},t.prototype.clearAll=function(){this.clearSubscriber.next()},t.prototype._checkConfigItem=function(t,e,o){return e[o]===!1?!1:e[o]?!0:t[o]},t.THEMES=["default","material","bootstrap"],t=n([i.Injectable(),s("design:paramtypes",[c.ToastyConfig])],t)}();return e.ToastyService=l,o.exports}),System.registerDynamic("ng2-toasty",["./src/toasty.container","./src/toasty.component","./src/toasty.config","./src/toasty.service"],!0,function(t,e,o){"use strict";function n(t){for(var o in t)e.hasOwnProperty(o)||(e[o]=t[o])}var s=t("./src/toasty.container"),i=t("./src/toasty.component"),a=t("./src/toasty.config"),r=t("./src/toasty.service");return n(t("./src/toasty.container")),n(t("./src/toasty.component")),n(t("./src/toasty.config")),n(t("./src/toasty.service")),Object.defineProperty(e,"__esModule",{value:!0}),e["default"]={providers:[a.ToastyConfig,r.ToastyService],directives:[s.Toasty,i.Toast]},o.exports});
 //# sourceMappingURL=bundles/ng2-toasty.min.js.map
\ No newline at end of file
diff --git a/karma-test-shim.js b/karma-test-shim.js
index def9283..337b619 100644
--- a/karma-test-shim.js
+++ b/karma-test-shim.js
@@ -17,13 +17,13 @@ System.config({
         '@angular/compiler': 'node_modules/@angular/compiler/index.js',
         '@angular/common/testing': 'node_modules/@angular/common/testing.js',
         '@angular/common': 'node_modules/@angular/common/index.js',
+        '@angular/common/src/facade/lang': 'node_modules/@angular/common/src/facade/lang.js',
         '@angular/platform-browser-dynamic/testing': 'node_modules/@angular/platform-browser-dynamic/testing.js',
         '@angular/platform-browser/testing': 'node_modules/@angular/platform-browser/testing.js',
         '@angular/platform-browser': 'node_modules/@angular/platform-browser/index.js',
         '@angular': 'node_modules/@angular',
         'browser_adapter': 'node_modules/@angular/platform-browser/src/browser/browser_adapter',
-        'rxjs': 'node_modules/rxjs',
-        'lodash': 'node_modules/lodash/lodash.js'
+        'rxjs': 'node_modules/rxjs'
     }
 });
 
diff --git a/karma.conf.js b/karma.conf.js
index bc05e00..abc193f 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -24,7 +24,6 @@ module.exports = function(config) {
 
             { pattern: 'node_modules/@angular/**/*.js', included: false, watched: false, served: true },
             { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false, served: true },
-            { pattern: 'node_modules/lodash/**/*.js', included: false, watched: false, served: true },
             { pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: false, watched: false, served: true }, // PhantomJS2 (and possibly others) might require it
 
             { pattern: 'src/**/*.ts', included: false, watched: true }, // source files
diff --git a/make.js b/make.js
index ec50145..86c777d 100644
--- a/make.js
+++ b/make.js
@@ -11,18 +11,16 @@ var config = {
     module: 'cjs'
   },
   map: {
-    typescript: './node_modules/typescript/lib/typescript.js',
-    "@angular": path.resolve('node_modules/@angular'),
-    rxjs: path.resolve('node_modules/rxjs'),
-    lodash: path.resolve('node_modules/lodash/lodash.js')
+    'typescript': './node_modules/typescript/lib/typescript.js',
+    '@angular': path.resolve('node_modules/@angular'),
+    'rxjs': path.resolve('node_modules/rxjs')
   },
   paths: {
     '*': '*.js'
   },
   meta: {
     'node_modules/@angular/*': { build: false },
-    'node_modules/rxjs/*': { build: false },
-    'node_modules/lodash/*': { build: false }
+    'node_modules/rxjs/*': { build: false }
   },
 };
 
diff --git a/package.json b/package.json
index 4e00fb0..dbfd0c9 100644
--- a/package.json
+++ b/package.json
@@ -26,31 +26,31 @@
   "main": "ng2-toasty.js",
   "typings": "./ng2-toasty.d.ts",
   "homepage": "https://github.com/akserg/ng2-toasty",
-  "devDependencies": {
+  "dependencies": {
     "@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",
-    "cz-conventional-changelog": "^1.1.5",
     "es6-shim": "~0.35.0",
+    "reflect-metadata": "0.1.2",
+    "rxjs": "5.0.0-beta.6",
+    "zone.js": "~0.6.12"
+  },
+  "devDependencies": {
+    "cz-conventional-changelog": "^1.1.6",
     "jasmine-core": "~2.3.4",
     "karma": "~0.13.15",
     "karma-chrome-launcher": "~0.2.2",
     "karma-firefox-launcher": "~0.1.7",
     "karma-jasmine": "~0.3.6",
     "karma-typescript-preprocessor": "0.0.21",
-    "lodash": "^4.12.0",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
     "semantic-release": "^4.3.5",
-    "systemjs": "~0.19.27",
-    "systemjs-builder": "^0.15.6",
-    "tsd": "^0.6.5",
-    "typescript": "~1.7.3",
-    "typings": "^0.7",
-    "uglify-js": "^2.6.2",
-    "zone.js": "~0.6.12"
+    "systemjs": "^0.19.27",
+    "systemjs-builder": "^0.15.16",
+    "typescript": "^1.8.7",
+    "typings": "^0.8.1",
+    "uglify-js": "^2.6.2"
   },
   "config": {
     "commitizen": {
diff --git a/src/toasty.container.ts b/src/toasty.container.ts
index b50f406..bd2d3bc 100644
--- a/src/toasty.container.ts
+++ b/src/toasty.container.ts
@@ -4,7 +4,7 @@
 
 import {Component, ViewEncapsulation, Input, OnInit} from '@angular/core';
 import {CORE_DIRECTIVES} from '@angular/common';
-import { isFunction } from 'lodash';
+import { isFunction } from '@angular/common/src/facade/lang';
 
 import {Observable} from 'rxjs/Observable';
 
diff --git a/src/toasty.service.ts b/src/toasty.service.ts
index a27bb1c..66162a3 100644
--- a/src/toasty.service.ts
+++ b/src/toasty.service.ts
@@ -3,7 +3,7 @@
 // https://github.com/akserg/ng2-toasty
 
 import {Injectable} from '@angular/core';
-import {isString, isNumber, isFunction} from 'lodash';
+import {isString, isNumber, isFunction} from '@angular/common/src/facade/lang';
 
 import {Observable} from 'rxjs/Observable';
 import {Subscriber} from 'rxjs/Subscriber';
diff --git a/tsconfig.json b/tsconfig.json
index b67f591..6b85cbf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,18 +9,9 @@
         "moduleResolution": "node",
         "sourceMap": true
     },
-    "files": [
-        "typings/main.d.ts",
-        "ng2-toasty.ts",
-        "./src/toasty.component.ts",
-        "./src/toasty.config.ts",
-        "./src/toasty.container.ts",
-        "./src/toasty.service.ts",
-        "./tests/toasty.container.spec.ts",
-        "./tests/toasty.component.spec.ts",
-        "./tests/toasty.service.spec.ts"
-    ],
     "exclude": [
-        "node_modules"
+        "node_modules",
+        "typings/main.d.ts",
+        "typings/main"
     ]
 }
\ No newline at end of file
diff --git a/typings.json b/typings.json
index 966e198..0e66d3b 100644
--- a/typings.json
+++ b/typings.json
@@ -5,8 +5,5 @@
   "ambientDependencies": {
     "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2",
     "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#aee0039a2d6686ec78352125010ebb38a7a7d743"
-  },
-  "dependencies": {
-    "lodash": "registry:npm/lodash#4.0.0+20160416211519"
   }
 }