diff --git a/.gitignore b/.gitignore
index 072da860d5..038776f66d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ ng2-bootstrap.js.map
 factories
 
 /**/*.metadata.json
+/**/*.ngfactory.ts
diff --git a/components/accordion/accordion.component.ts b/components/accordion/accordion.component.ts
index 05e361b23c..fd90c44160 100644
--- a/components/accordion/accordion.component.ts
+++ b/components/accordion/accordion.component.ts
@@ -12,7 +12,7 @@ export class AccordionComponent {
 
   /* tslint:disable:no-unused-variable */
   @HostBinding('class.panel-group')
-  private addClass:boolean = true;
+  public addClass:boolean = true;
   /* tslint:enable:no-unused-variable */
 
   private groups:Array<AccordionPanelComponent> = [];
diff --git a/components/accordion/readme.md b/components/accordion/readme.md
index 51bac7c08d..147be6dd6d 100644
--- a/components/accordion/readme.md
+++ b/components/accordion/readme.md
@@ -16,7 +16,7 @@ export class AccordionComponent {
   @Input() public closeOthers:boolean;
 
   @HostBinding('class.panel-group')
-  private addClass = true;
+  public addClass = true;
 }
 
 // component AccordionGroup
diff --git a/components/alert/alert.component.ts b/components/alert/alert.component.ts
index 525e54a464..be97fde3b7 100644
--- a/components/alert/alert.component.ts
+++ b/components/alert/alert.component.ts
@@ -22,7 +22,7 @@ export class AlertComponent implements OnInit {
 
   @Output() public close:EventEmitter<AlertComponent> = new EventEmitter<AlertComponent>(false);
 
-  private closed:boolean;
+  public closed:boolean;
   private classes:Array<string> = [];
 
   public ngOnInit():any {
diff --git a/components/buttons/readme.md b/components/buttons/readme.md
index 0b721ff54c..04d9e0e1da 100644
--- a/components/buttons/readme.md
+++ b/components/buttons/readme.md
@@ -21,8 +21,8 @@ export class ButtonRadioDirective implements ControlValueAccessor, OnInit {
 // directive ButtonCheckbox
 @Directive({ selector: '[btnCheckbox][ngModel]' })
 export class ButtonCheckboxDirective implements ControlValueAccessor, OnInit {
-  @Input() private btnCheckboxTrue:any;
-  @Input() private btnCheckboxFalse:any;
+  @Input() public btnCheckboxTrue:any;
+  @Input() public btnCheckboxFalse:any;
 
   @HostBinding('class.active')
   private state:boolean = false;
diff --git a/components/carousel/carousel.component.ts b/components/carousel/carousel.component.ts
index e4d5fcd367..f49b151fca 100644
--- a/components/carousel/carousel.component.ts
+++ b/components/carousel/carousel.component.ts
@@ -50,7 +50,7 @@ export class CarouselComponent implements OnDestroy {
     this.restartTimer();
   }
 
-  private slides:Array<SlideComponent> = [];
+  public slides:Array<SlideComponent> = [];
   private currentInterval:any;
   private isPlaying:boolean;
   private destroyed:boolean = false;
diff --git a/components/carousel/readme.md b/components/carousel/readme.md
index a3e71ed5c4..3873046de5 100644
--- a/components/carousel/readme.md
+++ b/components/carousel/readme.md
@@ -12,9 +12,9 @@ import { CarouselModule } from 'ng2-bootstrap/components/carousel';
   selector: 'carousel'
 })
 export class CarouselComponent implements OnDestroy {
-  @Input() private noWrap:boolean;
-  @Input() private noPause:boolean;
-  @Input() private noTransition:boolean;
+  @Input() public noWrap:boolean;
+  @Input() public noPause:boolean;
+  @Input() public noTransition:boolean;
 
   @Input() public get interval():number {}
 }
@@ -32,7 +32,7 @@ export class SlideComponent implements OnInit, OnDestroy {
 
   @HostBinding('class.item')
   @HostBinding('class.carousel-item')
-  private addClass:boolean = true;
+  public addClass:boolean = true;
 }
 ```
 
diff --git a/components/collapse/collapse.directive.ts b/components/collapse/collapse.directive.ts
index df4475c399..de14609ba0 100644
--- a/components/collapse/collapse.directive.ts
+++ b/components/collapse/collapse.directive.ts
@@ -34,30 +34,30 @@ export class CollapseDirective implements OnInit {
   // @HostBinding('style.height')
   // private height:string;
   @HostBinding('style.display')
-  private display:string;
+  public display:string;
   // shown
   @HostBinding('class.in')
   @HostBinding('attr.aria-expanded')
-  private isExpanded:boolean = true;
+  public isExpanded:boolean = true;
   // hidden
   @HostBinding('attr.aria-hidden')
-  private isCollapsed:boolean = false;
+  public isCollapsed:boolean = false;
   // stale state
   @HostBinding('class.collapse')
-  private isCollapse:boolean = true;
+  public isCollapse:boolean = true;
   // animation state
   @HostBinding('class.collapsing')
-  private isCollapsing:boolean = false;
+  public isCollapsing:boolean = false;
 
   // @Input() private transitionDuration:number = 500; // Duration in ms
 
   @Input()
-  private set collapse(value:boolean) {
+  public set collapse(value:boolean) {
     this.isExpanded = value;
     this.toggle();
   }
 
-  private get collapse():boolean {
+  public get collapse():boolean {
     return this.isExpanded;
   }
 
diff --git a/components/common.ts b/components/common.ts
index 6e26ea1e5a..79080e362d 100644
--- a/components/common.ts
+++ b/components/common.ts
@@ -15,14 +15,14 @@ export class NgTranscludeDirective {
   private _ngTransclude:TemplateRef<any>;
 
   @Input()
-  private set ngTransclude(templateRef:TemplateRef<any>) {
+  public set ngTransclude(templateRef:TemplateRef<any>) {
     this._ngTransclude = templateRef;
     if (templateRef) {
       this.viewRef.createEmbeddedView(templateRef);
     }
   }
 
-  private get ngTransclude():TemplateRef<any> {
+  public get ngTransclude():TemplateRef<any> {
     return this._ngTransclude;
   }
 
diff --git a/components/datepicker/datepicker-inner.component.ts b/components/datepicker/datepicker-inner.component.ts
index c8e9515daa..36e798170a 100644
--- a/components/datepicker/datepicker-inner.component.ts
+++ b/components/datepicker/datepicker-inner.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
 
 import { DateFormatter } from './date-formatter';
 
@@ -69,6 +69,8 @@ export class DatePickerInnerComponent implements OnInit, OnChanges {
 
   @Output() public selectionDone:EventEmitter<Date> = new EventEmitter<Date>(undefined);
 
+  @Output() public update:EventEmitter<Date> = new EventEmitter<Date>(false);
+
   public stepDay:any = {};
   public stepMonth:any = {};
   public stepYear:any = {};
@@ -87,9 +89,6 @@ export class DatePickerInnerComponent implements OnInit, OnChanges {
   private refreshViewHandlerYear:Function;
   private compareHandlerYear:Function;
 
-  @Output()
-  private update:EventEmitter<Date> = new EventEmitter<Date>(false);
-
   @Input()
   public get activeDate():Date {
     return this._activeDate;
@@ -125,7 +124,7 @@ export class DatePickerInnerComponent implements OnInit, OnChanges {
 
     if (this.initDate) {
       this.activeDate = this.initDate;
-      this.selectedDate = new Date(this.activeDate.valueOf());
+      this.selectedDate = new Date(this.activeDate.valueOf() as number);
       this.update.emit(this.activeDate);
     } else if (this.activeDate === undefined) {
       this.activeDate = new Date();
@@ -133,7 +132,8 @@ export class DatePickerInnerComponent implements OnInit, OnChanges {
   }
 
   // this.refreshView should be called here to reflect the changes on the fly
-  public ngOnChanges():void {
+  // tslint:disable-next-line:no-unused-variable
+  public ngOnChanges(changes:SimpleChanges):void {
     this.refreshView();
   }
 
@@ -255,7 +255,7 @@ export class DatePickerInnerComponent implements OnInit, OnChanges {
       this.datepickerMode = this.modes[this.modes.indexOf(this.datepickerMode) - 1];
     }
 
-    this.selectedDate = new Date(this.activeDate.valueOf());
+    this.selectedDate = new Date(this.activeDate.valueOf() as number);
     this.update.emit(this.activeDate);
     this.refreshView();
   }
diff --git a/components/datepicker/monthpicker.component.ts b/components/datepicker/monthpicker.component.ts
index a6fbb500f5..419ed2ac70 100644
--- a/components/datepicker/monthpicker.component.ts
+++ b/components/datepicker/monthpicker.component.ts
@@ -35,7 +35,7 @@ import { DatePickerInnerComponent } from './datepicker-inner.component';
     <tr *ngFor="let rowz of rows">
       <td *ngFor="let dtz of rowz" class="text-center" role="gridcell" id="{{dtz.uid}}" [ngClass]="dtz.customClass">
         <button type="button" style="min-width:100%;" class="btn btn-default"
-                [ngClass]="{'btn-info': dtz.selected, 'btn-link': isBS4 && !dtz.selected && !datePicker.isActive(dtz), 'btn-info': isBS4 && !dtz.selected && datePicker.isActive(dtz), disabled: dtz.disabled, active: !isBS4 && datePicker.isActive(dtz)}"
+                [ngClass]="{'btn-link': isBS4 && !dtz.selected && !datePicker.isActive(dtz), 'btn-info': dtz.selected || (isBS4 && !dtz.selected && datePicker.isActive(dtz)), disabled: dtz.disabled, active: !isBS4 && datePicker.isActive(dtz)}"
                 [disabled]="dtz.disabled"
                 (click)="datePicker.select(dtz.date)" tabindex="-1">
           <span [ngClass]="{'text-success': isBS4 && dtz.current, 'text-info': !isBS4 && dtz.current}">{{dtz.label}}</span>
diff --git a/components/datepicker/yearpicker.component.ts b/components/datepicker/yearpicker.component.ts
index c7303ffb3d..d2fb74ee68 100644
--- a/components/datepicker/yearpicker.component.ts
+++ b/components/datepicker/yearpicker.component.ts
@@ -36,7 +36,7 @@ import { DatePickerInnerComponent } from './datepicker-inner.component';
     <tr *ngFor="let rowz of rows">
       <td *ngFor="let dtz of rowz" class="text-center" role="gridcell">
         <button type="button" style="min-width:100%;" class="btn btn-default"
-                [ngClass]="{'btn-info': dtz.selected, 'btn-link': isBS4 && !dtz.selected && !datePicker.isActive(dtz), 'btn-info': isBS4 && !dtz.selected && datePicker.isActive(dtz), disabled: dtz.disabled, active: !isBS4 && datePicker.isActive(dtz)}"
+                [ngClass]="{'btn-link': isBS4 && !dtz.selected && !datePicker.isActive(dtz), 'btn-info': dtz.selected || (isBS4 && !dtz.selected && datePicker.isActive(dtz)), disabled: dtz.disabled, active: !isBS4 && datePicker.isActive(dtz)}"
                 [disabled]="dtz.disabled"
                 (click)="datePicker.select(dtz.date)" tabindex="-1">
           <span [ngClass]="{'text-success': isBS4 && dtz.current, 'text-info': !isBS4 && dtz.current}">{{dtz.label}}</span>
diff --git a/components/pagination/pagination.component.ts b/components/pagination/pagination.component.ts
index 74c11ac8f3..cbd970eaec 100644
--- a/components/pagination/pagination.component.ts
+++ b/components/pagination/pagination.component.ts
@@ -154,15 +154,14 @@ export class PaginationComponent implements ControlValueAccessor, OnInit, Pagina
   public renderer:Renderer;
   public elementRef:ElementRef;
 
-  private classMap:string;
+  public classMap:string;
+  public pages:Array<any>;
 
   private _itemsPerPage:number;
   private _totalItems:number;
   private _totalPages:number;
   private inited:boolean = false;
-  // ??
   private _page:number;
-  private pages:Array<any>;
 
   public constructor(@Self() cd:NgModel, renderer:Renderer, elementRef:ElementRef) {
     this.cd = cd;
@@ -224,7 +223,7 @@ export class PaginationComponent implements ControlValueAccessor, OnInit, Pagina
     this.onTouched = fn;
   }
 
-  private selectPage(page:number, event?:MouseEvent):void {
+  public selectPage(page:number, event?:MouseEvent):void {
     if (event) {
       event.preventDefault();
     }
diff --git a/components/pagination/readme.md b/components/pagination/readme.md
index 5276790309..747624a9a9 100644
--- a/components/pagination/readme.md
+++ b/components/pagination/readme.md
@@ -24,12 +24,12 @@ export class PaginationComponent implements ControlValueAccessor, OnInit, IPagin
   @Input() public lastText:string;
   @Input() public rotate:boolean;
 
-  @Input() private disabled:boolean;
+  @Input() public disabled:boolean;
   @Input() public get itemsPerPage():number {}
-  @Input() private get totalItems():number {}
+  @Input() public get totalItems():number {}
 
-  @Output() private numPages:EventEmitter<number> = new EventEmitter(false);
-  @Output() private pageChanged:EventEmitter<IPageChangedEvent> = new EventEmitter(false);
+  @Output() public numPages:EventEmitter<number> = new EventEmitter(false);
+  @Output() public pageChanged:EventEmitter<IPageChangedEvent> = new EventEmitter(false);
 
 @Component({
   selector: 'pager[ngModel]',
diff --git a/components/progressbar/bar.component.ts b/components/progressbar/bar.component.ts
index 6ecb2210bb..4f069756c2 100644
--- a/components/progressbar/bar.component.ts
+++ b/components/progressbar/bar.component.ts
@@ -20,6 +20,7 @@ import { ProgressDirective } from './progress.directive';
 })
 export class BarComponent implements OnInit, OnDestroy {
   @Input() public type:string;
+  public max:number;
 
   @Input()
   public get value():number {
diff --git a/components/progressbar/readme.md b/components/progressbar/readme.md
index ed6c596972..915b5c7569 100644
--- a/components/progressbar/readme.md
+++ b/components/progressbar/readme.md
@@ -32,10 +32,10 @@ export class BarComponent implements OnInit, OnDestroy {
   selector: 'progressbar, [progressbar]'
 })
 export class ProgressbarComponent {
-  @Input() private animate:boolean;
-  @Input() private max:number;
-  @Input() private type:string;
-  @Input() private value:number;
+  @Input() public animate:boolean;
+  @Input() public max:number;
+  @Input() public type:string;
+  @Input() public value:number;
 }```
 
 ### Properties
diff --git a/components/rating/rating.component.ts b/components/rating/rating.component.ts
index 3e26133f43..1ca983d3a4 100644
--- a/components/rating/rating.component.ts
+++ b/components/rating/rating.component.ts
@@ -32,12 +32,12 @@ export class RatingComponent implements ControlValueAccessor, OnInit {
   public onTouched:any = Function.prototype;
 
   public cd:NgModel;
-  private range:Array<any>;
-  private value:number;
+  public range:Array<any>;
+  public value:number;
   private preValue:number;
 
   @HostListener('keydown', ['$event'])
-  protected onKeydown(event:KeyboardEvent):void {
+  public onKeydown(event:KeyboardEvent):void {
     if ([37, 38, 39, 40].indexOf(event.which) === -1) {
       return;
     }
@@ -87,7 +87,7 @@ export class RatingComponent implements ControlValueAccessor, OnInit {
     }
   }
 
-  protected reset():void {
+  public reset():void {
     this.value = this.preValue;
     this.onLeave.emit(this.value);
   }
diff --git a/components/rating/readme.md b/components/rating/readme.md
index 8f3274abff..7e7ca0a08a 100644
--- a/components/rating/readme.md
+++ b/components/rating/readme.md
@@ -12,15 +12,15 @@ import { RatingModule } from 'ng2-bootstrap/components/rating';
   selector: 'rating[ngModel]'
 })
 export class RatingComponent implements ControlValueAccessor, OnInit {
-  @Input() private max:number;
-  @Input() private stateOn:string;
-  @Input() private stateOff:string;
-  @Input() private readonly:boolean;
-  @Input() private titles:Array<string>;
-  @Input() private ratingStates:{stateOn:string, stateOff:string}[];
+  @Input() public max:number;
+  @Input() public stateOn:string;
+  @Input() public stateOff:string;
+  @Input() public readonly:boolean;
+  @Input() public titles:Array<string>;
+  @Input() public ratingStates:{stateOn:string, stateOff:string}[];
 
-  @Output() private onHover:EventEmitter<number> = new EventEmitter(false);
-  @Output() private onLeave:EventEmitter<number> = new EventEmitter(false);
+  @Output() public onHover:EventEmitter<number> = new EventEmitter(false);
+  @Output() public onLeave:EventEmitter<number> = new EventEmitter(false);
 }
 ```
 
diff --git a/components/tabs/tabset.component.ts b/components/tabs/tabset.component.ts
index 36e228260e..c4cf7f02f5 100644
--- a/components/tabs/tabset.component.ts
+++ b/components/tabs/tabset.component.ts
@@ -40,7 +40,7 @@ export class TabsetComponent implements OnInit, OnDestroy {
     return this._type;
   };
 
-  @HostBinding('class.tab-container') protected clazz:boolean = true;
+  @HostBinding('class.tab-container') public clazz:boolean = true;
 
   public set vertical(value:boolean) {
     this._vertical = value;
@@ -58,12 +58,12 @@ export class TabsetComponent implements OnInit, OnDestroy {
   }
 
   public tabs:Array<TabDirective> = [];
+  public classMap:any = {};
 
   private isDestroyed:boolean;
   private _vertical:boolean;
   private _justified:boolean;
   private _type:string;
-  private classMap:any = {};
 
   public ngOnInit():void {
     this.type = this.type !== 'undefined' ? this.type : 'tabs';
diff --git a/components/timepicker/readme.md b/components/timepicker/readme.md
index 785fe20efd..8fa80bfb54 100644
--- a/components/timepicker/readme.md
+++ b/components/timepicker/readme.md
@@ -13,17 +13,17 @@ import { TimepickerModule } from 'ng2-bootstrap/components/timepicker';
 })
 export class TimepickerComponent implements ControlValueAccessor, OnInit {
   // config
-  @Input() private hourStep:number;
-  @Input() private minuteStep:number;
-  @Input() private readonlyInput:boolean;
-  @Input() private mousewheel:boolean;
-  @Input() private arrowkeys:boolean;
-  @Input() private showSpinners:boolean;
-  @Input() private min:Date;
-  @Input() private max:Date;
-  @Input() private meridians:Array<string> = ['AM', 'PM']; // ??
+  @Input() public hourStep:number;
+  @Input() public minuteStep:number;
+  @Input() public readonlyInput:boolean;
+  @Input() public mousewheel:boolean;
+  @Input() public arrowkeys:boolean;
+  @Input() public showSpinners:boolean;
+  @Input() public min:Date;
+  @Input() public max:Date;
+  @Input() public meridians:Array<string> = ['AM', 'PM']; // ??
 
-  @Input() private get showMeridian() {}
+  @Input() public get showMeridian() {}
 }
 ```
 
diff --git a/components/timepicker/timepicker.component.ts b/components/timepicker/timepicker.component.ts
index 74777c04c0..286470f06e 100644
--- a/components/timepicker/timepicker.component.ts
+++ b/components/timepicker/timepicker.component.ts
@@ -119,16 +119,20 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
   public onChange:any = Function.prototype;
   public onTouched:any = Function.prototype;
 
+  // input values
+  public hours:string;
+  public minutes:string;
+
+  // validation
+  public invalidHours:any;
+  public invalidMinutes:any;
+
   // result value
   private _selected:Date = new Date();
 
   private _showMeridian:boolean;
   private meridian:any; // ??
 
-  // input values
-  private hours:string;
-  private minutes:string;
-
   private get selected():Date {
     return this._selected;
   }
@@ -141,10 +145,6 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
     }
   }
 
-  // validation
-  private invalidHours:any;
-  private invalidMinutes:any;
-
   public constructor(@Self() cd:NgModel) {
     this.cd = cd;
     cd.valueAccessor = this;
@@ -196,7 +196,7 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
     this.onTouched = fn;
   }
 
-  protected updateHours():void {
+  public updateHours():void {
     if (this.readonlyInput) {
       return;
     }
@@ -224,7 +224,8 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
     }
   }
 
-  protected hoursOnBlur(/*event:Event*/):void {
+  // tslint:disable-next-line:no-unused-variable
+  public hoursOnBlur(event:Event):void {
     if (this.readonlyInput) {
       return;
     }
@@ -235,7 +236,7 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
     }
   }
 
-  protected updateMinutes():void {
+  public updateMinutes():void {
     if (this.readonlyInput) {
       return;
     }
@@ -263,7 +264,8 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
     }
   }
 
-  protected minutesOnBlur(/*event:Event*/):void {
+  // tslint:disable-next-line:no-unused-variable
+  public minutesOnBlur(event:Event):void {
     if (this.readonlyInput) {
       return;
     }
@@ -273,30 +275,55 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
     }
   }
 
-  protected incrementHours():void {
+  public incrementHours():void {
     if (!this.noIncrementHours()) {
       this.addMinutesToSelected(this.hourStep * 60);
     }
   }
 
-  protected decrementHours():void {
+  public decrementHours():void {
     if (!this.noDecrementHours()) {
       this.addMinutesToSelected(-this.hourStep * 60);
     }
   }
 
-  protected incrementMinutes():void {
+  public incrementMinutes():void {
     if (!this.noIncrementMinutes()) {
       this.addMinutesToSelected(this.minuteStep);
     }
   }
 
-  protected decrementMinutes():void {
+  public decrementMinutes():void {
     if (!this.noDecrementMinutes()) {
       this.addMinutesToSelected(-this.minuteStep);
     }
   }
 
+  public noIncrementHours():boolean {
+    let incrementedSelected = addMinutes(this.selected, this.hourStep * 60);
+    return incrementedSelected > this.max ||
+      (incrementedSelected < this.selected && incrementedSelected < this.min);
+  }
+
+  public noDecrementHours():boolean {
+    let decrementedSelected = addMinutes(this.selected, -this.hourStep * 60);
+    return decrementedSelected < this.min ||
+      (decrementedSelected > this.selected && decrementedSelected > this.max);
+  }
+
+  public noIncrementMinutes():boolean {
+    let incrementedSelected = addMinutes(this.selected, this.minuteStep);
+    return incrementedSelected > this.max ||
+      (incrementedSelected < this.selected && incrementedSelected < this.min);
+  }
+
+  public noDecrementMinutes():boolean {
+    let decrementedSelected = addMinutes(this.selected, -this.minuteStep);
+    return decrementedSelected < this.min ||
+      (decrementedSelected > this.selected && decrementedSelected > this.max);
+
+  }
+
   protected toggleMeridian():void {
     if (!this.noToggleMeridian()) {
       let sign = this.selected.getHours() < 12 ? 1 : -1;
@@ -361,31 +388,6 @@ export class TimepickerComponent implements ControlValueAccessor, OnInit {
       : value.toString();
   }
 
-  private noIncrementHours():boolean {
-    let incrementedSelected = addMinutes(this.selected, this.hourStep * 60);
-    return incrementedSelected > this.max ||
-      (incrementedSelected < this.selected && incrementedSelected < this.min);
-  }
-
-  private noDecrementHours():boolean {
-    let decrementedSelected = addMinutes(this.selected, -this.hourStep * 60);
-    return decrementedSelected < this.min ||
-      (decrementedSelected > this.selected && decrementedSelected > this.max);
-  }
-
-  private noIncrementMinutes():boolean {
-    let incrementedSelected = addMinutes(this.selected, this.minuteStep);
-    return incrementedSelected > this.max ||
-      (incrementedSelected < this.selected && incrementedSelected < this.min);
-  }
-
-  private noDecrementMinutes():boolean {
-    let decrementedSelected = addMinutes(this.selected, -this.minuteStep);
-    return decrementedSelected < this.min ||
-      (decrementedSelected > this.selected && decrementedSelected > this.max);
-
-  }
-
   private addMinutesToSelected(minutes:any):void {
     this.selected = addMinutes(this.selected, minutes);
     this.refresh();
diff --git a/components/tooltip/readme.md b/components/tooltip/readme.md
index 91b25eb2ef..8db842e8c4 100644
--- a/components/tooltip/readme.md
+++ b/components/tooltip/readme.md
@@ -10,7 +10,7 @@ import { TooltipModule } from 'ng2-bootstrap/components/tooltip';
 // class Tooltip implements OnInit
 @Directive({ selector: '[tooltip]' })
 export class TooltipDirective {
-  @Input('tooltip') private content:string;
+  @Input('tooltip') public content:string;
   @Input('tooltipHtml') public htmlContent:string | TemplateRef<any>;
   @Input('tooltipPlacement') private placement:string = 'top';
   @Input('tooltipIsOpen') private isOpen:boolean;
diff --git a/components/tooltip/tooltip-container.component.ts b/components/tooltip/tooltip-container.component.ts
index 21a3d1ec05..6aaf97e060 100644
--- a/components/tooltip/tooltip-container.component.ts
+++ b/components/tooltip/tooltip-container.component.ts
@@ -30,12 +30,12 @@ import { TooltipOptions } from './tooltip-options.class';
 })
 export class TooltipContainerComponent implements AfterViewInit {
   /* tslint:disable */
-  private classMap:any;
-  private top:string = '-1000px';
-  private left:string = '-1000px';
-  private display:string = 'block';
-  private content:string;
-  private htmlContent:string | TemplateRef<any>;
+  public classMap:any;
+  public top:string = '-1000px';
+  public left:string = '-1000px';
+  public display:string = 'block';
+  public content:string;
+  public htmlContent:string | TemplateRef<any>;
   private placement:string;
   private popupClass:string;
   private animation:boolean;
diff --git a/components/typeahead/typeahead-container.component.ts b/components/typeahead/typeahead-container.component.ts
index db1dc05ef7..66d842cf6b 100644
--- a/components/typeahead/typeahead-container.component.ts
+++ b/components/typeahead/typeahead-container.component.ts
@@ -71,12 +71,13 @@ export class TypeaheadContainerComponent {
   public query:any;
   public element:ElementRef;
   public isFocused:boolean = false;
+  public top:string;
+  public left:string;
+  public display:string;
+
   private _active:any;
   private _matches:Array<any> = [];
   private _field:string;
-  private top:string;
-  private left:string;
-  private display:string;
   private placement:string;
 
   public constructor(element:ElementRef, options:TypeaheadOptions) {
@@ -168,7 +169,7 @@ export class TypeaheadContainerComponent {
     return itemStr;
   }
 
-  protected focusLost():void {
+  public focusLost():void {
     this.isFocused = false;
   }
 
diff --git a/package.json b/package.json
index 40381315e8..95496a616f 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "flow.compile:common": "ngc -p tsconfig.publish.json",
     "flow.compile:system": "node ./.config/bundle-system.js",
     "flow.copy:src": "cpy ng2-bootstrap.ts \"components/*.ts\" ts --parents",
-    "flow.clean": "del-cli bundles coverage demo-build \"components/**/*.+(js|d.ts|js.map)\" dist \"ng2-bootstrap.+(js|d.ts|js.map)\"",
+    "flow.clean": "del-cli bundles coverage demo-build \"components/**/*.+(js|d.ts|js.map|metadata.json)\" dist \"ng2-bootstrap.+(js|d.ts|js.map|metadata.json)\" factories",
     "flow.deploy:gh-pages": "npm run flow.build:prod && gh-pages -d demo-build",
     "flow.eslint": "eslint --ignore-path .gitignore  --ext js --fix . .config",
     "flow.tslint": "gulp lint",
@@ -52,22 +52,23 @@
     "moment": "2.15.1"
   },
   "peerDependencies": {
-    "@angular/common": "2.0.0",
-    "@angular/compiler": "2.0.0",
-    "@angular/core": "2.0.0",
-    "@angular/forms": "2.0.0"
+    "@angular/common": "2.0.1",
+    "@angular/compiler": "2.0.1",
+    "@angular/core": "2.0.1",
+    "@angular/forms": "2.0.1"
   },
   "devDependencies": {
-    "@angular/common": "2.0.0",
-    "@angular/compiler": "2.0.0",
-    "@angular/compiler-cli": "0.6.2",
-    "@angular/core": "2.0.0",
-    "@angular/forms": "2.0.0",
-    "@angular/platform-browser": "2.0.0",
-    "@angular/platform-browser-dynamic": "2.0.0",
-    "@angular/router": "3.0.0",
+    "@angular/common": "2.0.1",
+    "@angular/compiler": "2.0.1",
+    "@angular/compiler-cli": "0.6.3",
+    "@angular/core": "2.0.1",
+    "@angular/forms": "2.0.1",
+    "@angular/platform-browser": "2.0.1",
+    "@angular/platform-browser-dynamic": "2.0.1",
+    "@angular/platform-server": "2.0.1",
+    "@angular/router": "3.0.1",
     "@types/jasmine": "2.2.34",
-    "@types/node": "6.0.39",
+    "@types/node": "6.0.41",
     "@types/webpack": "1.12.34",
     "async": "2.0.1",
     "bootstrap": "3.3.7",
@@ -76,9 +77,9 @@
     "conventional-github-releaser": "1.1.3",
     "core-js": "2.4.1",
     "cpy-cli": "1.0.1",
-    "cross-env": "2.0.1",
+    "cross-env": "3.0.0",
     "del-cli": "0.2.0",
-    "es6-promise": "3.3.1",
+    "es6-promise": "4.0.2",
     "es6-shim": "0.35.1",
     "es7-reflect-metadata": "1.6.0",
     "eslint-config-valorsoft": "0.1.0",
@@ -96,7 +97,7 @@
     "reflect-metadata": "0.1.8",
     "require-dir": "0.3.0",
     "rxjs": "5.0.0-beta.12",
-    "systemjs-builder": "0.15.31",
+    "systemjs-builder": "0.15.32",
     "tslint-config-valorsoft": "1.1.1",
     "typedoc": "0.4.5",
     "typescript": "2.0.3",