From b8fa7ae8abe25f0893147d52428cf2fe332f0089 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 5 Apr 2017 17:20:09 -0400
Subject: [PATCH 01/16] Allowing form control to be passed in as input

---
 demo/src/app/app.module.ts                      | 2 ++
 demo/src/app/components/select/single-demo.html | 1 +
 demo/src/app/components/select/single-demo.ts   | 2 ++
 src/select/select.module.ts                     | 3 ++-
 src/select/select.ts                            | 5 ++++-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
index cf0faed0..7c35a4a0 100644
--- a/demo/src/app/app.module.ts
+++ b/demo/src/app/app.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
+import { ReactiveFormsModule } from '@angular/forms';
 import { TabsModule, ButtonsModule } from 'ng2-bootstrap';
 
 import { SelectModule } from 'ng2-select';
@@ -26,6 +27,7 @@ import { SampleSectionComponent } from './components/sample-section.component';
   imports: [
     BrowserModule,
     FormsModule,
+    ReactiveFormsModule,
     SelectModule,
     TabsModule.forRoot(),
     ButtonsModule.forRoot(),
diff --git a/demo/src/app/components/select/single-demo.html b/demo/src/app/components/select/single-demo.html
index 7c610da5..3872aad4 100644
--- a/demo/src/app/components/select/single-demo.html
+++ b/demo/src/app/components/select/single-demo.html
@@ -1,6 +1,7 @@
 <div style="width: 300px; margin-bottom: 20px;">
   <h3>Select a single city</h3>
   <ng-select [allowClear]="true"
+              [formControl]="singleControl"
               [items]="items"
               [disabled]="disabled"
               (data)="refreshValue($event)"
diff --git a/demo/src/app/components/select/single-demo.ts b/demo/src/app/components/select/single-demo.ts
index f7200c9c..2cef96db 100644
--- a/demo/src/app/components/select/single-demo.ts
+++ b/demo/src/app/components/select/single-demo.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { FormControl, Validators } from '@angular/forms';
 
 @Component({
   selector: 'single-demo',
@@ -19,6 +20,7 @@ export class SingleDemoComponent {
   private value:any = {};
   private _disabledV:string = '0';
   private disabled:boolean = false;
+  private singleControl = new FormControl('', [Validators.required]);
 
   private get disabledV():string {
     return this._disabledV;
diff --git a/src/select/select.module.ts b/src/select/select.module.ts
index 773f18f0..b2571e2c 100644
--- a/src/select/select.module.ts
+++ b/src/select/select.module.ts
@@ -1,12 +1,13 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { ReactiveFormsModule } from '@angular/forms';
 
 import { SelectComponent } from './select';
 import { HighlightPipe } from './select-pipes';
 import { OffClickDirective } from './off-click';
 
 @NgModule({
-  imports: [CommonModule],
+  imports: [CommonModule, ReactiveFormsModule],
   declarations: [SelectComponent, HighlightPipe, OffClickDirective],
   exports: [SelectComponent, HighlightPipe, OffClickDirective]
 })
diff --git a/src/select/select.ts b/src/select/select.ts
index 99541854..0de964c7 100755
--- a/src/select/select.ts
+++ b/src/select/select.ts
@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter, ElementRef, OnInit, forwardRef } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormControl } from '@angular/forms';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { SelectItem } from './select-item';
 import { stripTags } from './select-pipes';
@@ -143,6 +143,7 @@ let styles = `
       </span>
     </div>
     <input type="text" autocomplete="false" tabindex="-1"
+           [formControl]="formControl"    
            (keydown)="inputEvent($event)"
            (keyup)="inputEvent($event, true)"
            [disabled]="disabled"
@@ -205,6 +206,7 @@ let styles = `
         </span>
     </span>
     <input type="text"
+           [formControl]="formControl"
            (keydown)="inputEvent($event)"
            (keyup)="inputEvent($event, true)"
            (click)="matchClick($event)"
@@ -259,6 +261,7 @@ export class SelectComponent implements OnInit, ControlValueAccessor {
   @Input() public textField:string = 'text';
   @Input() public childrenField:string = 'children';
   @Input() public multiple:boolean = false;
+  @Input() public formControl = new FormControl(); 
 
   @Input()
   public set items(value:Array<any>) {

From 7c35725f7c680542833385b4493ff4dd207ca8a9 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 5 Apr 2017 17:54:17 -0400
Subject: [PATCH 02/16] Enabling and disabling by using formControl instead of
 [disabled] due to warnings about possible changed after checked' errors

---
 demo/src/app/components/select/single-demo.ts | 2 +-
 src/select/select.ts                          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/src/app/components/select/single-demo.ts b/demo/src/app/components/select/single-demo.ts
index 2cef96db..103a14b6 100644
--- a/demo/src/app/components/select/single-demo.ts
+++ b/demo/src/app/components/select/single-demo.ts
@@ -20,7 +20,7 @@ export class SingleDemoComponent {
   private value:any = {};
   private _disabledV:string = '0';
   private disabled:boolean = false;
-  private singleControl = new FormControl('', [Validators.required]);
+  private singleControl:FormControl = new FormControl();
 
   private get disabledV():string {
     return this._disabledV;
diff --git a/src/select/select.ts b/src/select/select.ts
index 0de964c7..d579f5d7 100755
--- a/src/select/select.ts
+++ b/src/select/select.ts
@@ -146,7 +146,6 @@ let styles = `
            [formControl]="formControl"    
            (keydown)="inputEvent($event)"
            (keyup)="inputEvent($event, true)"
-           [disabled]="disabled"
            class="form-control ui-select-search"
            *ngIf="inputMode"
            placeholder="{{active.length <= 0 ? placeholder : ''}}">
@@ -210,7 +209,6 @@ let styles = `
            (keydown)="inputEvent($event)"
            (keyup)="inputEvent($event, true)"
            (click)="matchClick($event)"
-           [disabled]="disabled"
            autocomplete="false"
            autocorrect="off"
            autocapitalize="off"
@@ -281,7 +279,10 @@ export class SelectComponent implements OnInit, ControlValueAccessor {
   public set disabled(value:boolean) {
     this._disabled = value;
     if (this._disabled === true) {
+      this.formControl.disable();
       this.hideOptions();
+    } else {
+      this.formControl.enable();
     }
   }
 

From 1b888e6d9c7c33533d2155ba0b376b0d77e17671 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 5 Apr 2017 18:09:33 -0400
Subject: [PATCH 03/16] upgraded zone.js because of zone.js bug that gave
 obscure error when I was 'missing' ReactiveFormsModule detailed here:
 https://github.com/angular/angular-cli/issues/3975

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 02c4ddcd..231f3dc3 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "typescript": "2.1.5",
     "wallaby-webpack": "0.0.30",
     "webdriver-manager": "11.1.1",
-    "zone.js": "0.7.5"
+    "zone.js": "0.7.6"
   },
   "contributors": [
     {

From 80681bc8345b3a4fb8adcee0b01d8e17ada57102 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 5 Apr 2017 18:12:28 -0400
Subject: [PATCH 04/16] Removed formControl from single-demo.html that I was
 using for debugging purposes

---
 demo/src/app/components/select/single-demo.html | 1 -
 demo/src/app/components/select/single-demo.ts   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/demo/src/app/components/select/single-demo.html b/demo/src/app/components/select/single-demo.html
index 3872aad4..7c610da5 100644
--- a/demo/src/app/components/select/single-demo.html
+++ b/demo/src/app/components/select/single-demo.html
@@ -1,7 +1,6 @@
 <div style="width: 300px; margin-bottom: 20px;">
   <h3>Select a single city</h3>
   <ng-select [allowClear]="true"
-              [formControl]="singleControl"
               [items]="items"
               [disabled]="disabled"
               (data)="refreshValue($event)"
diff --git a/demo/src/app/components/select/single-demo.ts b/demo/src/app/components/select/single-demo.ts
index 103a14b6..6e73898b 100644
--- a/demo/src/app/components/select/single-demo.ts
+++ b/demo/src/app/components/select/single-demo.ts
@@ -20,7 +20,6 @@ export class SingleDemoComponent {
   private value:any = {};
   private _disabledV:string = '0';
   private disabled:boolean = false;
-  private singleControl:FormControl = new FormControl();
 
   private get disabledV():string {
     return this._disabledV;

From 2a3b8cba171d6e1e61b057f338f0da7d97264069 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 5 Apr 2017 18:23:07 -0400
Subject: [PATCH 05/16] Removed ReactiveForms dependency from AppModules

---
 demo/src/app/app.module.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
index 7c35a4a0..cf0faed0 100644
--- a/demo/src/app/app.module.ts
+++ b/demo/src/app/app.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { ReactiveFormsModule } from '@angular/forms';
 import { TabsModule, ButtonsModule } from 'ng2-bootstrap';
 
 import { SelectModule } from 'ng2-select';
@@ -27,7 +26,6 @@ import { SampleSectionComponent } from './components/sample-section.component';
   imports: [
     BrowserModule,
     FormsModule,
-    ReactiveFormsModule,
     SelectModule,
     TabsModule.forRoot(),
     ButtonsModule.forRoot(),

From c3d587c689c86b135e764c864f9850c12011d64f Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 5 Apr 2017 18:30:39 -0400
Subject: [PATCH 06/16] Removed Validators, and FormControl import from
 single.component.ts

---
 demo/src/app/components/select/single-demo.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/src/app/components/select/single-demo.ts b/demo/src/app/components/select/single-demo.ts
index 6e73898b..f7200c9c 100644
--- a/demo/src/app/components/select/single-demo.ts
+++ b/demo/src/app/components/select/single-demo.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import { FormControl, Validators } from '@angular/forms';
 
 @Component({
   selector: 'single-demo',

From 778d40efdd9f7b760f04e92520e9c76a6809c7f9 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Tue, 23 May 2017 15:57:37 -0400
Subject: [PATCH 07/16] Changed references from ng2-select to ng-next-select.
 Added contributors

---
 package.json     | 34 +++++++++++++++++-----------------
 src/package.json |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 02c4ddcd..d22b1e16 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "ng2-select-base",
-  "version": "1.2.0",
+  "name": "ng-next-select-base",
+  "version": "1.3.0",
   "private": true,
   "description": "Angular2 based replacement for select boxes",
   "scripts": {
@@ -22,25 +22,27 @@
     "test-coverage": "ng test -sr -cc",
     "version": "npm run flow.changelog && git add -A"
   },
-  "main": "bundles/ng2-select.umd.js",
+  "main": "bundles/ng-next-select.umd.js",
   "module": "index.js",
   "typings": "index.d.ts",
   "keywords": [
     "angular2",
     "select",
     "selectify",
-    "angularjs"
+    "angularjs",
+    "ng2-select",
+    "ngx-select"
   ],
-  "author": "Vyacheslav Chub <vyacheslav.chub@valor-software.com>",
+  "author": "Syed Jafri <syedjafri99+ng-next-select@gmail.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/valor-software/ng2-select.git"
+    "url": "git+ssh://git@github.com/psilospore/ng-next-select.git"
   },
   "bugs": {
-    "url": "https://github.com/valor-software/ng2-select/issues"
+    "url": "https://github.com/psilospore/ng-next-select/issues"
   },
-  "homepage": "https://github.com/valor-software/ng2-select#readme",
+  "homepage": "https://github.com//psilospore/ng-next-select#readme",
   "peerDependencies": {
     "@angular/common": "^2.3.0",
     "@angular/core": "^2.3.0"
@@ -114,19 +116,17 @@
   },
   "contributors": [
     {
-      "name": "Vyacheslav Chub",
-      "email": "vyacheslav.chub@valor-software.com",
-      "url": "https://github.com/buchslava"
+      "name": "Syed Jafri",
+      "email": "syedjafri99+ng-next-select@gmail.com",
+      "url": "https://github.com/psilospore"
     },
     {
-      "name": "Dmitriy Shekhovtsov",
-      "email": "valorkin@gmail.com",
-      "url": "https://github.com/valorkin"
+      "name": "Dylan Bostian",
+      "url": "https://github.com/dboss3"
     },
     {
-      "name": "Oleksandr Telnov",
-      "email": "otelnov@gmail.com",
-      "url": "https://github.com/otelnov"
+      "name": "Chris Williams",
+      "url": "https://github.com/howthatdo"
     }
   ]
 }
diff --git a/src/package.json b/src/package.json
index 216af652..3e963f71 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "ng2-select",
-  "version": "1.2.0",
+  "name": "ng-next-select",
+  "version": "1.3.0",
   "peerDependencies": {
     "@angular/common": "*",
     "@angular/core": "*"

From e29362775d44401e0bfaa10981eff7bc97589c02 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 24 May 2017 14:01:44 -0400
Subject: [PATCH 08/16] Added more info in readme

---
 README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 638b2172..ade141df 100755
--- a/README.md
+++ b/README.md
@@ -1,12 +1,14 @@
-# Native UI Select Angular component ([demo](http://valor-software.com/ng2-select/))
-## ng2-select [![npm version](https://badge.fury.io/js/ng2-select.svg)](http://badge.fury.io/js/ng2-select) [![npm downloads](https://img.shields.io/npm/dm/ng2-select.svg)](https://npmjs.org/ng2-select)[![slack](https://ngx-slack.herokuapp.com/badge.svg)](https://ngx-slack.herokuapp.com)
+# Native UI Select Angular component
 
-[![Angular 2 Style Guide](https://mgechev.github.io/angular2-style-guide/images/badge.svg)](https://github.com/mgechev/angular2-style-guide)
-[![Build Status](https://travis-ci.org/valor-software/ng2-select.svg?branch=development)](https://travis-ci.org/valor-software/ng2-select)
+## Description
+
+This is a library based on a fork from [ng2-select](https://github.com/valor-software/ng2-select).
+We would love any PRs if you have enhancements in mind. We intend on maintaining this library for a while and in the event that our organization does not need this 
+library anymore and/or we become too busy to maintain it we are open to adding other co-maintainers.
 
 ## Quick start
 
-1. A recommended way to install ***ng2-select*** is through [npm](https://www.npmjs.com/search?q=ng2-select) package manager using the following command:
+1. A recommended way to install ***ng-next-select*** is through [npm](https://www.npmjs.com/search?q=ng-next-select) package manager using the following command:
 
   `npm i ng2-select --save`
 
@@ -43,11 +45,11 @@
 
 Please follow this guidelines when reporting bugs and feature requests:
 
-1. Use [GitHub Issues](https://github.com/valor-software/ng2-select/issues) board to report bugs and feature requests (not our email address)
+1. Use [GitHub Issues](https://github.com/psilospore/ng-next-select/issues) board to report bugs and feature requests (not our email address)
 2. Please **always** write steps to reproduce the error. That way we can focus on fixing the bug, not scratching our heads trying to reproduce it.
 
 Thanks for understanding!
 
 ### License
 
-The MIT License (see the [LICENSE](https://github.com/valor-software/ng2-select/blob/master/LICENSE) file for the full text)
+The MIT License (see the [LICENSE](https://github.com/psilospore/ng-next-select/blob/master/LICENSE) file for the full text)

From e2dc056d19d2b7b60a960701b4818a13951e6281 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Wed, 24 May 2017 16:38:13 -0400
Subject: [PATCH 09/16] Added references to readme

---
 README.md        | 5 +----
 package.json     | 5 +++--
 src/package.json | 5 +++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ade141df..1d99e709 100755
--- a/README.md
+++ b/README.md
@@ -10,13 +10,10 @@ library anymore and/or we become too busy to maintain it we are open to adding o
 
 1. A recommended way to install ***ng-next-select*** is through [npm](https://www.npmjs.com/search?q=ng-next-select) package manager using the following command:
 
-  `npm i ng2-select --save`
+  `npm i ng-next-select --save`
 
 2. Include `ng2-select.css` in your project
 
-3. More information regarding of using ***ng2-select*** is located in
-  [demo](http://valor-software.github.io/ng2-select/) and [demo sources](https://github.com/valor-software/ng2-select/tree/master/demo).
-
 ## API
 
 ### Properties
diff --git a/package.json b/package.json
index d22b1e16..dbe0fefb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-next-select-base",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": true,
   "description": "Angular2 based replacement for select boxes",
   "scripts": {
@@ -128,5 +128,6 @@
       "name": "Chris Williams",
       "url": "https://github.com/howthatdo"
     }
-  ]
+  ],
+  "readme": "README.md"
 }
diff --git a/src/package.json b/src/package.json
index 3e963f71..52074c9c 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,8 +1,9 @@
 {
   "name": "ng-next-select",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "peerDependencies": {
     "@angular/common": "*",
     "@angular/core": "*"
-  }
+  },
+  "readme": "../README.md"
 }

From 15ba3bd7a95943a8b8086b59222a5710ddd30dee Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Thu, 25 May 2017 16:46:39 -0400
Subject: [PATCH 10/16] Renamed additional references from ng2-select to
 ng-next-select. Included migration section in readme

---
 README.md                                | 9 ++++++++-
 angular-cli.json                         | 2 +-
 demo/src/app/app.component.ts            | 2 +-
 demo/src/app/app.module.ts               | 2 +-
 demo/src/doc.md                          | 2 +-
 demo/src/index.html                      | 2 +-
 src/{ng2-select.ts => ng-next-select.ts} | 0
 src/spec/select-pipes.spec.ts            | 4 ++--
 src/tsconfig.json                        | 2 +-
 9 files changed, 16 insertions(+), 9 deletions(-)
 rename src/{ng2-select.ts => ng-next-select.ts} (100%)

diff --git a/README.md b/README.md
index 1d99e709..f3e07791 100755
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ library anymore and/or we become too busy to maintain it we are open to adding o
 
   `npm i ng-next-select --save`
 
-2. Include `ng2-select.css` in your project
+2. Include `ng-next-select.css` in your project
 
 ## API
 
@@ -47,6 +47,13 @@ Please follow this guidelines when reporting bugs and feature requests:
 
 Thanks for understanding!
 
+# Migration from Valor's ng2-select
+
+1. Import our library in your package.json instead of ng2-select 
+2. Rename ng2-select.css to ng-next-select.css
+
+TODO
+
 ### License
 
 The MIT License (see the [LICENSE](https://github.com/psilospore/ng-next-select/blob/master/LICENSE) file for the full text)
diff --git a/angular-cli.json b/angular-cli.json
index 77d77115..1563f9b4 100644
--- a/angular-cli.json
+++ b/angular-cli.json
@@ -1,6 +1,6 @@
 {
   "project": {
-    "name": "ng2-select"
+    "name": "ng-next-select"
   },
   "apps": [
     {
diff --git a/demo/src/app/app.component.ts b/demo/src/app/app.component.ts
index dafe080a..be87cb4a 100644
--- a/demo/src/app/app.component.ts
+++ b/demo/src/app/app.component.ts
@@ -7,7 +7,7 @@ let gettingStarted = require('html-loader!markdown-loader!../getting-started.md'
   template: `
     <main class="bd-pageheader">
       <div class="container">
-        <h1>ng2-select</h1>
+        <h1>ng-next-select</h1>
         <p>Native Angular2 component for Select</p>
         <a class="btn btn-primary" href="https://github.com/valor-software/ng2-select">View on GitHub</a>
         <div class="row">
diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
index cf0faed0..d00407da 100644
--- a/demo/src/app/app.module.ts
+++ b/demo/src/app/app.module.ts
@@ -4,7 +4,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
 import { TabsModule, ButtonsModule } from 'ng2-bootstrap';
 
-import { SelectModule } from 'ng2-select';
+import { SelectModule } from 'ng-next-select';
 import { AppComponent } from './app.component';
 import { SelectSectionComponent } from './components/select-section';
 import { ChildrenDemoComponent } from './components/select/children-demo';
diff --git a/demo/src/doc.md b/demo/src/doc.md
index 5c1c9fe2..9cf52e62 100644
--- a/demo/src/doc.md
+++ b/demo/src/doc.md
@@ -1,6 +1,6 @@
 ### Usage
 ```typescript
-import {SelectModule} from 'ng2-select';
+import {SelectModule} from 'ng-next-select';
 ```
 
 ### Annotations
diff --git a/demo/src/index.html b/demo/src/index.html
index a7333e41..0cb1f781 100644
--- a/demo/src/index.html
+++ b/demo/src/index.html
@@ -14,7 +14,7 @@
   <!--link to bootstrap.css-->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
   <link rel="stylesheet" href="assets/css/style.css">
-  <link rel="stylesheet" href="assets/css/ng2-select.css">
+  <link rel="stylesheet" href="assets/css/ng-next-select.css">
   <link rel="stylesheet" href="assets/css/prettify-angulario.css">
 
   <style media="screen">
diff --git a/src/ng2-select.ts b/src/ng-next-select.ts
similarity index 100%
rename from src/ng2-select.ts
rename to src/ng-next-select.ts
diff --git a/src/spec/select-pipes.spec.ts b/src/spec/select-pipes.spec.ts
index 58053edd..a8316092 100644
--- a/src/spec/select-pipes.spec.ts
+++ b/src/spec/select-pipes.spec.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SelectModule } from '../ng2-select';
+import { SelectModule } from '../ng-next-select';
 
 const html = ``;
 
-describe('Component: ng2-select', () => {
+describe('Component: ng-next-select', () => {
   let fixture:ComponentFixture<any>;
   let context:TestSelectComponent;
 
diff --git a/src/tsconfig.json b/src/tsconfig.json
index e4f7348c..ee2fbd6f 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -28,7 +28,7 @@
   ],
   "files": [
     "../scripts/typings.d.ts",
-    "./ng2-select.ts",
+    "./ng-next-select.ts",
     "./index.ts"
   ],
   "angularCompilerOptions": {

From a6551fefaf90f7fc7028716b3c46ee7b229f79de Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Thu, 25 May 2017 19:59:02 -0400
Subject: [PATCH 11/16] Workarround to ignore AOT option

---
 demo/src/app/app.module.ts | 2 +-
 package.json               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
index d00407da..59d5402d 100644
--- a/demo/src/app/app.module.ts
+++ b/demo/src/app/app.module.ts
@@ -4,7 +4,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
 import { TabsModule, ButtonsModule } from 'ng2-bootstrap';
 
-import { SelectModule } from 'ng-next-select';
+import { SelectModule } from '../../../src/select/select.module';
 import { AppComponent } from './app.component';
 import { SelectSectionComponent } from './components/select-section';
 import { ChildrenDemoComponent } from './components/select/children-demo';
diff --git a/package.json b/package.json
index dbe0fefb..82a88375 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "build": "ngm build -p src --clean",
     "build.watch": "ngm build -p src --watch --skip-bundles",
     "start": "ng serve --aot",
+    "startNoAot": "ng serve",
     "pretest": "run-s lint build link",
     "test": "ng test -sr",
     "test-coverage": "ng test -sr -cc",

From e04c92aa9ded347d4a9a3a0eeca16399e619fc30 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Thu, 25 May 2017 20:22:49 -0400
Subject: [PATCH 12/16] bumping up version number

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 82a88375..87c5d711 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-next-select-base",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "private": true,
   "description": "Angular2 based replacement for select boxes",
   "scripts": {

From 350eed995bb58b9d638b18ca612111a5e1182835 Mon Sep 17 00:00:00 2001
From: syedajafri <syed.jafri@itgfirm.com>
Date: Thu, 25 May 2017 20:24:16 -0400
Subject: [PATCH 13/16] Forgot to bump up version number in src

---
 src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package.json b/src/package.json
index 52074c9c..0e008be7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-next-select",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "peerDependencies": {
     "@angular/common": "*",
     "@angular/core": "*"

From 77456226540c3073fc169551c0baca5c23ea1f32 Mon Sep 17 00:00:00 2001
From: dboss3 <dboss3@users.noreply.github.com>
Date: Fri, 2 Jun 2017 10:45:07 -0400
Subject: [PATCH 14/16] Upgraded to Angular 4

---
 angular-cli.json           |  2 +-
 demo/src/app/app.module.ts |  2 +-
 demo/src/typings.d.ts      |  4 ++--
 karma.conf.js              |  8 ++++----
 package.json               | 40 ++++++++++++++++++++------------------
 scripts/typings.d.ts       |  2 +-
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/angular-cli.json b/angular-cli.json
index 1563f9b4..181a1ae9 100644
--- a/angular-cli.json
+++ b/angular-cli.json
@@ -19,8 +19,8 @@
       ],
       "scripts": [
       ],
+      "environmentSource": "environments/environment.ts",
       "environments": {
-        "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
         "prod": "environments/environment.prod.ts"
       }
diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
index 59d5402d..a8b50bf3 100644
--- a/demo/src/app/app.module.ts
+++ b/demo/src/app/app.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { TabsModule, ButtonsModule } from 'ng2-bootstrap';
+import { TabsModule, ButtonsModule } from 'ngx-bootstrap';
 
 import { SelectModule } from '../../../src/select/select.module';
 import { AppComponent } from './app.component';
diff --git a/demo/src/typings.d.ts b/demo/src/typings.d.ts
index 30da4eeb..b69b93f5 100644
--- a/demo/src/typings.d.ts
+++ b/demo/src/typings.d.ts
@@ -6,8 +6,8 @@ declare const ENV:string;
 // google code-prettify
 declare const PR:any;
 
-declare const require:any;
-declare const global:any;
+// declare var require:any;
+// declare var global:any;
 
 declare module jasmine {
   interface Matchers {
diff --git a/karma.conf.js b/karma.conf.js
index 1a74f896..4a3b74cb 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -6,18 +6,18 @@ const customLaunchers = require('./scripts/sauce-browsers').customLaunchers;
 module.exports = function (config) {
   const configuration = {
     basePath: '',
-    frameworks: ['jasmine', 'angular-cli'],
+    frameworks: ['jasmine', '@angular/cli'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-remap-istanbul'),
-      require('angular-cli/plugins/karma')
+      require('@angular/cli/plugins/karma')
     ],
     files: [
       {pattern: './scripts/test.ts', watched: false}
     ],
     preprocessors: {
-      './scripts/test.ts': ['angular-cli']
+      './scripts/test.ts': ['@angular/cli']
     },
     remapIstanbulReporter: {
       reports: {
@@ -62,7 +62,7 @@ module.exports = function (config) {
     configuration.reporters.push('saucelabs');
     configuration.sauceLabs = {
       verbose: true,
-      testName: 'ng2-bootstrap unit tests',
+      testName: 'ngx-bootstrap unit tests',
       recordScreenshots: false,
       username: process.env.SAUCE_USERNAME,
       accessKey: process.env.SAUCE_ACCESS_KEY,
diff --git a/package.json b/package.json
index 87c5d711..54edb25e 100644
--- a/package.json
+++ b/package.json
@@ -45,27 +45,28 @@
   },
   "homepage": "https://github.com//psilospore/ng-next-select#readme",
   "peerDependencies": {
-    "@angular/common": "^2.3.0",
-    "@angular/core": "^2.3.0"
+    "@angular/common": "4.0.1",
+    "@angular/core": "4.0.1",
+    "webpack": "2.6.1"
   },
   "devDependencies": {
-    "@angular/common": "2.4.3",
-    "@angular/compiler": "2.4.3",
-    "@angular/compiler-cli": "2.4.3",
-    "@angular/core": "2.4.3",
-    "@angular/forms": "2.4.3",
-    "@angular/http": "2.4.3",
-    "@angular/language-service": "2.4.3",
-    "@angular/platform-browser": "2.4.3",
-    "@angular/platform-browser-dynamic": "2.4.3",
-    "@angular/router": "3.4.3",
-    "@angular/tsc-wrapped": "0.5.1",
-    "@ngtools/webpack": "1.2.3",
+    "@angular/cli": "1.2.0-beta.0",
+    "@angular/common": "4.0.1",
+    "@angular/compiler": "4.0.1",
+    "@angular/compiler-cli": "4.0.1",
+    "@angular/core": "4.0.1",
+    "@angular/forms": "4.0.1",
+    "@angular/http": "4.0.1",
+    "@angular/language-service": "4.0.1",
+    "@angular/platform-browser": "4.0.1",
+    "@angular/platform-browser-dynamic": "4.0.1",
+    "@angular/router": "4.0.1",
+    "@angular/tsc-wrapped": "4.0.1",
+    "@ngtools/webpack": "1.4.0",
     "@types/jasmine": "2.5.40",
     "@types/marked": "0.0.28",
     "@types/node": "7.0.0",
     "@types/webpack": "^2.2.1",
-    "angular-cli": "1.0.0-beta.25.5",
     "bootstrap": "3.3.7",
     "chokidar-cli": "1.2.0",
     "classlist-polyfill": "1.0.3",
@@ -95,9 +96,9 @@
     "lodash": "4.17.4",
     "markdown-loader": "^0.1.7",
     "marked": "0.3.6",
-    "ng2-bootstrap": "1.2.2",
-    "ng2-page-scroll": "4.0.0-beta.2",
-    "ngm-cli": "0.4.3",
+    "ng2-page-scroll": "4.0.0-beta.7",
+    "ngm-cli": "0.5.0",
+    "ngx-bootstrap": "2.0.0-beta.2",
     "npm-run-all": "^4.0.1",
     "pre-commit": "1.2.2",
     "protractor": "5.0.0",
@@ -113,7 +114,8 @@
     "typescript": "2.1.5",
     "wallaby-webpack": "0.0.30",
     "webdriver-manager": "11.1.1",
-    "zone.js": "0.7.5"
+    "webpack": "2.6.1",
+    "zone.js": "0.8.4"
   },
   "contributors": [
     {
diff --git a/scripts/typings.d.ts b/scripts/typings.d.ts
index a93ab74e..49006b7c 100644
--- a/scripts/typings.d.ts
+++ b/scripts/typings.d.ts
@@ -8,7 +8,7 @@ declare const ENV:string;
 // google code-prettify
 declare const PR:any;
 
-declare const global:any;
+declare var global:any;
 
 declare module jasmine {
   interface Matchers {

From 9e7cc82fab9055058f480c1731f84f7df7406dfa Mon Sep 17 00:00:00 2001
From: Dan Moldovan <dmoldovan@Smarts-MacBook-Pro.local>
Date: Wed, 14 Jun 2017 14:31:38 +0200
Subject: [PATCH 15/16] Fixed multiple enter issue

---
 src/select/select.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/select/select.ts b/src/select/select.ts
index 99541854..13a400db 100755
--- a/src/select/select.ts
+++ b/src/select/select.ts
@@ -408,7 +408,7 @@ export class SelectComponent implements OnInit, ControlValueAccessor {
     }
     // enter
     if (!isUpMode && e.keyCode === 13) {
-      if (this.active.indexOf(this.activeOption) === -1) {
+      if (!this.active.find(a => a.id === this.activeOption.id)) {
         this.selectActiveMatch();
         this.behavior.next();
       }

From 3e7f7285d5c3be61b8345dce735d68d21f7e4053 Mon Sep 17 00:00:00 2001
From: Syed Akber Jafri <syedjafri99@gmail.com>
Date: Wed, 16 Aug 2017 23:42:22 -0400
Subject: [PATCH 16/16] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f3e07791..f460a2ce 100755
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Description
 
 This is a library based on a fork from [ng2-select](https://github.com/valor-software/ng2-select).
-We would love any PRs if you have enhancements in mind. We intend on maintaining this library for a while and in the event that our organization does not need this 
+We would love any PRs if you have enhancements in mind. We intend on maintaining this library for a while and in the event that our organization does not need this
 library anymore and/or we become too busy to maintain it we are open to adding other co-maintainers.
 
 ## Quick start
@@ -52,7 +52,7 @@ Thanks for understanding!
 1. Import our library in your package.json instead of ng2-select 
 2. Rename ng2-select.css to ng-next-select.css
 
-TODO
+That's it
 
 ### License