diff --git a/.gitignore b/.gitignore
index cd988669..3422917e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 # compiled output
 /dist
 /tmp
-/aot
 
 # dependencies
 /node_modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f369affc..76cade04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.0
+* [[#36](https://github.com/VadimDez/ngx-filter-pipe/issues/36)] - Changed name tp `ngx-filter-pipe`.
+* [[#38](https://github.com/VadimDez/ngx-filter-pipe/issues/38)] - Added UMD bundle.
+
+### Breaking changes
+
+* Module name was changed from `Ng2FilterPipeModule` to `FilterPipeModule`.
+* UMD bundle for `SYSTEMJS` was added. user `/dist/bundles/ngx-filter-pipe.umd.js` instead of `/dist/index.js`. 
+
 ## 0.1.10
 * [[#31](https://github.com/VadimDez/ng2-filter-pipe/issues/31)] - How to filter by two variables of the same array.
 * [[#4](https://github.com/VadimDez/ng2-filter-pipe/issues/4)] - Add $or operator.
diff --git a/README.md b/README.md
index 4f83ec44..cee2d537 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
 <h1 align="center">Angular2+ Filter Pipe</h1>
 
 <p align="center">
-  <a href="https://www.npmjs.com/package/ng2-filter-pipe">
-    <img src="https://img.shields.io/npm/dm/ng2-filter-pipe.svg?style=flat" alt="downloads">
+  <a href="https://www.npmjs.com/package/ngx-filter-pipe">
+    <img src="https://img.shields.io/npm/dm/ngx-filter-pipe.svg?style=flat" alt="downloads">
   </a>
 
-  <a href="https://travis-ci.org/VadimDez/ng2-filter-pipe" alt="build">
-    <img src="https://travis-ci.org/VadimDez/ng2-filter-pipe.svg?branch=master" height="18">
+  <a href="https://travis-ci.org/VadimDez/ngx-filter-pipe" alt="build">
+    <img src="https://travis-ci.org/VadimDez/ngx-filter-pipe.svg?branch=master" height="18">
   </a>
   
-  <a href="https://badge.fury.io/js/ng2-filter-pipe">
-    <img src="https://badge.fury.io/js/ng2-filter-pipe.svg" alt="npm version" height="18">
+  <a href="https://badge.fury.io/js/ngx-filter-pipe">
+    <img src="https://badge.fury.io/js/ngx-filter-pipe.svg" alt="npm version" height="18">
   </a>
   
-  <a href="https://david-dm.org/vadimdez/ng2-filter-pipe" title="dependencies status">
-    <img src="https://david-dm.org/vadimdez/ng2-filter-pipe.svg" height="18">
+  <a href="https://david-dm.org/vadimdez/ngx-filter-pipe" title="dependencies status">
+    <img src="https://david-dm.org/vadimdez/ngx-filter-pipe.svg" height="18">
   </a>
 </p>
 
@@ -28,17 +28,17 @@ Angular 2+ pipeline for filtering arrays.
 
 ### Demo Page
 
-[https://vadimdez.github.io/ng2-filter-pipe/](https://vadimdez.github.io/ng2-filter-pipe/)
+[https://vadimdez.github.io/ngx-filter-pipe/](https://vadimdez.github.io/ngx-filter-pipe/)
 
 ## Install
 
 ```
-npm install ng2-filter-pipe --save
+npm install ngx-filter-pipe --save
 ```
 
 ## Usage
 
-In case you're using ```systemjs``` - see configuration [here](https://github.com/VadimDez/ng2-filter-pipe/blob/master/SYSTEMJS.md).
+In case you're using ```systemjs``` - see configuration [here](https://github.com/VadimDez/ngx-filter-pipe/blob/master/SYSTEMJS.md).
 
 Import `Ng2FilterPipeModule` to your module
 
@@ -47,7 +47,7 @@ import { NgModule } from '@angular/core';
 import { BrowserModule  } from '@angular/platform-browser';
 import { AppComponent } from './app';
  
-import { Ng2FilterPipeModule } from 'ng2-filter-pipe';
+import { Ng2FilterPipeModule } from 'ngx-filter-pipe';
  
 @NgModule({
   imports: [BrowserModule, Ng2FilterPipeModule],
diff --git a/SYSTEMJS.md b/SYSTEMJS.md
index 983516ab..94b121ac 100644
--- a/SYSTEMJS.md
+++ b/SYSTEMJS.md
@@ -7,7 +7,7 @@ Append to `map`
 ```js
 var map = {
     ...
-    'ng2-filter-pipe': 'node_modules/ng2-filter-pipe'
+    'ngx-filter-pipe': 'node_modules/ngx-filter-pipe'
 }
 ```
 
@@ -16,6 +16,6 @@ and then add to `packages`
 ```js
 var packages = {
     ...
-    'ng2-filter-pipe': { main: 'dist/index.js' }
+    'ngx-filter-pipe': { main: 'dist/bundles/ngx-filter-pipe.umd.js' }
 }
 ````
diff --git a/examples/ng-cli/src/app/app.component.html b/examples/ng-cli/src/app/app.component.html
index 85cda744..7e786d6d 100644
--- a/examples/ng-cli/src/app/app.component.html
+++ b/examples/ng-cli/src/app/app.component.html
@@ -1,7 +1,7 @@
 <div mdl class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
   <header class="mdl-layout__header mdl-layout--no-drawer-button">
     <div class="mdl-layout__header-row">
-      <span class="mdl-layout-title">ng2-filter-pipe</span>
+      <span class="mdl-layout-title">ngx-filter-pipe</span>
     </div>
   </header>
   <main class="mdl-layout__content">
@@ -305,9 +305,9 @@ <h5>After filtering</h5>
 
   <footer class="mdl-mini-footer">
     <div class="mdl-mini-footer__left-section">
-      <div class="mdl-logo">ng2-filter-pipe</div>
+      <div class="mdl-logo">ngx-filter-pipe</div>
       <ul class="mdl-mini-footer__link-list">
-        <li><a href="https://github.com/VadimDez/ng2-filter-pipe">Github</a></li>
+        <li><a href="https://github.com/VadimDez/ngx-filter-pipe">Github</a></li>
         <li><a href="https://github.com/VadimDez">Vadym Yatsyuk</a></li>
       </ul>
     </div>
diff --git a/examples/ng-cli/src/app/app.module.ts b/examples/ng-cli/src/app/app.module.ts
index 5fabdc99..1eb67cf5 100644
--- a/examples/ng-cli/src/app/app.module.ts
+++ b/examples/ng-cli/src/app/app.module.ts
@@ -5,14 +5,14 @@ import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
 // import { Ng2FilterPipeModule } from 'ng2-filter-pipe';
-import { Ng2FilterPipeModule } from './shared/ng2-filter.module';
+import { FilterPipeModule } from './shared/ngx-filter.module';
 
 @NgModule({
   imports: [
     BrowserModule,
     FormsModule,
     HttpModule,
-    Ng2FilterPipeModule
+    FilterPipeModule
   ],
   declarations: [
     AppComponent,
diff --git a/examples/ng-cli/src/app/shared/ng2-filter.module.ts b/examples/ng-cli/src/app/shared/ng2-filter.module.ts
deleted file mode 100644
index 3ba07cf8..00000000
--- a/examples/ng-cli/src/app/shared/ng2-filter.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Created by vadimdez on 28/11/2016.
- */
-import { NgModule } from '@angular/core';
-import { Ng2FilterPipe } from './ng2-filter.pipe';
-
-@NgModule({
-  declarations: [Ng2FilterPipe],
-  exports: [Ng2FilterPipe]
-})
-
-export class Ng2FilterPipeModule {}
diff --git a/examples/ng-cli/src/app/shared/ngx-filter.module.ts b/examples/ng-cli/src/app/shared/ngx-filter.module.ts
new file mode 100644
index 00000000..e5a4c926
--- /dev/null
+++ b/examples/ng-cli/src/app/shared/ngx-filter.module.ts
@@ -0,0 +1,12 @@
+/**
+ * Created by vadimdez on 28/11/2016.
+ */
+import { NgModule } from '@angular/core';
+import { FilterPipe } from './ngx-filter.pipe';
+
+@NgModule({
+  declarations: [FilterPipe],
+  exports: [FilterPipe]
+})
+
+export class FilterPipeModule {}
diff --git a/src/ng2-filter.pipe.spec.ts b/examples/ng-cli/src/app/shared/ngx-filter.pipe.spec.ts
similarity index 97%
rename from src/ng2-filter.pipe.spec.ts
rename to examples/ng-cli/src/app/shared/ngx-filter.pipe.spec.ts
index a7faa952..51d2c01d 100644
--- a/src/ng2-filter.pipe.spec.ts
+++ b/examples/ng-cli/src/app/shared/ngx-filter.pipe.spec.ts
@@ -1,12 +1,12 @@
 /* tslint:disable:no-unused-variable */
 
-import { Ng2FilterPipe } from './ng2-filter.pipe';
+import { FilterPipe } from './ngx-filter.pipe';
 
-describe('Pipe: Ng2FilterPipe', () => {
-  let pipe: Ng2FilterPipe;
+describe('Pipe: FilterPipe', () => {
+  let pipe: FilterPipe;
 
   beforeEach(() => {
-    pipe = new Ng2FilterPipe();
+    pipe = new FilterPipe();
   });
 
   it('create an instance', () => {
diff --git a/examples/ng-cli/src/app/shared/ng2-filter.pipe.ts b/examples/ng-cli/src/app/shared/ngx-filter.pipe.ts
similarity index 99%
rename from examples/ng-cli/src/app/shared/ng2-filter.pipe.ts
rename to examples/ng-cli/src/app/shared/ngx-filter.pipe.ts
index 60e7afef..d3e628c1 100644
--- a/examples/ng-cli/src/app/shared/ng2-filter.pipe.ts
+++ b/examples/ng-cli/src/app/shared/ngx-filter.pipe.ts
@@ -9,7 +9,7 @@ import { Pipe, Injectable } from '@angular/core';
 })
 
 @Injectable()
-export class Ng2FilterPipe {
+export class FilterPipe {
 
   private filterByString(filter) {
     if (filter) {
diff --git a/examples/ng-cli/src/index.html b/examples/ng-cli/src/index.html
index bfb768dc..384d6a45 100644
--- a/examples/ng-cli/src/index.html
+++ b/examples/ng-cli/src/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>NgCli</title>
+  <title>ngx-filter-pipe</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/index.ts b/index.ts
index 5f4d946f..bbdcdf79 100644
--- a/index.ts
+++ b/index.ts
@@ -1,5 +1,5 @@
 /**
  * Created by vadimdez on 28/11/2016.
  */
-export * from './src/ng2-filter.module';
-export * from './src/ng2-filter.pipe';
\ No newline at end of file
+export * from './src/ngx-filter.module';
+export * from './src/ngx-filter.pipe';
\ No newline at end of file
diff --git a/package.json b/package.json
index 21c83292..320b473b 100644
--- a/package.json
+++ b/package.json
@@ -1,33 +1,29 @@
 {
-  "name": "ng2-filter-pipe",
-  "version": "0.1.10",
+  "name": "ngx-filter-pipe",
+  "version": "1.0.0",
   "author": "Vadym Yatsyuk <vadym.yatsyuk@gmail.com>",
   "license": "MIT",
-  "angular-cli": {},
   "scripts": {
     "start": "ng server",
-    "typings": "typings install",
     "lint": "tslint \"src/**/*.ts\"",
     "test": "ng test --watch=false",
     "pree2e": "webdriver-manager update",
     "e2e": "protractor",
-    "minify": "uglifyjs ./dist/app/shared/ng2-filter.pipe.js --compress --mangle --output ./ng2-filter.pipe.min.js --source-map ./ng2-filter.pipe.min.js.map",
-    "build": "ngc -p tsconfig.json"
+    "minify": "uglifyjs ./dist/app/shared/ngx-filter.pipe.js --compress --mangle --output ./ngx-filter.pipe.min.js --source-map ./ngx-filter.pipe.min.js.map",
+    "build": "rimraf dist && tsc -p tsconfig-esm.json && mkdir ./dist/bundles && rollup -c rollup.config.js dist/index.js > dist/bundles/ngx-filter-pipe.umd.js && ngc -p tsconfig.json"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://vadimdez@github.com/VadimDez/ng2-filter-pipe.git"
+    "url": "git+https://vadimdez@github.com/VadimDez/ngx-filter-pipe.git"
   },
   "bugs": {
-    "url": "https://github.com/VadimDez/ng2-filter-pipe/issues"
+    "url": "https://github.com/VadimDez/ngx-filter-pipe/issues"
   },
-  "homepage": "https://github.com/VadimDez/ng2-filter-pipe#readme",
+  "homepage": "https://github.com/VadimDez/ngx-filter-pipe#readme",
   "peerDependencies": {
     "@angular/core": ">=2.2.3"
   },
-  "dependencies": {
-    "typings": "^2.0.0"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@angular/common": "^4.0.1",
     "@angular/compiler": "^4.0.1",
@@ -37,7 +33,6 @@
     "@angular/http": "^4.0.1",
     "@angular/platform-browser": "^4.0.1",
     "@angular/platform-browser-dynamic": "^4.0.1",
-    "@types/core-js": "0.9.34",
     "@types/jasmine": "^2.5.47",
     "@types/node": "^6.0.51",
     "@types/phantom": "3.2.1",
@@ -57,6 +52,9 @@
     "material-design-lite": "^1.3.0",
     "protractor": "^5.1.1",
     "reflect-metadata": "^0.1.10",
+    "rollup": "^0.43.0",
+    "rollup-plugin-commonjs": "^8.0.2",
+    "rollup-plugin-node-resolve": "^3.0.0",
     "rxjs": "^5.2.1-smooth",
     "systemjs": "^0.20.11",
     "ts-node": "^3.0.2",
@@ -65,14 +63,16 @@
     "uglifyjs": "^2.4.10",
     "zone.js": "^0.8.5"
   },
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist/bundles/ngx-filter-pipe.umd.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "keywords": [
     "angular",
     "angular2",
+    "angular4",
     "filter",
     "pipe"
   ]
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 00000000..5eb505fd
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,20 @@
+/**
+ * Created by Vadym Yatsyuk on 22.06.17
+ */
+export default {
+  format: 'umd',
+  moduleName: 'ngx-filter-pipe',
+  external: [
+    '@angular/core'
+  ],
+  onwarn: ( warning ) => {
+    const skip_codes = [
+      'THIS_IS_UNDEFINED',
+      'MISSING_GLOBAL_NAME'
+    ];
+    if (skip_codes.indexOf(warning.code) !== -1) {
+      return;
+    }
+    console.error(warning);
+  }
+};
diff --git a/src/ng2-filter.module.ts b/src/ng2-filter.module.ts
deleted file mode 100644
index 3ba07cf8..00000000
--- a/src/ng2-filter.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Created by vadimdez on 28/11/2016.
- */
-import { NgModule } from '@angular/core';
-import { Ng2FilterPipe } from './ng2-filter.pipe';
-
-@NgModule({
-  declarations: [Ng2FilterPipe],
-  exports: [Ng2FilterPipe]
-})
-
-export class Ng2FilterPipeModule {}
diff --git a/src/ngx-filter.module.ts b/src/ngx-filter.module.ts
new file mode 100644
index 00000000..e5a4c926
--- /dev/null
+++ b/src/ngx-filter.module.ts
@@ -0,0 +1,12 @@
+/**
+ * Created by vadimdez on 28/11/2016.
+ */
+import { NgModule } from '@angular/core';
+import { FilterPipe } from './ngx-filter.pipe';
+
+@NgModule({
+  declarations: [FilterPipe],
+  exports: [FilterPipe]
+})
+
+export class FilterPipeModule {}
diff --git a/examples/ng-cli/src/app/shared/ng2-filter.pipe.spec.ts b/src/ngx-filter.pipe.spec.ts
similarity index 97%
rename from examples/ng-cli/src/app/shared/ng2-filter.pipe.spec.ts
rename to src/ngx-filter.pipe.spec.ts
index a7faa952..51d2c01d 100644
--- a/examples/ng-cli/src/app/shared/ng2-filter.pipe.spec.ts
+++ b/src/ngx-filter.pipe.spec.ts
@@ -1,12 +1,12 @@
 /* tslint:disable:no-unused-variable */
 
-import { Ng2FilterPipe } from './ng2-filter.pipe';
+import { FilterPipe } from './ngx-filter.pipe';
 
-describe('Pipe: Ng2FilterPipe', () => {
-  let pipe: Ng2FilterPipe;
+describe('Pipe: FilterPipe', () => {
+  let pipe: FilterPipe;
 
   beforeEach(() => {
-    pipe = new Ng2FilterPipe();
+    pipe = new FilterPipe();
   });
 
   it('create an instance', () => {
diff --git a/src/ng2-filter.pipe.ts b/src/ngx-filter.pipe.ts
similarity index 99%
rename from src/ng2-filter.pipe.ts
rename to src/ngx-filter.pipe.ts
index 60e7afef..d3e628c1 100644
--- a/src/ng2-filter.pipe.ts
+++ b/src/ngx-filter.pipe.ts
@@ -9,7 +9,7 @@ import { Pipe, Injectable } from '@angular/core';
 })
 
 @Injectable()
-export class Ng2FilterPipe {
+export class FilterPipe {
 
   private filterByString(filter) {
     if (filter) {
diff --git a/tsconfig-esm.json b/tsconfig-esm.json
new file mode 100644
index 00000000..0d4f2044
--- /dev/null
+++ b/tsconfig-esm.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "noImplicitAny": false,
+    "module": "es2015",
+    "target": "es5",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "declaration": true,
+    "sourceMap": true,
+    "moduleResolution": "node",
+    "rootDir": ".",
+    "outDir": "./dist/",
+    "lib": ["es2015", "dom"]
+  },
+  "files": [
+    "index.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "example",
+    "examples",
+    "typings",
+    "aot"
+  ]
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 46b22fef..2f874b74 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,12 +10,12 @@
     "moduleResolution": "node",
     "rootDir": ".",
     "outDir": "./dist/",
+    "lib": ["es2015", "dom"],
     "typeRoots": [
       "node_modules/@types",
       "node_modules"
     ],
     "types": [
-      "core-js",
       "jasmine",
       "selenium-webdriver",
       "node",
@@ -35,7 +35,6 @@
     "aot"
   ],
   "angularCompilerOptions": {
-    "genDir": "aot",
-    "skipMetadataEmit" : false
+    "skipTemplateCodegen": true
   }
 }
\ No newline at end of file
diff --git a/typings.json b/typings.json
deleted file mode 100644
index a3cf3ddd..00000000
--- a/typings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "ambientDevDependencies": {
-    "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
-    "jasmine": "registry:dt/jasmine#2.2.0+20160412134438",
-    "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
-  },
-  "ambientDependencies": {
-    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"
-  }
-}