diff --git a/demo-shell-ng2/app/components/viewer/viewer.component.html b/demo-shell-ng2/app/components/viewer/viewer.component.html
index 9b5eb152db..e21dfad861 100644
--- a/demo-shell-ng2/app/components/viewer/viewer.component.html
+++ b/demo-shell-ng2/app/components/viewer/viewer.component.html
@@ -1,4 +1,3 @@
-<h1>Viewer</h1>
 <alfresco-viewer [urlFile]="'http://192.168.99.100:8080/share/proxy/alfresco/slingshot/node/content/workspace/SpacesStore/f7d0ef02-24ca-46e5-a05a-37d7d878142a/Energy_Bill_20May16.pdf'">
     <div class="mdl-spinner mdl-js-spinner is-active"></div>
 </alfresco-viewer>
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
index ad810ccdf1..60349fe626 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
@@ -17,14 +17,14 @@
 
 import { Component } from 'angular2/core';
 import { bootstrap } from 'angular2/platform/browser';
-import { ViewerComponent } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer';
+import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer';
 
 @Component({
     selector: 'my-app',
     template: `   <alfresco-viewer [urlFile]="'localTestFile.pdf'">
                     <div class="mdl-spinner mdl-js-spinner is-active"></div>
                    </alfresco-viewer>`,
-    directives: [ViewerComponent]
+    directives: [VIEWERCOMPONENT]
 })
 class MyDemoApp {
     constructor() {
@@ -32,5 +32,5 @@ class MyDemoApp {
     }
 }
 bootstrap(MyDemoApp, [
-    ViewerComponent
+    VIEWERCOMPONENT
 ]);
diff --git a/ng2-components/ng2-alfresco-viewer/ng2-alfresco-viewer.ts b/ng2-components/ng2-alfresco-viewer/ng2-alfresco-viewer.ts
index 76c8ed123c..e1ae5c51a8 100644
--- a/ng2-components/ng2-alfresco-viewer/ng2-alfresco-viewer.ts
+++ b/ng2-components/ng2-alfresco-viewer/ng2-alfresco-viewer.ts
@@ -15,4 +15,23 @@
  * limitations under the License.
  */
 
+import { ViewerComponent } from './src/viewer.component';
+
+/**
+ * ng2-alfresco-viewer, provide components to view files.
+ *
+ * Components provided:
+ *           <alfresco-viewer [urlFile]="'localTestFile.pdf'">
+ *              <div class="mdl-spinner mdl-js-spinner is-active"></div>
+ *          </alfresco-viewer>
+ */
+
 export * from './src/viewer.component';
+
+export default {
+    components: [ViewerComponent]
+};
+
+export const VIEWERCOMPONENT: [any] = [
+    ViewerComponent
+];