diff --git a/components/select.ts b/components/select.ts
index 219fc2d3..123935cc 100644
--- a/components/select.ts
+++ b/components/select.ts
@@ -1,2 +1,2 @@
-import {SelectComponent} from './select/select';
+import { SelectComponent } from './select/select';
 export const SELECT_DIRECTIVES:Array<any> = [SelectComponent];
diff --git a/components/select/off-click.ts b/components/select/off-click.ts
index ccf73a15..4167d3ff 100644
--- a/components/select/off-click.ts
+++ b/components/select/off-click.ts
@@ -1,4 +1,4 @@
-import {Directive, HostListener, Input, OnInit, OnDestroy} from '@angular/core';
+import { Directive, HostListener, Input, OnInit, OnDestroy } from '@angular/core';
 
 @Directive({
   selector: '[offClick]'
diff --git a/components/select/select-pipes.spec.ts b/components/select/select-pipes.spec.ts
index 11a720e3..4a09b022 100644
--- a/components/select/select-pipes.spec.ts
+++ b/components/select/select-pipes.spec.ts
@@ -1,6 +1,6 @@
-import {it, expect, describe, inject, beforeEachProviders} from '@angular/core/testing';
-import {ComponentFixture} from '@angular/compiler/testing';
-import {HighlightPipe} from './select-pipes';
+import { it, expect, describe, inject, beforeEachProviders } from '@angular/core/testing';
+import { ComponentFixture } from '@angular/compiler/testing';
+import { HighlightPipe } from './select-pipes';
 
 describe('Component: HighlightPipe', () => {
   beforeEachProviders(() => [
diff --git a/components/select/select-pipes.ts b/components/select/select-pipes.ts
index c536eae5..4e88697a 100644
--- a/components/select/select-pipes.ts
+++ b/components/select/select-pipes.ts
@@ -1,5 +1,5 @@
-import {Pipe, PipeTransform} from '@angular/core';
-import {escapeRegexp} from './common';
+import { Pipe, PipeTransform } from '@angular/core';
+import { escapeRegexp } from './common';
 
 @Pipe({name: 'highlight'})
 export class HighlightPipe implements PipeTransform {
diff --git a/components/select/select.ts b/components/select/select.ts
index 6191221e..4f1a4944 100755
--- a/components/select/select.ts
+++ b/components/select/select.ts
@@ -1,9 +1,9 @@
-import {Component, Input, Output, EventEmitter, ElementRef, OnInit} from '@angular/core';
-import {SelectItem} from './select-item';
-import {HighlightPipe, stripTags} from './select-pipes';
-import {OptionsBehavior} from './select-interfaces';
-import {escapeRegexp} from './common';
-import {OffClickDirective} from './off-click';
+import { Component, Input, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
+import { SelectItem } from './select-item';
+import { HighlightPipe, stripTags } from './select-pipes';
+import { OptionsBehavior } from './select-interfaces';
+import { escapeRegexp } from './common';
+import { OffClickDirective } from './off-click';
 
 let styles = `
 .ui-select-toggle {
diff --git a/demo/components/select-section.ts b/demo/components/select-section.ts
index 55ccdb4b..cf3febfd 100644
--- a/demo/components/select-section.ts
+++ b/demo/components/select-section.ts
@@ -1,12 +1,12 @@
-import {Component} from '@angular/core';
-import {CORE_DIRECTIVES} from '@angular/common';
+import { Component } from '@angular/core';
+import { CORE_DIRECTIVES } from '@angular/common';
 
-import {TAB_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap';
+import { TAB_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
 
-import {SingleDemoComponent} from './select/single-demo';
-import {MultipleDemoComponent} from './select/multiple-demo';
-import {ChildrenDemoComponent} from './select/children-demo';
-import {RichDemoComponent} from './select/rich-demo';
+import { SingleDemoComponent } from './select/single-demo';
+import { MultipleDemoComponent } from './select/multiple-demo';
+import { ChildrenDemoComponent } from './select/children-demo';
+import { RichDemoComponent } from './select/rich-demo';
 
 let name = 'Select';
 // webpack html imports
diff --git a/demo/components/select/children-demo.ts b/demo/components/select/children-demo.ts
index d16fbe82..f57e05c8 100644
--- a/demo/components/select/children-demo.ts
+++ b/demo/components/select/children-demo.ts
@@ -1,8 +1,8 @@
-import {Component} from '@angular/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from '@angular/common';
-import {BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
+import { Component } from '@angular/core';
+import { CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass } from '@angular/common';
+import { BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
 
-import {SELECT_DIRECTIVES} from '../../../ng2-select';
+import { SELECT_DIRECTIVES } from '../../../ng2-select';
 
 // webpack html imports
 let template = require('./children-demo.html');
diff --git a/demo/components/select/multiple-demo.ts b/demo/components/select/multiple-demo.ts
index ada5419f..ea5a574c 100644
--- a/demo/components/select/multiple-demo.ts
+++ b/demo/components/select/multiple-demo.ts
@@ -1,8 +1,8 @@
-import {Component} from '@angular/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from '@angular/common';
-import {BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
+import { Component } from '@angular/core';
+import { CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass } from '@angular/common';
+import { BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
 
-import {SELECT_DIRECTIVES} from '../../../ng2-select';
+import { SELECT_DIRECTIVES } from '../../../ng2-select';
 
 // webpack html imports
 let template = require('./multiple-demo.html');
diff --git a/demo/components/select/rich-demo.ts b/demo/components/select/rich-demo.ts
index a835149a..adb09adc 100644
--- a/demo/components/select/rich-demo.ts
+++ b/demo/components/select/rich-demo.ts
@@ -1,8 +1,8 @@
-import {Component, OnInit, ViewEncapsulation} from '@angular/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from '@angular/common';
-import {BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass } from '@angular/common';
+import { BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
 
-import {SELECT_DIRECTIVES} from '../../../ng2-select';
+import { SELECT_DIRECTIVES } from '../../../ng2-select';
 
 const COLORS = [
     { 'name': 'Blue 10',       'hex': '#C0E6FF' },
diff --git a/demo/components/select/single-demo.ts b/demo/components/select/single-demo.ts
index 45adffb6..756310e0 100644
--- a/demo/components/select/single-demo.ts
+++ b/demo/components/select/single-demo.ts
@@ -1,8 +1,8 @@
-import {Component} from '@angular/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from '@angular/common';
-import {BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
+import { Component } from '@angular/core';
+import { CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass } from '@angular/common';
+import { BUTTON_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
 
-import {SELECT_DIRECTIVES} from '../../../ng2-select';
+import { SELECT_DIRECTIVES } from '../../../ng2-select';
 
 // webpack html imports
 let template = require('./single-demo.html');
diff --git a/demo/index.html b/demo/index.html
index 266abc2b..3c077e81 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -31,9 +31,9 @@
   </style>
 </head>
 <body>
-  <app>
+  <demo-app>
     Loading...
-  </app>
+  </demo-app>
 
 </body>
 </html>
diff --git a/demo/index.ts b/demo/index.ts
index 872f27c6..77772a05 100644
--- a/demo/index.ts
+++ b/demo/index.ts
@@ -1,13 +1,13 @@
-import {bootstrap} from '@angular/platform-browser-dynamic';
-import {Component} from '@angular/core';
-import {NgClass} from '@angular/common';
+import { bootstrap } from '@angular/platform-browser-dynamic';
+import { Component } from '@angular/core';
+import { NgClass } from '@angular/common';
 
-import {SelectSectionComponent} from './components/select-section';
+import { SelectSectionComponent } from './components/select-section';
 
 let gettingStarted = require('./getting-started.md');
 
 @Component({
-  selector: 'app',
+  selector: 'demo-app',
   template: `
   <main class="bd-pageheader">
     <div class="container">
diff --git a/ng2-select.ts b/ng2-select.ts
index 10271758..af1f3e14 100644
--- a/ng2-select.ts
+++ b/ng2-select.ts
@@ -1,4 +1,4 @@
-import {SELECT_DIRECTIVES}  from './components/select';
+import { SELECT_DIRECTIVES }  from './components/select';
 
 export * from './components/select/select';
 export * from './components/select';