diff --git a/components/select/off-click.ts b/components/select/off-click.ts
index 6ccef08a..ccf73a15 100644
--- a/components/select/off-click.ts
+++ b/components/select/off-click.ts
@@ -1,4 +1,4 @@
-import {Directive, HostListener, Input, OnInit, OnDestroy} from 'angular2/core';
+import {Directive, HostListener, Input, OnInit, OnDestroy} from '@angular/core';
 
 @Directive({
   selector: '[offClick]'
diff --git a/components/select/select-pipes.ts b/components/select/select-pipes.ts
index a6bc6f7f..33458b10 100644
--- a/components/select/select-pipes.ts
+++ b/components/select/select-pipes.ts
@@ -1,4 +1,4 @@
-import {Pipe, PipeTransform} from 'angular2/core';
+import {Pipe, PipeTransform} from '@angular/core';
 import {escapeRegexp} from './common';
 
 @Pipe({
diff --git a/components/select/select.ts b/components/select/select.ts
index 61850f7f..c1f39d99 100644
--- a/components/select/select.ts
+++ b/components/select/select.ts
@@ -1,4 +1,4 @@
-import {Component, Input, Output, EventEmitter, ElementRef, OnInit} from 'angular2/core';
+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';
@@ -9,7 +9,7 @@ let optionsTemplate = `
     <ul *ngIf="optionsOpened && options && options.length > 0 && !firstItemHasChildren"
         class="ui-select-choices ui-select-choices-content ui-select-dropdown dropdown-menu">
       <li class="ui-select-choices-group">
-        <div *ngFor="#o of options"
+        <div *ngFor="let o of options"
              class="ui-select-choices-row"
              [class.active]="isActive(o)"
              (mouseenter)="selectActive(o)"
@@ -23,11 +23,11 @@ let optionsTemplate = `
 
     <ul *ngIf="optionsOpened && options && options.length > 0 && firstItemHasChildren"
         class="ui-select-choices ui-select-choices-content ui-select-dropdown dropdown-menu">
-      <li *ngFor="#c of options; #index=index" class="ui-select-choices-group">
+      <li *ngFor="let c of options; let index=index" class="ui-select-choices-group">
         <div class="divider" *ngIf="index > 0"></div>
         <div class="ui-select-choices-group-label dropdown-header">{{c.text}}</div>
 
-        <div *ngFor="#o of c.children"
+        <div *ngFor="let o of c.children"
              class="ui-select-choices-row"
              [class.active]="isActive(o)"
              (mouseenter)="selectActive(o)"
@@ -86,7 +86,7 @@ let optionsTemplate = `
      class="ui-select-container ui-select-multiple ui-select-bootstrap dropdown form-control open">
     <div [ngClass]="{'ui-disabled': disabled}"></div>
     <span class="ui-select-match">
-        <span *ngFor="#a of active">
+        <span *ngFor="let a of active">
             <span class="ui-select-match-item btn btn-default btn-secondary btn-xs"
                   tabindex="-1"
                   type="button"
diff --git a/demo/components/select-section.ts b/demo/components/select-section.ts
index 221d70c3..760c3cd4 100644
--- a/demo/components/select-section.ts
+++ b/demo/components/select-section.ts
@@ -1,5 +1,5 @@
-import {Component} from 'angular2/core';
-import {CORE_DIRECTIVES} from 'angular2/common';
+import {Component} from '@angular/core';
+import {CORE_DIRECTIVES} from '@angular/common';
 
 import {TAB_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap';
 
diff --git a/demo/components/select/children-demo.ts b/demo/components/select/children-demo.ts
index 1b2bc91e..d16fbe82 100644
--- a/demo/components/select/children-demo.ts
+++ b/demo/components/select/children-demo.ts
@@ -1,6 +1,6 @@
-import {Component} from 'angular2/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
-import {ButtonCheckbox} 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';
 
@@ -10,7 +10,7 @@ let template = require('./children-demo.html');
 @Component({
   selector: 'children-demo',
   template: template,
-  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
+  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, BUTTON_DIRECTIVES ]
 })
 export class ChildrenDemoComponent {
   public items:Array<any> = [
diff --git a/demo/components/select/multiple-demo.ts b/demo/components/select/multiple-demo.ts
index 092059ea..ada5419f 100644
--- a/demo/components/select/multiple-demo.ts
+++ b/demo/components/select/multiple-demo.ts
@@ -1,6 +1,6 @@
-import {Component} from 'angular2/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
-import {ButtonCheckbox} 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';
 
@@ -10,7 +10,7 @@ let template = require('./multiple-demo.html');
 @Component({
   selector: 'multiple-demo',
   template: template,
-  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
+  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, BUTTON_DIRECTIVES ]
 })
 export class MultipleDemoComponent {
   public items:Array<string> = ['Amsterdam', 'Antwerp', 'Athens', 'Barcelona',
diff --git a/demo/components/select/rich-demo.ts b/demo/components/select/rich-demo.ts
index 5ae97916..a835149a 100644
--- a/demo/components/select/rich-demo.ts
+++ b/demo/components/select/rich-demo.ts
@@ -1,6 +1,6 @@
-import {Component, OnInit, ViewEncapsulation} from 'angular2/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
-import {ButtonCheckbox} 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';
 
@@ -54,7 +54,7 @@ let template = require('./rich-demo.html');
   selector: 'rich-demo',
   template: template,
   styles: [`colorbox,.colorbox { display:inline-block; height:14px; width:14px;margin-right:4px; border:1px solid #000;}`],
-  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox],
+  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, BUTTON_DIRECTIVES ],
   encapsulation: ViewEncapsulation.None  // Enable dynamic HTML styles
 })
 export class RichDemoComponent implements OnInit {
diff --git a/demo/components/select/single-demo.ts b/demo/components/select/single-demo.ts
index d79d0921..45adffb6 100644
--- a/demo/components/select/single-demo.ts
+++ b/demo/components/select/single-demo.ts
@@ -1,6 +1,6 @@
-import {Component} from 'angular2/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
-import {ButtonCheckbox} 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';
 
@@ -10,7 +10,7 @@ let template = require('./single-demo.html');
 @Component({
   selector: 'single-demo',
   template: template,
-  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
+  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, BUTTON_DIRECTIVES ]
 })
 export class SingleDemoComponent {
   public items:Array<string> = ['Amsterdam', 'Antwerp', 'Athens', 'Barcelona',
diff --git a/demo/index.ts b/demo/index.ts
index 96c41654..1d75084c 100644
--- a/demo/index.ts
+++ b/demo/index.ts
@@ -1,6 +1,6 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
-import {NgClass} from 'angular2/common';
+import {bootstrapStatic} from '@angular/platform-browser';
+import {Component} from '@angular/core';
+import {NgClass} from '@angular/common';
 
 import {SelectSectionComponent} from './components/select-section';
 
@@ -41,4 +41,4 @@ let gettingStarted = require('./getting-started.md');
 export class DemoComponent {
 }
 
-bootstrap(DemoComponent);
+bootstrapStatic(DemoComponent);
diff --git a/package.json b/package.json
index 0005949c..5422f886 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,12 @@
   },
   "homepage": "https://github.com/valor-software/ng2-select#readme",
   "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
-  },
+    "@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"
+   },
   "dependencies": {},
   "devDependencies": {
     "angular2": "2.0.0-beta.15",