diff --git a/skeleton-webpack/README.md b/skeleton-webpack/README.md
index b33f626ec..8d7cda30e 100644
--- a/skeleton-webpack/README.md
+++ b/skeleton-webpack/README.md
@@ -2,7 +2,7 @@
 
 ## Getting started
 
-Before you start, make sure you have a working [NodeJS](http://nodejs.org/) environment, preferably with NPM 3.
+Before you start, make sure you have a recent version of [NodeJS](http://nodejs.org/) environment *>=4.0* with NPM 3.
 
 From the project folder, execute the following commands:
 
diff --git a/skeleton-webpack/config/select-language.js b/skeleton-webpack/config/select-language.js
index bfd1857b4..d4677314b 100644
--- a/skeleton-webpack/config/select-language.js
+++ b/skeleton-webpack/config/select-language.js
@@ -1,6 +1,14 @@
 const helpers = require('./helpers');
 
-if (!!helpers.package.language) {
+if (!helpers.package.language) {
+  if (process.env.AURELIA_LANGUAGE) {
+    try {
+      helpers.selectLanguage(process.env.AURELIA_LANGUAGE);
+    } catch (e) {
+      console.error(e.message);
+    }
+    return;
+  }
   const inquirer = require('inquirer');
   inquirer.prompt([
     {
diff --git a/skeleton-webpack/package.json b/skeleton-webpack/package.json
index 304659646..2e87ce82e 100644
--- a/skeleton-webpack/package.json
+++ b/skeleton-webpack/package.json
@@ -33,7 +33,7 @@
     "server": "npm run server:dev",
     "server:dev": "npm run webpack-dev-server -- --config config/webpack.development.js --inline --progress --profile --watch",
     "server:dev:hmr": "npm run server:dev -- --hot",
-    "server:prod": "http-server dist --cors",
+    "server:prod": "./node_modules/.bin/http-server dist --cors",
     "electron:setup": "npm install source-map-support --save && npm install concurrently electron-debug electron-packager electron-prebuilt express minimist webpack-dev-middleware webpack-hot-middleware installed-local-modules flat-npm-dependencies lodash --save-dev && typings install dt~github-electron dt~node --save-dev -G",
     "electron:start:hot": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./config/electron.entry.development",
     "electron:start:hot-server": "npm run node-babel -- config/electron.hot-server.js",
@@ -178,6 +178,7 @@
     "protractor": "^3.3.0",
     "raw-loader": "^0.5.1",
     "recursive-readdir-sync": "^1.0.6",
+    "rimraf": "^2.5.2",
     "source-map-loader": "^0.1.5",
     "style-loader": "^0.13.1",
     "ts-babel-node-extendable": "^1.0.0",