diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html
index b337e0dcf9..96696aecd3 100644
--- a/demo-shell-ng2/index.html
+++ b/demo-shell-ng2/index.html
@@ -32,35 +32,9 @@
     <script src="node_modules/alfresco-core-rest-api/bundle.js"></script>
 
     <!-- 2. Configure SystemJS -->
+    <script src="systemjs.config.js"></script>
     <script>
-        System.config({
-            map: {
-                'ng2-uploader': 'node_modules/ng2-uploader',
-                'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-                'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable',
-                'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist',
-                'ng2-alfresco-login': 'node_modules/ng2-alfresco-login',
-                'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload',
-                'ng2-translate': 'node_modules/ng2-translate',
-                'rxjs': 'node_modules/rxjs'
-            },
-            packages: {
-                app: {
-                    format: 'register',
-                    defaultExtension: 'js'
-                },
-                'ng2-uploader': {defaultExtension: 'js'},
-                'ng2-alfresco-core': {defaultExtension: 'js'},
-                'ng2-alfresco-documentlist': {defaultExtension: 'js'},
-                'ng2-alfresco-login': {defaultExtension: 'js'},
-                'ng2-alfresco-upload': {defaultExtension: 'js'},
-                'ng2-alfresco-datatable': {defaultExtension: 'js'},
-                'ng2-translate': {defaultExtension: 'js'},
-                'rxjs': {defaultExtension: 'js'}
-            }
-        });
-        System.import('app/main')
-                .then(null, console.error.bind(console));
+        System.import('app/main').catch(function(err){ console.error(err); });
     </script>
 </head>
 <!-- 3. Display the application -->
