diff --git a/package.json b/package.json
index 17fcf632..23b5e6dd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular2-modal",
   "description": "Angular2 Modal (dialog) window.",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/shlomiassaf/angular2-modal.git"
diff --git a/src/angular2-modal/package.json b/src/angular2-modal/package.json
index 3096f688..2857ef55 100644
--- a/src/angular2-modal/package.json
+++ b/src/angular2-modal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular2-modal",
   "description": "Angular2 Modal (dialog) window.",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "libConfig": {
     "entry": "angular2-modal",
     "inlineResources": true,
diff --git a/src/angular2-modal/plugins/bootstrap/package.json b/src/angular2-modal/plugins/bootstrap/package.json
index f27700cc..828aee5a 100644
--- a/src/angular2-modal/plugins/bootstrap/package.json
+++ b/src/angular2-modal/plugins/bootstrap/package.json
@@ -1,3 +1,3 @@
 {
-  "version": "3.0.0"
+  "version": "3.0.1"
 }
diff --git a/src/angular2-modal/plugins/js-native/package.json b/src/angular2-modal/plugins/js-native/package.json
index f27700cc..828aee5a 100644
--- a/src/angular2-modal/plugins/js-native/package.json
+++ b/src/angular2-modal/plugins/js-native/package.json
@@ -1,3 +1,3 @@
 {
-  "version": "3.0.0"
+  "version": "3.0.1"
 }
diff --git a/src/angular2-modal/plugins/vex/package.json b/src/angular2-modal/plugins/vex/package.json
index f27700cc..828aee5a 100644
--- a/src/angular2-modal/plugins/vex/package.json
+++ b/src/angular2-modal/plugins/vex/package.json
@@ -1,3 +1,3 @@
 {
-  "version": "3.0.0"
+  "version": "3.0.1"
 }
diff --git a/src/angular2-modal/src/overlay/overlay.service.ts b/src/angular2-modal/src/overlay/overlay.service.ts
index d929de5a..b26cc3eb 100644
--- a/src/angular2-modal/src/overlay/overlay.service.ts
+++ b/src/angular2-modal/src/overlay/overlay.service.ts
@@ -1,4 +1,4 @@
-import { ViewContainerRef, Injectable } from '@angular/core';
+import { ViewContainerRef, Injectable, Injector } from '@angular/core';
 
 import { OverlayRenderer, OverlayConfig } from '../models/tokens';
 import { DialogRefStack } from '../models/dialog-ref-stack';
@@ -14,7 +14,7 @@ export class Overlay {
     return _stack.length;
   }
 
-  constructor(private _modalRenderer: OverlayRenderer) {
+  constructor(private _modalRenderer: OverlayRenderer, protected injector: Injector) {
   }
 
   /**
@@ -69,6 +69,10 @@ export class Overlay {
       config.context.normalize();
     }
 
+    if (!config.injector) {
+      config.injector = this.injector;
+    }
+
     let dialog = new DialogRef<any>(this, config.context || {});
     dialog.inElement = config.context && !!config.context.inElement;
 
diff --git a/src/demo/app/app.module.ts b/src/demo/app/app.module.ts
index 34b0f08c..b992573d 100644
--- a/src/demo/app/app.module.ts
+++ b/src/demo/app/app.module.ts
@@ -6,7 +6,6 @@ import { ModalModule } from 'angular2-modal';
 
 import { ENV_PROVIDERS } from './environment';
 import { SharedModule } from './shared.module';
-import { BootstrapDemoModule } from './bootstrap-demo/bootstrap-demo.module';
 import { VexDemoModule } from './vex-demo/vex-demo.module';
 import { JSNativeDemoModule } from './js-native-demo/js-native-demo.module';
 
@@ -23,7 +22,6 @@ import { InAppModalModule } from './home/in-app-plugin/index';
     RouterModule.forRoot(routes, { useHash: true, preloadingStrategy: PreloadAllModules }),
     SharedModule.forRoot(),
     ModalModule.forRoot(),
-    BootstrapDemoModule,
     VexDemoModule,
     JSNativeDemoModule,
     InAppModalModule
diff --git a/src/demo/app/app.routes.ts b/src/demo/app/app.routes.ts
index 1bfd30f4..667f357d 100644
--- a/src/demo/app/app.routes.ts
+++ b/src/demo/app/app.routes.ts
@@ -4,6 +4,7 @@ import { Home } from './home/home';
 
 export const routes: Routes = [
   { path: 'home', component: Home },
+  { path: 'bootstrap-demo', loadChildren: './bootstrap-demo/bootstrap-demo.module#BootstrapDemoModule' },
   { path: '', redirectTo: 'home', pathMatch: 'full'}
 ];
 
diff --git a/src/demo/app/bootstrap-demo/bootstrap-demo.routes.ts b/src/demo/app/bootstrap-demo/bootstrap-demo.routes.ts
index 6b6ace0f..4583195f 100644
--- a/src/demo/app/bootstrap-demo/bootstrap-demo.routes.ts
+++ b/src/demo/app/bootstrap-demo/bootstrap-demo.routes.ts
@@ -6,7 +6,7 @@ import { BootstrapDemoPage } from './bootstrap-demo-page/bootstrap-demo-page';
 import { ModalCustomisationWizard } from './modal-customisation-wizard/modal-customisation-wizard';
 
 export const routing: ModuleWithProviders = RouterModule.forChild([
-  { path: 'bootstrap-demo', component: BootstrapDemo, children: [
+  { path: '', component: BootstrapDemo, children: [
       { path: '', component: BootstrapDemoPage, pathMatch: 'full'},
       { path: 'customizeModals', component: ModalCustomisationWizard }
     ]
diff --git a/version_cache.json b/version_cache.json
new file mode 100644
index 00000000..360e6a27
--- /dev/null
+++ b/version_cache.json
@@ -0,0 +1,6 @@
+{
+  "angular2-modal": {
+    "commit": "a5da320f0f558ba0e631785a6987e698b00f677c",
+    "version": "3.0.0"
+  }
+}