diff --git a/scripts/npm-build-all.sh b/scripts/npm-build-all.sh
new file mode 100755
index 0000000000..a7ea0c224d
--- /dev/null
+++ b/scripts/npm-build-all.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+components_dir="$DIR/../ng2-components"
+
+for comp_dir in $( ls "$components_dir" ); do
+  echo $comp_dir
+  test -f "$components_dir/$comp_dir/package.json" && \
+    cd "$components_dir/$comp_dir" && \
+    npm run build
+done
+
+cd ${DIR}
diff --git a/scripts/start-linked.sh b/scripts/start-linked.sh
index 1c0529c063..aa48197b5c 100755
--- a/scripts/start-linked.sh
+++ b/scripts/start-linked.sh
@@ -3,19 +3,5 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 "$DIR/npm-link-demo-shell.sh"
-
-cd "$DIR/../demo-shell-ng2"
-
-if  [[ $1 = "-install" ]]; then
-    npm install
-    npm run start
-elif  [[ $1 = "-update " ]]; then
-    npm run update
-    npm run start
-elif  [[ $1 = "-cleanInstall" ]]; then
-    npm run clean
-    npm install
-    npm run start
-else
-    npm run start
-fi
+"$DIR/npm-build-all.sh"
+"$DIR/start.sh"