diff --git a/demo-shell-ng2/systemjs.config.js b/demo-shell-ng2/systemjs.config.js
new file mode 100644
index 0000000000..8fce523963
--- /dev/null
+++ b/demo-shell-ng2/systemjs.config.js
@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+(function(global) {
+
+    // map tells the System loader where to look for things
+    var map = {
+        'ng2-uploader': 'node_modules/ng2-uploader',
+        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
+        'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable',
+        'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist',
+        'ng2-alfresco-login': 'node_modules/ng2-alfresco-login',
+        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload',
+        'ng2-translate': 'node_modules/ng2-translate',
+        'rxjs': 'node_modules/rxjs'
+    };
+
+    // packages tells the System loader how to load when no filename and/or no extension
+    var packages = {
+        app: {
+            format: 'register',
+            defaultExtension: 'js'
+        },
+        'ng2-uploader': {defaultExtension: 'js'},
+        'ng2-alfresco-core': {defaultExtension: 'js'},
+        'ng2-alfresco-documentlist': {defaultExtension: 'js'},
+        'ng2-alfresco-login': {defaultExtension: 'js'},
+        'ng2-alfresco-upload': {defaultExtension: 'js'},
+        'ng2-alfresco-datatable': {defaultExtension: 'js'},
+        'ng2-translate': {defaultExtension: 'js'},
+        'rxjs': {defaultExtension: 'js'}
+    };
+
+    var config = {
+        map: map,
+        packages: packages
+    };
+
+    System.config(config);
+
+})(this);
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index 0f5e801426..af71549360 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -1,99 +1,99 @@
 {
-    "name": "ng2-alfresco-core",
-    "description": "Alfresco Angular 2 Components core",
-    "version": "0.1.5",
-    "author": "Alfresco Software, Ltd.",
-    "scripts": {
-        "typings": "typings install",
-        "start": "npm run test && http-server -c-1 -o -p 8875 .",
-        "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
-        "tslint": "npm run tslint-service && npm run tslint-material && npm run tslint-root",
-        "tslint-service": "tslint -c tslint.json services/**/*.ts",
-        "tslint-material": "tslint -c tslint.json material/**/*.ts",
-        "tslint-root": "tslint -c tslint.json *.ts",
-        "copytemplates": "npm run copy-html && npm run copy-css && npm run copy-i18n",
-        "copy-html": "copyfiles './src/**/*.html' dist",
-        "copy-css": "copyfiles './src/**/*.css' dist",
-        "copy-i18n": "copyfiles './i18n/**/*.json' dist",
-        "licensecheck": "license-check",
-        "tsc": "tsc",
-        "pretest": "npm run build",
-        "test": "karma start karma.conf.js",
-        "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
-        "coverage": "http-server -c-1 -o -p 9875 ./coverage",
-        "prepublish": "npm run build"
+  "name": "ng2-alfresco-core",
+  "description": "Alfresco Angular 2 Components core",
+  "version": "0.1.6",
+  "author": "Alfresco Software, Ltd.",
+  "scripts": {
+    "typings": "typings install",
+    "start": "npm run test && http-server -c-1 -o -p 8875 .",
+    "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
+    "tslint": "npm run tslint-service && npm run tslint-material && npm run tslint-root",
+    "tslint-service": "tslint -c tslint.json services/**/*.ts",
+    "tslint-material": "tslint -c tslint.json material/**/*.ts",
+    "tslint-root": "tslint -c tslint.json *.ts",
+    "copytemplates": "npm run copy-html && npm run copy-css && npm run copy-i18n",
+    "copy-html": "copyfiles './src/**/*.html' dist",
+    "copy-css": "copyfiles './src/**/*.css' dist",
+    "copy-i18n": "copyfiles './i18n/**/*.json' dist",
+    "licensecheck": "license-check",
+    "tsc": "tsc",
+    "pretest": "npm run build",
+    "test": "karma start karma.conf.js",
+    "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
+    "coverage": "http-server -c-1 -o -p 9875 ./coverage",
+    "prepublish": "npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
+  },
+  "license": "Apache-2.0",
+  "contributors": [
+    {
+      "name": "Denys Vuika",
+      "email": "denis.vuyka@gmail.com"
     },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
-    },
-    "bugs": {
-        "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
-    },
-    "license": "Apache-2.0",
-    "contributors": [
-        {
-            "name": "Denys Vuika",
-            "email": "denis.vuyka@gmail.com"
-        },
-        {
-            "name": "Mario Romano",
-            "email": "mario.romano83@gmail.com"
-        }
-    ],
-    "keywords": [
-        "ng2",
-        "angular",
-        "angular2",
-        "alfresco"
-    ],
-    "dependencies": {
-        "angular2": "2.0.0-beta.15",
-        "systemjs": "0.19.26",
-        "es6-shim": "^0.35.0",
-        "reflect-metadata": "0.1.2",
-        "rxjs": "5.0.0-beta.2",
-        "ng2-translate": "^1.11.2",
-        "zone.js": "^0.6.12",
-        "es6-module-loader": "^0.17.8"
-    },
-    "peerDependencies": {
-        "angular2": "2.0.0-beta.15"
-    },
-    "devDependencies": {
-        "copyfiles": "^0.2.1",
-        "coveralls": "^2.11.9",
-        "http-server": "0.8.5",
-        "jasmine-ajax": "^3.2.0",
-        "jasmine-core": "2.4.1",
-        "karma": "~0.13.22",
-        "karma-chrome-launcher": "~1.0.1",
-        "karma-coverage": "^1.0.0",
-        "karma-jasmine": "~1.0.2",
-        "karma-mocha-reporter": "^2.0.3",
-        "license-check": "^1.0.4",
-        "remap-istanbul": "^0.6.3",
-        "traceur": "^0.0.91",
-        "tslint": "^3.8.1",
-        "typescript": "^1.8.10",
-        "typings": "^0.7.12"
-    },
-    "license-check-config": {
-        "src": [
-            "**/*.js",
-            "**/*.ts",
-            "!/**/coverage/**/*",
-            "!/**/demo/**/*",
-            "!/**/node_modules/**/*",
-            "!/**/typings/**/*",
-            "!*.js"
-        ],
-        "path": "assets/license_header.txt",
-        "blocking": false,
-        "logInfo": false,
-        "logError": true
-    },
-    "publishConfig": {
-        "registry": "http://52.16.120.219:4873/"
+    {
+      "name": "Mario Romano",
+      "email": "mario.romano83@gmail.com"
     }
+  ],
+  "keywords": [
+    "ng2",
+    "angular",
+    "angular2",
+    "alfresco"
+  ],
+  "dependencies": {
+    "angular2": "2.0.0-beta.15",
+    "systemjs": "0.19.26",
+    "es6-shim": "^0.35.0",
+    "reflect-metadata": "0.1.2",
+    "rxjs": "5.0.0-beta.2",
+    "ng2-translate": "^1.11.2",
+    "zone.js": "^0.6.12",
+    "es6-module-loader": "^0.17.8"
+  },
+  "peerDependencies": {
+    "angular2": "2.0.0-beta.15"
+  },
+  "devDependencies": {
+    "copyfiles": "^0.2.1",
+    "coveralls": "^2.11.9",
+    "http-server": "0.8.5",
+    "jasmine-ajax": "^3.2.0",
+    "jasmine-core": "2.4.1",
+    "karma": "~0.13.22",
+    "karma-chrome-launcher": "~1.0.1",
+    "karma-coverage": "^1.0.0",
+    "karma-jasmine": "~1.0.2",
+    "karma-mocha-reporter": "^2.0.3",
+    "license-check": "^1.0.4",
+    "remap-istanbul": "^0.6.3",
+    "traceur": "^0.0.91",
+    "tslint": "^3.8.1",
+    "typescript": "^1.8.10",
+    "typings": "^0.7.12"
+  },
+  "license-check-config": {
+    "src": [
+      "**/*.js",
+      "**/*.ts",
+      "!/**/coverage/**/*",
+      "!/**/demo/**/*",
+      "!/**/node_modules/**/*",
+      "!/**/typings/**/*",
+      "!*.js"
+    ],
+    "path": "assets/license_header.txt",
+    "blocking": false,
+    "logInfo": false,
+    "logError": true
+  },
+  "publishConfig": {
+    "registry": "http://52.16.120.219:4873/"
+  }
 }
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index 8748e8f795..4927c37b24 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-datatable",
   "description": "Alfresco Angular2 DataTable Component",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",