Merge remote-tracking branch 'upstream/develop' into doc-roundValue

2025-08-21 04:45:17 +00:00 · 2017-08-05 18:20:22 -04:00
parent 60c5d96037 6d83f18490
commit ea2f53e166
83 changed files with 2144 additions and 653 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,72 +0,0 @@
-# Various Node ignoramuses.
-
-logs
-*.log
-npm-debug.log*
-pids
-*.pid
-*.seed
-lib-cov
-coverage
-.grunt
-.lock-wscript
-build/Release
-node_modules
-jspm_modules
-.npm
-.node_repl_history
-
-# Various Windows ignoramuses.
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
-*.cab
-*.msi
-*.msm
-*.msp
-*.lnk
-
-# Various OSX ignoramuses.
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-._*
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Various Linux ignoramuses.
-
-.fuse_hidden*
-.directory
-.Trash-*
-
-# Various Magic Mirror ignoramuses and anti-ignoramuses.
-
-# Don't ignore the node_helper core module.
-!/modules/node_helper
-!/modules/node_helper/**
-
-# Ignore all modules except the default modules.
-/modules/**
-!/modules/default/**
-
-# Ignore changes to the custom css files.
-/css/custom.css
-
-# Ignore unnecessary files for docker
-CHANGELOG.md
-LICENSE.md
-README.md
-Gruntfile.js
-.*
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@ jspm_modules
 .npm
 .node_repl_history

+# Visual Studio Code ignoramuses.
+.vscode/
+
 # Various Windows ignoramuses.
 Thumbs.db
 ehthumbs.db
@@ -65,3 +68,13 @@ Temporary Items

 # Ignore changes to the custom css files.
 /css/custom.css
+
+# Vim
+## swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+
+## diff patch
+*.orig
+*.rej
+*.bak
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: node_js
 node_js:
+ - "8"
 - "7"
 - "6"
 - "5.1"
@@ -10,7 +11,10 @@ before_script:
 - sleep 5
 script:
 - grunt
- npm test
+- npm run test:unit
+- npm run test:e2e
+after_script:
+ - npm list
 cache:
 directories:
  - node_modules
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,34 +2,94 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## [2.1.3] - Unreleased

-## [2.1.1] - Unreleased
+### Changed
+
+### Added
+- Add `clientonly` script to start only the electron client for a remote server.
+- Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `default/calendar` module.
+- Add `.vscode/` folder to `.gitignore` to keep custom Visual Studio Code config out of git.
+- Add unit test the capitalizeFirstLetter function of newfeed module.
+- Add new unit tests for function `shorten` in calendar module.
+
+### Updated
+- Changed 'default.js' - listen on all attached interfaces by default.
+- Add execution of `npm list` after the test are ran in Travis CI.
+- Change hooks for the vendors e2e tests.
+
+### Fixed
+- Fixed issue with incorrect allignment of analog clock when displayed in the center column of the MM.
+- Fixed ipWhitelist behaviour to make empty whitelist ([]) allow any and all hosts access to the MM.
+- Fixed issue with calendar module where 'excludedEvents' count towards 'maximumEntries'.
+- Fixed issue with calendar module where global configuration of maximumEntries was not overridden by calendar specific config (see module doc).
+
+## [2.1.2] - 2017-07-01
+
+### Changed
+- Revert Docker related changes in favor of [docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror). All Docker images are outsourced. ([#856](https://github.com/MichMich/MagicMirror/pull/856))
+- Change Docker base image (Debian + Node) to an arm based distro (AlpineARM + Node) ([#846](https://github.com/MichMich/MagicMirror/pull/846))
+- Fix the dockerfile to have it running from the first time.
+
+### Added
+- Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option.
+- Add test e2e `show title newsfeed` for newsfeed module.
+- Add task to check configuration file.
+- Add test check URLs of vendors.
+- Add test of match current week number on clock module with showWeek configuration.
+- Add test default modules present modules/default/defaultmodules.js.
+- Add unit test calendar_modules function capFirst.
+- Add test for check if exists the directories present in defaults modules.
+- Add support for showing wind direction as an arrow instead of abbreviation in currentWeather module.
+- Add support for writing translation fucntions to support flexible word order
+- Add test for check if exits the directories present in defaults modules.
+- Add calendar option to set a separate date format for full day events.
+- Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
+- Add ability to change the path of the `custom.css`.
+- Add translation Dutch to Alert module.
+- Added Romanian translation.
+
+### Updated
+- Added missing keys to Polish translation.
+- Added missing key to German translation.
+- Added better translation with flexible word order to Finnish translation.
+
+### Fixed
+- Fix instruction in README for using automatically installer script.
+- Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments).
+- Fix double message about port when server is starting
+- Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW.
+- Removed unused import from js/electron.js
+- Made calendar.js respect config.timeFormat irrespecive of locale setting.
+- Fixed alignment of analog clock when a large calendar is displayed in the same side bar.
+
+## [2.1.1] - 2017-04-01

 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`

 ### Changed
 - Add `anytime` group for Compliments module.
- Compliments module can use remoteFile without default daytime arrays defined
+- Compliments module can use remoteFile without default daytime arrays defined.
 - Installer: Use init config.js from config.js.sample.
 - Switched out `rrule` package for `rrule-alt` and fixes in `ical.js` in order to fix calendar issues. ([#565](https://github.com/MichMich/MagicMirror/issues/565))
 - Make mouse events pass through the region fullscreen_above to modules below.
 - Scaled the splash screen down to make it a bit more subtle.
 - Replace HTML tables with markdown tables in README files.
 - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION` and `UPDATE_NOTIFICATION_MODULE` to Finnish translations.
- Run `npm test` on Travis automatically
+- Run `npm test` on Travis automatically.
 - Show the splash screen image even when is reboot or halted.
 - Added some missing translaton strings in the sv.json file.
 - Run task jsonlint to check translation files.
- Restructured Test Suite
+- Restructured Test Suite.

 ### Added
- Added Docker support (Pull Request [#673](https://github.com/MichMich/MagicMirror/pull/673))
- Calendar-specific support for `maximumEntries`, and ` maximumNumberOfDays`
+- Added Docker support (Pull Request [#673](https://github.com/MichMich/MagicMirror/pull/673)).
+- Calendar-specific support for `maximumEntries`, and ` maximumNumberOfDays`.
 - Add loaded function to modules, providing an async callback.
 - Made default newsfeed module aware of gesture events from [MMM-Gestures](https://github.com/thobach/MMM-Gestures)
- Add use pm2 for manager process into Installer RaspberryPi script
- Russian Translation
- Afrikaans Translation
+- Add use pm2 for manager process into Installer RaspberryPi script.
+- Russian Translation.
+- Afrikaans Translation.
 - Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM.
 - Init tests using mocha.
 - Option to use RegExp in Calendar's titleReplace.
@@ -37,24 +97,32 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Icelandic Translation.
 - Add use a script to prevent when is run by SSH session set DISPLAY enviroment.
 - Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE.
- Option to give each calendar a different color
- Option for colored min-temp and max-temp
- Add test e2e helloworld
- Add test e2e enviroment
- Add `chai-as-promised` npm module to devDependencies
- Basic set of tests for clock module
- Run e2e test in Travis
+- Option to give each calendar a different color.
+- Option for colored min-temp and max-temp.
+- Add test e2e helloworld.
+- Add test e2e enviroment.
+- Add `chai-as-promised` npm module to devDependencies.
+- Basic set of tests for clock module.
+- Run e2e test in Travis.
 - Estonian Translation.
- Add  test for compliments module for parts of day
+- Add test for compliments module for parts of day.
 - Korean Translation.
- Added console warning on startup when deprecated config options are used
- Add option to display temperature unit label to the current weather module
- Added ability to disable wrapping of news items
+- Added console warning on startup when deprecated config options are used.
+- Add option to display temperature unit label to the current weather module.
+- Added ability to disable wrapping of news items.
 - Added in the ability to hide events in the calendar module based on simple string filters.
 - Updated Norwegian translation.
- Added hideLoading option for News Feed module
+- Added hideLoading option for News Feed module.
 - Added configurable dateFormat to clock module.
 - Added multiple calendar icon support.
+- Added tests for Translations, dev argument, version, dev console.
+- Added test anytime feature compliments module.
+- Added test ipwhitelist configuration directive.
+- Added test for calendar module: default, basic-auth, backward compability, fail-basic-auth.
+- Added meta tags to support fullscreen mode on iOS (for server mode)
+- Added `ignoreOldItems` and `ignoreOlderThan` options to the News Feed module
+- Added test for MM_PORT enviroment variable.
+- Added a configurable Week section to the clock module.

 ### Fixed
 - Update .gitignore to not ignore default modules folder.
@@ -63,8 +131,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Fix an issue where the analog clock looked scrambled. ([#611](https://github.com/MichMich/MagicMirror/issues/611))
 - If units is set to imperial, the showRainAmount option of weatherforecast will show the correct unit.
 - Module currentWeather: check if temperature received from api is defined.
- Fix an issue with module hidden status changing to `true` although lock string prevented showing it
+- Fix an issue with module hidden status changing to `true` although lock string prevented showing it.
 - Fix newsfeed module bug (removeStartTags)
+- Fix when is set MM_PORT enviroment variable.
 - Fixed missing animation on `this.show(speed)` when module is alone in a region.

 ## [2.1.0] - 2016-12-31
--- a/19
+++ b/19
@@ -1,19 +0,0 @@
-FROM node:latest
-
-RUN apt-get update && apt-get -y install dos2unix
-
-WORKDIR /opt/magic_mirror
-COPY . .
-COPY /modules unmount_modules
-COPY /config unmount_config
-
-ENV NODE_ENV production
-ENV MM_PORT 8080
-
-RUN npm install
-
-RUN ["dos2unix", "docker-entrypoint.sh"]
-RUN ["chmod", "+x", "docker-entrypoint.sh"]
-
-EXPOSE $MM_PORT
-ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"]
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,12 +6,20 @@ module.exports = function(grunt) {
 			options: {
 				configFile: ".eslintrc.json"
 			},
-			target: ["js/*.js", "modules/default/*.js", "modules/default/*/*.js",
-				"serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js",
-				"!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js",
+			target: [
+				"js/*.js",
+				"modules/default/*.js",
+				"modules/default/*/*.js",
+				"serveronly/*.js",
+				"*.js",
+				"tests/**/*.js",
+				"!modules/default/alert/notificationFx.js",
+				"!modules/default/alert/modernizr.custom.js",
+				"!modules/default/alert/classie.js",
 				"config/*",
-				"translations/translations.js", "vendor/vendor.js"
-
+				"translations/translations.js",
+				"vendor/vendor.js",
+				"modules/node_modules/node_helper/index.js"
 			]
 		},
 		stylelint: {
@@ -19,14 +27,26 @@ module.exports = function(grunt) {
 				options: {
 					configFile: ".stylelintrc"
 				},
-				src: ["css/main.css", "modules/default/calendar/calendar.css", "modules/default/clock/clock_styles.css", "modules/default/currentweather/currentweather.css", "modules/default/weatherforcast/weatherforcast.css"]
+				src: [
+					"css/main.css",
+					"modules/default/calendar/calendar.css",
+					"modules/default/clock/clock_styles.css",
+					"modules/default/currentweather/currentweather.css",
+					"modules/default/weatherforcast/weatherforcast.css"
+				]
 			}
 		},
 		jsonlint: {
 			main: {
-				src: ["package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json",
-					"modules/default/*/translations/*.json", "installers/pm2_MagicMirror.json",
-					"vendor/package.js"],
+				src: [
+					"package.json",
+					".eslintrc.json",
+					".stylelintrc",
+					"translations/*.json",
+					"modules/default/*/translations/*.json",
+					"installers/pm2_MagicMirror.json",
+					"vendor/package.js"
+				],
 				options: {
 					reporter: "jshint"
 				}
@@ -58,11 +78,20 @@ module.exports = function(grunt) {
 						"MD038": false
 					}
 				},
-				src: ["README.md", "CHANGELOG.md", "LICENSE.md", "modules/README.md", "modules/default/**/*.md", "!modules/default/calendar/vendor/ical.js/readme.md"]
+				src: [
+					"README.md",
+					"CHANGELOG.md",
+					"LICENSE.md",
+					"modules/README.md",
+					"modules/default/**/*.md",
+					"!modules/default/calendar/vendor/ical.js/readme.md"
+				]
 			}
 		},
 		yamllint: {
-			all: [".travis.yml"]
+			all: [
+				".travis.yml"
+			]
 		}
 	});
 	grunt.loadNpmTasks("grunt-eslint");
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Electron, the app wrapper around MagicMirror², only supports the Raspberry Pi 2

 Execute the following command on your Raspberry Pi to install MagicMirror²:
 ````
-curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh | bash
+bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh)"
 ````

 ### Manual Installation
@@ -48,6 +48,11 @@ curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installer
 ### Server Only
 In some cases, you want to start the application without an actual app window. In this case, you can start MagicMirror² in server only mode by manually running `node serveronly` or using Docker. This will start the server, after which you can open the application in your browser of choice. Detailed description below.

+### Client Only
+When you have a server running remotely and want to connect a standalone client to this instance, you can manually run `node clientonly --address 192.168.1.5 --port 8080`. (Specify the ip address and port number of the server)
+
+**Important:** Make sure that you whitelist the interface/ip in the server config where you want the client to connect to, otherwise it will not be allowed to connect to the server
+
 #### Docker

 MagicMirror² in server only mode can be deployed using [Docker](https://docker.com). After a successful [Docker installation](https://docs.docker.com/engine/installation/) you just need to execute the following command in the shell:
@@ -59,7 +64,7 @@ docker run  -d \
 			--volume ~/magic_mirror/config:/opt/magic_mirror/config \
 			--volume ~/magic_mirror/modules:/opt/magic_mirror/modules \
 			--name magic_mirror \
-			MichMich/MagicMirror
+			bastilimbach/docker-magicmirror
 ```

 | **Volumes** | **Description** |
@@ -75,6 +80,8 @@ var config = {
 };
 ```

+If you want to run the server on a raspberry pi, use the `raspberry` tag. (bastilimbach/docker-magicmirror:raspberry)
+
 #### Manual

 1. Download and install the latest Node.js version.
@@ -104,6 +111,11 @@ Type `git status` to see your changes, if there are any, you can reset them with
 1. Duplicate `config/config.js.sample` to `config/config.js`. **Note:** If you used the installer script. This step is already done for you.
 2. Modify your required settings.

+Note: You'll can check your configuration running the follow command:
+```bash
+npm run config:check
+```
+
 The following properties can be configured:

 | **Option** | **Description** |
@@ -117,7 +129,7 @@ The following properties can be configured:
 | `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
 | `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
 | `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
-
+| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. |

 Module configuration:

--- a/clientonly/index.js
+++ b/clientonly/index.js
@@ -0,0 +1,97 @@
+/* jshint esversion: 6 */
+
+"use strict";
+
+// Use seperate scope to prevent global scope pollution
+(function () {
+	var config = {};
+
+	// Helper function to get server address/hostname from either the commandline or env
+	function getServerAddress() {
+		// Helper function to get command line parameters
+		// Assumes that a cmdline parameter is defined with `--key [value]`
+		function getCommandLineParameter(key, defaultValue = undefined) {
+			var index = process.argv.indexOf(`--${key}`);
+			var value = index > -1 ? process.argv[index + 1] : undefined;
+			return value !== undefined ? String(value) : defaultValue;
+		}
+
+		// Prefer command line arguments over environment variables
+		["address", "port"].forEach((key) => {
+			config[key] = getCommandLineParameter(key, process.env[key.toUpperCase()]);
+		})
+	}
+
+	function getServerConfig(url) {
+		// Return new pending promise
+		return new Promise((resolve, reject) => {
+			// Select http or https module, depending on reqested url
+			const lib = url.startsWith("https") ? require("https") : require("http");
+			const request = lib.get(url, (response) => {
+				var configData = "";
+
+				// Gather incomming data
+				response.on("data", function(chunk) {
+					configData += chunk;
+				});
+				// Resolve promise at the end of the HTTP/HTTPS stream
+				response.on("end", function() {
+					resolve(JSON.parse(configData));
+				});
+			});
+
+			request.on("error", function(error) {
+				reject(new Error(`Unable to read config from server (${url} (${error.message}`));
+			});
+		})
+	};
+
+	function fail(message, code = 1) {
+		if (message !== undefined && typeof message === "string") {
+			console.log(message);
+		} else {
+			console.log("Usage: 'node clientonly --address 192.168.1.10 --port 8080'");
+		}
+		process.exit(code);
+	}
+
+	getServerAddress();
+
+	(config.address && config.port) || fail();
+
+	// Only start the client if a non-local server was provided
+	if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) {
+		getServerConfig(`http://${config.address}:${config.port}/config/`)
+			.then(function (config) {
+				// Pass along the server config via an environment variable
+				var env = Object.create(process.env);
+				var options = { env: env };
+				config.address = config.address;
+				config.port = config.port;
+				env.config = JSON.stringify(config);
+
+				// Spawn electron application
+				const electron = require("electron");
+				const child = require("child_process").spawn(electron, ["js/electron.js"], options);
+
+				// Pipe all child process output to current stdout
+				child.stdout.on("data", function (buf) {
+					process.stdout.write(`Client: ${buf}`);
+				});
+
+				// Pipe all child process errors to current stderr
+				child.stderr.on("data", function (buf) {
+					process.stderr.write(`Client: ${buf}`);
+				});
+
+				child.on("error", function (err) {
+					process.stdout.write(`Client: ${err}`);
+				});
+			})
+			.catch(function (reason) {
+				fail(`Unable to connect to server: (${reason})`);
+			});
+	} else {
+		fail();
+	}
+}());
--- a/config/config.js.sample
+++ b/config/config.js.sample
@@ -2,11 +2,20 @@
 *
 * By Michael Teeuw http://michaelteeuw.nl
 * MIT Licensed.
+ *
+ * For more information how you can configurate this file
+ * See https://github.com/MichMich/MagicMirror#configuration
+ *
 */

 var config = {
+	address: "localhost",
 	port: 8080,
-	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses.
+	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
+	                                                       // or add a specific IPv4 of 192.168.1.5 :
+	                                                       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
+	                                                       // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
+	                                                       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],

 	language: "en",
 	timeFormat: 24,
--- a/css/main.css
+++ b/css/main.css
@@ -1,6 +1,7 @@
 html {
  cursor: none;
  overflow: hidden;
+  background: #000;
 }

 ::-webkit-scrollbar {
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ ! -f /opt/magic_mirror/modules ]; then
-    cp -R /opt/magic_mirror/unmount_modules/. /opt/magic_mirror/modules
-fi
-
-if [ ! -f /opt/magic_mirror/config ]; then
-    cp -R /opt/magic_mirror/unmount_config/. /opt/magic_mirror/config
-fi
-
-node serveronly
--- a/index.html
+++ b/index.html
@@ -1,9 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>Magic Mirror</title>
+	<title>MagicMirror²</title>
 	<meta name="google" content="notranslate" />
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta name="mobile-web-app-capable" content="yes">
+
 	<link rel="icon" href="data:;base64,iVBORw0KGgo=">
 	<link rel="stylesheet" type="text/css" href="css/main.css">
 	<link rel="stylesheet" type="text/css" href="fonts/roboto.css">
--- a/installers/raspberry.sh
+++ b/installers/raspberry.sh
@@ -65,7 +65,7 @@ if command_exists node; then
 		fi

 	else
-		echo -e "\e[92mNo Node.js upgrade nessecery.\e[0m"
+		echo -e "\e[92mNo Node.js upgrade necessary.\e[0m"
 	fi

 else
@@ -150,8 +150,7 @@ fi

 # Use pm2 control like a service MagicMirror
 read -p "Do you want use pm2 for auto starting of your MagicMirror (y/n)?" choice
-if [[ $choice =~ ^[Yy]$ ]]
-then
+if [[ $choice =~ ^[Yy]$ ]]; then
    sudo npm install -g pm2
    sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
    pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json
--- a/js/defaults.js
+++ b/js/defaults.js
@@ -8,10 +8,12 @@
 */

 var port = 8080;
+var address = ""; // Default to listening on all interfaces
 if (typeof(mmPort) !== "undefined") {
 	port = mmPort;
 }
 var defaults = {
+	address: address,
 	port: port,
 	kioskmode: false,
 	electronOptions: {},
@@ -21,6 +23,7 @@ var defaults = {
 	timeFormat: 24,
 	units: "metric",
 	zoom: 1,
+	customCss: "css/custom.css",

 	modules: [
 		{
--- a/js/electron.js
+++ b/js/electron.js
@@ -2,12 +2,11 @@

 "use strict";

-const Server = require(__dirname + "/server.js");
 const electron = require("electron");
 const core = require(__dirname + "/app.js");

 // Config
-var config = {};
+var config = process.env.config ? JSON.parse(process.env.config) : {};
 // Module to control application life.
 const app = electron.app;
 // Module to create native browser window.
@@ -18,7 +17,6 @@ const BrowserWindow = electron.BrowserWindow;
 let mainWindow;

 function createWindow() {
-
 	var electronOptionsDefaults = {
 		width: 800,
 		height: 600,
@@ -30,7 +28,7 @@ function createWindow() {
 			zoomFactor: config.zoom
 		},
 		backgroundColor: "#000000"
-	}
+	};

 	// DEPRECATED: "kioskmode" backwards compatibility, to be removed
 	// settings these options directly instead provides cleaner interface
@@ -47,11 +45,12 @@ function createWindow() {
 	mainWindow = new BrowserWindow(electronOptions);

 	// and load the index.html of the app.
-	//mainWindow.loadURL('file://' + __dirname + '../../index.html');
-	mainWindow.loadURL("http://localhost:" + config.port);
+	// If config.address is not defined or is an empty string (listening on all interfaces), connect to localhost
+	var address = (config.address === void 0) | (config.address === "") ? (config.address = "localhost") : config.address;
+	mainWindow.loadURL(`http://${address}:${config.port}`);

 	// Open the DevTools if run with "npm start dev"
-	if(process.argv[2] == "dev") {
+	if (process.argv.includes("dev")) {
 		mainWindow.webContents.openDevTools();
 	}

@@ -97,8 +96,10 @@ app.on("activate", function() {
 	}
 });

-// Start the core application.
+// Start the core application if server is run on localhost
 // This starts all node helpers and starts the webserver.
+if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) > -1) {
 	core.start(function(c) {
 		config = c;
 	});
+}
--- a/js/loader.js
+++ b/js/loader.js
@@ -32,10 +32,10 @@ var Loader = (function() {
 				});
 			} else {
 				// All modules loaded. Load custom.css
-				// This is done after all the moduels so we can
-				// overwrite all the defined styls.
+				// This is done after all the modules so we can
+				// overwrite all the defined styles.

-				loadFile("css/custom.css", function() {
+				loadFile(config.customCss, function() {
 					// custom.css loaded. Start all modules.
 					startModules();
 				});
--- a/js/main.js
+++ b/js/main.js
@@ -165,8 +165,6 @@ var MM = (function() {
 		if( headerWrapper.length > 0 && newHeader) {
 			headerWrapper[0].innerHTML = newHeader;
 		}
-
-
 	};

 	/* hideModule(module, speed, callback)
@@ -219,7 +217,7 @@ var MM = (function() {

 		// remove lockString if set in options.
 		if (options.lockString) {
-			var index = module.lockStrings.indexOf(options.lockString)
+			var index = module.lockStrings.indexOf(options.lockString);
 			if ( index !== -1) {
 				module.lockStrings.splice(index, 1);
 			}
--- a/js/module.js
+++ b/js/module.js
@@ -272,14 +272,18 @@ var Module = Class.extend({
 		}
 	},

-	/* translate(key, defaultValue)
-	 * Request the translation for a given key.
+	/* translate(key, defaultValueOrVariables, defaultValue)
+	 * Request the translation for a given key with optional variables and default value.
 	 *
-	 * argument key string - The key of the string to translage
-   * argument defaultValue string - The default value if no translation was found. (Optional)
+	 * argument key string - The key of the string to translate
+   * argument defaultValueOrVariables string/object - The default value or variables for translating. (Optional)
+   * argument defaultValue string - The default value with variables. (Optional)
 	 */
-	translate: function (key, defaultValue) {
-		return Translator.translate(this, key) || defaultValue || "";
+	translate: function (key, defaultValueOrVariables, defaultValue) {
+		if(typeof defaultValueOrVariables === "object") {
+			return Translator.translate(this, key, defaultValueOrVariables) || defaultValue || "";
+		}
+		return Translator.translate(this, key) || defaultValueOrVariables || "";
 	},

 	/* updateDom(speed)
--- a/js/server.js
+++ b/js/server.js
@@ -15,16 +15,22 @@ var fs = require("fs");
 var helmet = require("helmet");

 var Server = function(config, callback) {
-	console.log("Starting server op port " + config.port + " ... ");

-	server.listen(config.port, config.address ? config.address : null);
+	var port = config.port;
+	if (process.env.MM_PORT) {
+		port = process.env.MM_PORT;
+	}
+
+	console.log("Starting server on port " + port + " ... ");
+
+	server.listen(port, config.address ? config.address : null);

 	if (config.ipWhitelist instanceof Array && config.ipWhitelist.length == 0) {
 		console.info("You're using a full whitelist configuration to allow for all IPs")
 	}

 	app.use(function(req, res, next) {
-		var result = ipfilter(config.ipWhitelist, {mode: "allow", log: false})(req, res, function(err) {
+		var result = ipfilter(config.ipWhitelist, {mode: config.ipWhitelist.length === 0 ? "deny" : "allow", log: false})(req, res, function(err) {
 			if (err === undefined) {
 				return next();
 			}
@@ -37,7 +43,7 @@ var Server = function(config, callback) {
 	app.use("/js", express.static(__dirname));
 	var directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests/configs"];
 	var directory;
-	for (i in directories) {
+	for (var i in directories) {
 		directory = directories[i];
 		app.use(directory, express.static(path.resolve(global.root_path + directory)));
 	}
@@ -46,6 +52,10 @@ var Server = function(config, callback) {
 		res.send(global.version);
 	});

+	app.get("/config", function(req,res) {
+		res.send(config);
+	});
+
 	app.get("/", function(req, res) {
 		var html = fs.readFileSync(path.resolve(global.root_path + "/index.html"), {encoding: "utf8"});
 		html = html.replace("#VERSION#", global.version);
--- a/js/socketclient.js
+++ b/js/socketclient.js
@@ -22,7 +22,6 @@ var MMSocket = function(moduleName) {
 	// register catch all.
 	self.socket.on("*", function(notification, payload) {
 		if (notification !== "*") {
-			//console.log('Received notification: ' + notification +', payload: ' + payload);
 			notificationCallback(notification, payload);
 		}
 	});
--- a/js/translator.js
+++ b/js/translator.js
@@ -111,32 +111,47 @@ var Translator = (function() {
 		translations: {},
 		translationsFallback: {},

-		/* translate(module, key)
+		/* translate(module, key, variables)
 		 * Load a translation for a given key for a given module.
 		 *
 		 * argument module Module - The module to load the translation for.
 		 * argument key string - The key of the text to translate.
+		 * argument variables - The variables to use within the translation template (optional)
 		 */
-		translate: function(module, key) {
+		translate: function(module, key, variables) {
+			variables = variables || {}; //Empty object by default
+
+			// Combines template and variables like:
+			// template: "Please wait for {timeToWait} before continuing with {work}."
+			// variables: {timeToWait: "2 hours", work: "painting"}
+			// to: "Please wait for 2 hours before continuing with painting."
+			function createStringFromTemplate(template, variables) {
+				if(variables.fallback && !template.match(new RegExp("\{.+\}"))) {
+					template = variables.fallback;
+				}
+				return template.replace(new RegExp("\{([^\}]+)\}", "g"), function(_unused, varName){
+					return variables[varName] || "{"+varName+"}";
+				});
+			}

 			if(this.translations[module.name] && key in this.translations[module.name]) {
 				// Log.log("Got translation for " + key + " from module translation: ");
-				return this.translations[module.name][key];
+				return createStringFromTemplate(this.translations[module.name][key], variables);
 			}

 			if (key in this.coreTranslations) {
 				// Log.log("Got translation for " + key + " from core translation.");
-				return this.coreTranslations[key];
+				return createStringFromTemplate(this.coreTranslations[key], variables);
 			}

 			if (this.translationsFallback[module.name] && key in this.translationsFallback[module.name]) {
 				// Log.log("Got translation for " + key + " from module translation fallback.");
-				return this.translationsFallback[module.name][key];
+				return createStringFromTemplate(this.translationsFallback[module.name][key], variables);
 			}

 			if (key in this.coreTranslationsFallback) {
 				// Log.log("Got translation for " + key + " from core translation fallback.");
-				return this.coreTranslationsFallback[key];
+				return createStringFromTemplate(this.coreTranslationsFallback[key], variables);
 			}

 			return key;
--- a/js/utils.js
+++ b/js/utils.js
@@ -11,7 +11,8 @@ var colors = require("colors/safe");
 var Utils = {
 	colors: {
 		warn: colors.yellow,
-		error: colors.red
+		error: colors.red,
+		info: colors.blue
 	}
 };

--- a/modules/README.md
+++ b/modules/README.md
@@ -78,7 +78,7 @@ The data object contains additional metadata about the module instance:
 #### `defaults: {}`
 Any properties defined in the defaults object, will be merged with the module config as defined in the user's config.js file. This is the best place to set your modules's configuration defaults. Any of the module configuration properties can be accessed using `this.config.propertyName`, but more about that later.

-####'requiresVersion:'
+#### `requiresVersion:`

 *Introduced in version: 2.1.0.*

@@ -257,7 +257,7 @@ socketNotificationReceived: function(notification, payload) {
 When a module is hidden (using the `module.hide()` method), the `suspend()` method will be called. By subclassing this method you can perform tasks like halting the update timers.

 #### `resume()`
-When a module will be shown after it was previously hidden (using the `module.show()` method), the `resume()` method will be called. By subclassing this method you can perform tasks restarting the update timers.
+When a module is requested to be shown (using the `module.show()` method), the `resume()` method will be called. By subclassing this method you can perform tasks restarting the update timers.


 ### Module instance methods
@@ -429,6 +429,51 @@ this.translate("INFO") //Will return a translated string for the identifier INFO

 **Note:** although comments are officially not supported in JSON files, MagicMirror allows it by stripping the comments before parsing the JSON file. Comments in translation files could help other translators.

+##### `this.translate(identifier, variables)`
+***identifier* String** - Identifier of the string that should be translated.
+***variables* Object** - Object of variables to be used in translation.
+
+This improved and backwards compatible way to handle translations behaves like the normal translation function and follows the rules described above. It's recommended to use this new format for translating everywhere. It allows translator to change the word order in the sentence to be translated.
+
+
+**Example:**
+````javascript
+var timeUntilEnd = moment(event.endDate, "x").fromNow(true);
+this.translate("RUNNING", { "timeUntilEnd": timeUntilEnd) }); // Will return a translated string for the identifier RUNNING, replacing `{timeUntilEnd}` with the contents of the variable `timeUntilEnd` in the order that translator intended.
+````
+
+**Example English .json file:**
+````javascript
+{
+	"RUNNING": "Ends in {timeUntilEnd}",
+}
+````
+
+**Example Finnish .json file:**
+````javascript
+{
+	"RUNNING": "Päättyy {timeUntilEnd} päästä",
+}
+````
+
+**Note:** The *variables* Object has an special case called `fallback`. It's used to support old translations in translation files that do not have the variables in them. If you are upgrading an old module that had translations that did not support the word order, it is recommended to have the fallback layout.
+
+**Example:**
+````javascript
+var timeUntilEnd = moment(event.endDate, "x").fromNow(true);
+this.translate("RUNNING", {
+	"fallback": this.translate("RUNNING") + " {timeUntilEnd}"
+	"timeUntilEnd": timeUntilEnd
+)}); // Will return a translated string for the identifier RUNNING, replacing `{timeUntilEnd}` with the contents of the variable `timeUntilEnd` in the order that translator intended. (has a fallback)
+````
+
+**Example swedish .json file that does not have the variable in it:**
+````javascript
+{
+	"RUNNING": "Slutar",
+}
+````
+In this case the `translate`-function will not find any variables in the translation, will look for `fallback` variable and use that if possible to create the translation.

 ## The Node Helper: node_helper.js

@@ -482,7 +527,7 @@ this.expressApp.use("/" + this.name, express.static(this.path + "/public"));
 This is a link to the IO instance. It will allow you to do some Socket.IO magic. In most cases you won't need this, since the Node Helper has a few convenience methods to make this simple.


-####'requiresVersion:'
+#### `requiresVersion:`
 *Introduced in version: 2.1.0.*

 A string that defines the minimum version of the MagicMirror framework. If it is set, the system compares the required version with the users version. If the version of the user is out of date, it won't run the module.
--- a/modules/default/alert/alert.js
+++ b/modules/default/alert/alert.js
@@ -30,7 +30,8 @@ Module.register("alert",{
 	getTranslations: function() {
 		return {
 			en: "translations/en.json",
-			de: "translations/de.json"
+			de: "translations/de.json",
+			nl: "translations/nl.json",
 		};
 	},
 	show_notification: function(message) {
--- a/modules/default/alert/translations/nl.json
+++ b/modules/default/alert/translations/nl.json
@@ -0,0 +1,4 @@
+{
+  "sysTitle": "MagicMirror Notificatie",
+  "welcome": "Welkom, Succesvol gestart!"
+}
--- a/modules/default/calendar/README.md
+++ b/modules/default/calendar/README.md
@@ -31,6 +31,7 @@ The following properties can be configured:
 | `displaySymbol`              | Display a symbol in front of an entry. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
 | `defaultSymbol`              | The default symbol. <br><br> **Possible values:** See [Font Awsome](http://fontawesome.io/icons/) website. <br> **Default value:** `calendar`
 | `maxTitleLength`             | The maximum title length. <br><br> **Possible values:** `10` - `50` <br> **Default value:** `25`
+| `wrapEvents`                 | Wrap event titles to multiple lines. Breaks lines at the length defined by `maxTitleLength`. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `fetchInterval`              | How often does the content needs to be fetched? (Milliseconds) <br><br> **Possible values:** `1000` - `86400000` <br> **Default value:** `300000` (5 minutes)
 | `animationSpeed`             | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `2000` (2 seconds)
 | `fade`                       | Fade the future events to black. (Gradient) <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
@@ -39,6 +40,7 @@ The following properties can be configured:
 | `titleReplace`               | An object of textual replacements applied to the tile of the event. This allow to remove or replace certains words in the title. <br><br> **Example:** `{'Birthday of ' : '', 'foo':'bar'}` <br> **Default value:** `{	"De verjaardag van ": "", "'s birthday": ""	}`
 | `displayRepeatingCountTitle` | Show count title for yearly repeating events (e.g. "X. Birthday", "X. Anniversary") <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `dateFormat`                 | Format to use for the date of events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
+| `fullDayEventDateFormat`     | Format to use for the date of full day events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
 | `timeFormat`                 | Display event times as absolute dates, or relative time <br><br> **Possible values:** `absolute` or `relative` <br> **Default value:** `relative`
 | `getRelative`                | How much time (in hours) should be left until calendar events start getting relative? <br><br> **Possible values:** `0` (events stay absolute) - `48` (48 hours before the event starts) <br> **Default value:** `6`
 | `urgency`                    | When using a timeFormat of `absolute`, the `urgency` setting allows you to display events within a specific time frame as `relative`. This allows events within a certain time frame to be displayed as relative (in xx days) while others are displayed as absolute dates <br><br> **Possible values:** a positive integer representing the number of days for which you want a relative date, for example `7` (for 7 days) <br><br> **Default value:** `7`
--- a/modules/default/calendar/calendar.css
+++ b/modules/default/calendar/calendar.css
@@ -2,6 +2,7 @@
  padding-left: 0;
  padding-right: 10px;
  font-size: 80%;
+  vertical-align: top;
 }

 .calendar .symbol span {
@@ -19,4 +20,5 @@
 .calendar .time {
  padding-left: 30px;
  text-align: right;
+  vertical-align: top;
 }
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -18,12 +18,14 @@ Module.register("calendar", {
 		displayRepeatingCountTitle: false,
 		defaultRepeatingCountTitle: "",
 		maxTitleLength: 25,
+		wrapEvents: false, // wrap events to multiple lines breaking at maxTitleLength
 		fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
 		animationSpeed: 2000,
 		fade: true,
 		urgency: 7,
 		timeFormat: "relative",
 		dateFormat: "MMM Do",
+		fullDayEventDateFormat: "MMM Do",
 		getRelative: 6,
 		fadePoint: 0.25, // Start on 1/4th of the list.
 		hidePrivate: false,
@@ -54,8 +56,8 @@ Module.register("calendar", {

 	// Define required translations.
 	getTranslations: function () {
-		// The translations for the defaut modules are defined in the core translation files.
-		// Therefor we can just return false. Otherwise we should have returned a dictionairy.
+		// The translations for the default modules are defined in the core translation files.
+		// Therefor we can just return false. Otherwise we should have returned a dictionary.
 		// If you're trying to build your own module including translations, check out the documentation.
 		return false;
 	},
@@ -67,6 +69,29 @@ Module.register("calendar", {
 		// Set locale.
 		moment.locale(config.language);

+		switch (config.timeFormat) {
+		case 12: {
+			moment.updateLocale(config.language, {
+				longDateFormat: {
+					LT: "h:mm A"
+				}
+			});
+			break;
+		}
+		case 24: {
+			moment.updateLocale(config.language, {
+				longDateFormat: {
+					LT: "HH:mm"
+				}
+			});
+			break;
+		}
+		// If config.timeFormat was not given (or has invalid format) default to locale default
+		default: {
+			break;
+		}
+		}
+
 		for (var c in this.config.calendars) {
 			var calendar = this.config.calendars[c];
 			calendar.url = calendar.url.replace("webcal://", "http://");
@@ -128,20 +153,6 @@ Module.register("calendar", {

 		for (var e in events) {
 			var event = events[e];
-
-			var excluded = false;
-			for (var f in this.config.excludedEvents) {
-				var filter = this.config.excludedEvents[f];
-				if (event.title.toLowerCase().includes(filter.toLowerCase())) {
-					excluded = true;
-					break;
-				}
-			}
-
-			if (excluded) {
-				continue;
-			}
-
 			var eventWrapper = document.createElement("tr");

 			if (this.config.colored) {
@@ -172,7 +183,6 @@ Module.register("calendar", {
 			var titleWrapper = document.createElement("td"),
 				repeatingCountTitle = "";

-
 			if (this.config.displayRepeatingCountTitle) {

 				repeatingCountTitle = this.countTitleForUrl(event.url);
@@ -227,7 +237,7 @@ Module.register("calendar", {
 							// This event falls within the config.urgency period that the user has set
 							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
 						} else {
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat));
+							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat));
 						}
 					} else {
 						timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
@@ -264,7 +274,12 @@ Module.register("calendar", {
 						}
 					}
 				} else {
-					timeWrapper.innerHTML = this.capFirst(this.translate("RUNNING")) + " " + moment(event.endDate, "x").fromNow(true);
+					timeWrapper.innerHTML = this.capFirst(
+						this.translate("RUNNING", {
+							fallback: this.translate("RUNNING") + " {timeUntilEnd}",
+							timeUntilEnd: moment(event.endDate, "x").fromNow(true)
+						})
+					);
 				}
 			}
 			//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
@@ -337,7 +352,7 @@ Module.register("calendar", {
 			return a.startDate - b.startDate;
 		});

-		return events.slice(0, this.config.maximumEntries);
+		return events;
 	},

 	/* createEventList(url)
@@ -348,6 +363,7 @@ Module.register("calendar", {
 	addCalendar: function (url, auth, calendarConfig) {
 		this.sendSocketNotification("ADD_CALENDAR", {
 			url: url,
+			excludedEvents: calendarConfig.excludedEvents || this.config.excludedEvents,
 			maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries,
 			maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays,
 			fetchInterval: this.config.fetchInterval,
@@ -408,21 +424,46 @@ Module.register("calendar", {
 		return defaultValue;
 	},

-	/* shorten(string, maxLength)
-	 * Shortens a string if it's longer than maxLenthg.
-	 * Adds an ellipsis to the end.
+	/**
+	 * Shortens a string if it's longer than maxLength and add a ellipsis to the end
 	 * 
-	 * argument string string - The string to shorten.
-	 * argument maxLength number - The max lenth of the string.
-	 *
-	 * return string - The shortened string.
+	 * @param {string} string Text string to shorten
+	 * @param {number} maxLength The max length of the string
+	 * @param {boolean} wrapEvents Wrap the text after the line has reached maxLength
+	 * @returns {string} The shortened string
 	 */
-	shorten: function (string, maxLength) {
-		if (string.length > maxLength) {
-			return string.slice(0, maxLength) + "&hellip;";
+	shorten: function (string, maxLength, wrapEvents) {
+		if (typeof string !== "string") {
+			return "";
 		}

-		return string;
+		if (wrapEvents === true) {
+			var temp = "";
+			var currentLine = "";
+			var words = string.split(" ");
+
+			for (var i = 0; i < words.length; i++) {
+				var word = words[i];
+				if (currentLine.length + word.length < (typeof maxLength === "number" ? maxLength : 25) - 1) { // max - 1 to account for a space
+					currentLine += (word + " ");
+				} else {
+					if (currentLine.length > 0) {
+						temp += (currentLine + "<br>" + word + " ");
+					} else {
+						temp += (word + "<br>");
+					}
+					currentLine = "";
+				}
+			}
+
+			return (temp + currentLine).trim();
+		} else {
+			if (maxLength && typeof maxLength === "number" && string.length > maxLength) {
+				return string.trim().slice(0, maxLength) + "&hellip;";
+			} else {
+				return string.trim();
+			}
+		}
 	},

 	/* capFirst(string)
@@ -437,7 +478,7 @@ Module.register("calendar", {
 	/* titleTransform(title)
 	 * Transforms the title of an event for usage.
 	 * Replaces parts of the text as defined in config.titleReplace.
-	 * Shortens title based on config.maxTitleLength
+	 * Shortens title based on config.maxTitleLength and config.wrapEvents
 	 *
 	 * argument title string - The title to transform.
 	 *
@@ -456,7 +497,7 @@ Module.register("calendar", {
 			title = title.replace(needle, replacement);
 		}

-		title = this.shorten(title, this.config.maxTitleLength);
+		title = this.shorten(title, this.config.maxTitleLength, this.config.wrapEvents);
 		return title;
 	},

@@ -466,10 +507,12 @@ Module.register("calendar", {
 	 */
 	broadcastEvents: function () {
 		var eventList = [];
-		for (url in this.calendarData) {
+		for (var url in this.calendarData) {
 			var calendar = this.calendarData[url];
-			for (e in calendar) {
+			for (var e in calendar) {
 				var event = cloneObject(calendar[e]);
+				event.symbol = this.symbolsForUrl(url);
+				event.color = this.colorForUrl(url);
 				delete event.url;
 				eventList.push(event);
 			}
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@@ -8,7 +8,7 @@
 var ical = require("./vendor/ical.js");
 var moment = require("moment");

-var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumberOfDays, auth) {
+var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth) {
 	var self = this;

 	var reloadTimer = null;
@@ -113,6 +113,19 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
 						title = event.description;
 					}

+					var excluded = false;
+					for (var f in excludedEvents) {
+						var filter = excludedEvents[f];
+						if (title.toLowerCase().includes(filter.toLowerCase())) {
+							excluded = true;
+							break;
+						}
+					}
+
+					if (excluded) {
+						continue;
+					}
+
 					var location = event.location || false;
 					var geo = event.geo || false;
 					var description = event.description || false;
--- a/modules/default/calendar/node_helper.js
+++ b/modules/default/calendar/node_helper.js
@@ -24,7 +24,7 @@ module.exports = NodeHelper.create({
 	socketNotificationReceived: function(notification, payload) {
 		if (notification === "ADD_CALENDAR") {
 			//console.log('ADD_CALENDAR: ');
-			this.createFetcher(payload.url, payload.fetchInterval, payload.maximumEntries, payload.maximumNumberOfDays, payload.auth);
+			this.createFetcher(payload.url, payload.fetchInterval, payload.excludedEvents, payload.maximumEntries, payload.maximumNumberOfDays, payload.auth);
 		}
 	},

@@ -36,7 +36,7 @@ module.exports = NodeHelper.create({
 	 * attribute reloadInterval number - Reload interval in milliseconds.
 	 */

-	createFetcher: function(url, fetchInterval, maximumEntries, maximumNumberOfDays, auth) {
+	createFetcher: function(url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth) {
 		var self = this;

 		if (!validUrl.isUri(url)) {
@@ -47,7 +47,7 @@ module.exports = NodeHelper.create({
 		var fetcher;
 		if (typeof self.fetchers[url] === "undefined") {
 			console.log("Create new calendar fetcher for url: " + url + " - Interval: " + fetchInterval);
-			fetcher = new CalendarFetcher(url, fetchInterval, maximumEntries, maximumNumberOfDays, auth);
+			fetcher = new CalendarFetcher(url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth);

 			fetcher.onReceive(function(fetcher) {
 				//console.log('Broadcast events.');
--- a/modules/default/clock/README.md
+++ b/modules/default/clock/README.md
@@ -30,6 +30,7 @@ The following properties can be configured:
 | `showPeriodUpper` | Show the period (AM/PM) with 12 hour format as uppercase. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `clockBold`       | Remove the colon and bold the minutes to make a more modern look. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `showDate`        | Turn off or on the Date section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
+| `showWeek`        | Turn off or on the Week section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `dateFormat`      | Configure the date format as you like. <br><br> **Possible values:** [Docs](http://momentjs.com/docs/#/displaying/format/) <br> **Default value:** `"dddd, LL"`
 | `displayType`     | Display a digital clock, analog clock, or both together. <br><br> **Possible values:** `digital`, `analog`, or `both` <br> **Default value:** `digital`
 | `analogSize`      | **Specific to the analog clock.** Defines how large the analog display is. <br><br> **Possible values:** A positive number of pixels` <br> **Default value:** `200px`
@@ -37,4 +38,4 @@ The following properties can be configured:
 | `secondsColor`    | **Specific to the analog clock.** Specifies what color to make the 'seconds' hand. <br><br> **Possible values:** `any HTML RGB Color` <br> **Default value:** `#888888`
 | `analogPlacement` | **Specific to the analog clock. _(requires displayType set to `'both'`)_** Specifies where the analog clock is in relation to the digital clock <br><br> **Possible values:** `top`, `right`, `bottom`, or `left` <br> **Default value:** `bottom`
 | `analogShowDate`  | **Specific to the analog clock.** If the clock is used as a separate module and set to analog only, this configures whether a date is also displayed with the clock. <br><br> **Possible values:** `false`, `top`, or `bottom` <br> **Default value:** `top`
-| `timezone`        | Specific a timezone to show clock. <br><br> **Possible examples values:** `America/New_York`, `America/Santiago`, `Etc/GMT+10` <br> **Default value:** `none`
+| `timezone`        | Specific a timezone to show clock. <br><br> **Possible examples values:** `America/New_York`, `America/Santiago`, `Etc/GMT+10` <br> **Default value:** `none`. See more informations about configuration value [here](https://momentjs.com/timezone/docs/#/data-formats/packed-format/)
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -16,6 +16,7 @@ Module.register("clock",{
 		showPeriodUpper: false,
 		clockBold: false,
 		showDate: true,
+		showWeek: false,
 		dateFormat: "dddd, LL",

 		/* specific to the analog clock */
@@ -61,10 +62,12 @@ Module.register("clock",{
 		var timeWrapper = document.createElement("div");
 		var secondsWrapper = document.createElement("sup");
 		var periodWrapper = document.createElement("span");
+		var weekWrapper = document.createElement("div")
 		// Style Wrappers
 		dateWrapper.className = "date normal medium";
 		timeWrapper.className = "time bright large light";
 		secondsWrapper.className = "dimmed";
+		weekWrapper.className = "week dimmed medium"

 		// Set content of wrappers.
 		// The moment().format("h") method has a bug on the Raspberry Pi.
@@ -90,6 +93,9 @@ Module.register("clock",{
 		if(this.config.showDate){
 			dateWrapper.innerHTML = now.format(this.config.dateFormat);
 		}
+		if (this.config.showWeek) {
+			weekWrapper.innerHTML = this.translate("WEEK") + " " + now.week();
+		}
 		timeWrapper.innerHTML = timeString;
 		secondsWrapper.innerHTML = now.format("ss");
 		if (this.config.showPeriodUpper) {
@@ -121,7 +127,6 @@ Module.register("clock",{
 				hour = ((now.hours() % 12) / 12) * 360 + 90 + minute / 12;

 			// Create wrappers
-			var wrapper = document.createElement("div");
 			var clockCircle = document.createElement("div");
 			clockCircle.className = "clockCircle";
 			clockCircle.style.width = this.config.analogSize;
@@ -172,16 +177,24 @@ Module.register("clock",{
 			// Display only a digital clock
 			wrapper.appendChild(dateWrapper);
 			wrapper.appendChild(timeWrapper);
+			wrapper.appendChild(weekWrapper);
 		} else if (this.config.displayType === "analog") {
 			// Display only an analog clock
-			dateWrapper.style.textAlign = "center";
+
+			if (this.config.showWeek) {
+				weekWrapper.style.paddingBottom = "15px";
+			} else {
 				dateWrapper.style.paddingBottom = "15px";
+			}
+
 			if (this.config.analogShowDate === "top") {
 				wrapper.appendChild(dateWrapper);
+				wrapper.appendChild(weekWrapper);
 				wrapper.appendChild(clockCircle);
 			} else if (this.config.analogShowDate === "bottom") {
 				wrapper.appendChild(clockCircle);
 				wrapper.appendChild(dateWrapper);
+				wrapper.appendChild(weekWrapper);
 			} else {
 				wrapper.appendChild(clockCircle);
 			}
@@ -198,6 +211,7 @@ Module.register("clock",{
 			digitalWrapper.style.cssFloat = "none";
 			digitalWrapper.appendChild(dateWrapper);
 			digitalWrapper.appendChild(timeWrapper);
+			digitalWrapper.appendChild(weekWrapper);

 			var appendClocks = function(condition, pos1, pos2) {
 				var padding = [0,0,0,0];
--- a/modules/default/compliments/README.md
+++ b/modules/default/compliments/README.md
@@ -13,7 +13,7 @@ modules: [
 									// Best results in one of the middle regions like: lower_third
 		config: {
 			// The config property is optional.
-			// If no config is set, an example calendar is shown.
+			// If no config is set, the default compliments are shown.
 			// See 'Configuration options' for more information.
 		}
 	}
@@ -31,6 +31,7 @@ The following properties can be configured:
 | `fadeSpeed`      | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `4000` (4 seconds)
 | `compliments`	   | The list of compliments. <br><br> **Possible values:** An object with four arrays: `morning`, `afternoon`, `evening` and `anytime`. See _compliment configuration_ below. <br> **Default value:** See _compliment configuration_ below.
 | `remoteFile`     | External file from which to load the compliments <br><br> **Possible values:** Path to a JSON file containing compliments, configured as per the value of the _compliments configuration_ (see below). An object with four arrays: `morning`, `afternoon`, `evening` and `anytime`. - `compliments.json` <br> **Default value:** `null` (Do not load from file)
+| `classes`        | Override the CSS classes of the div showing the compliments <br><br> **Default value:** `thin xlarge bright`

 ### Compliment configuration

@@ -88,7 +89,7 @@ config: {
 		],
 		afternoon: [
 			"Hello, beauty!",
-			'You look sexy!',
+			"You look sexy!",
 			"Looking good today!"
 		],
 		evening: [
--- a/modules/default/compliments/compliments.js
+++ b/modules/default/compliments/compliments.js
@@ -96,14 +96,14 @@ Module.register("compliments", {
 	 */
 	complimentArray: function() {
 		var hour = moment().hour();
-		var compliments = null;
+		var compliments;

-		if (hour >= 3 && hour < 12) {
-			compliments = this.config.compliments.morning;
-		} else if (hour >= 12 && hour < 17) {
-			compliments = this.config.compliments.afternoon;
-		} else {
-			compliments = this.config.compliments.evening;
+		if (hour >= 3 && hour < 12 && this.config.compliments.hasOwnProperty("morning")) {
+			compliments = this.config.compliments.morning.slice(0);
+		} else if (hour >= 12 && hour < 17 && this.config.compliments.hasOwnProperty("afternoon")) {
+			compliments = this.config.compliments.afternoon.slice(0);
+		} else if(this.config.compliments.hasOwnProperty("evening")) {
+			compliments = this.config.compliments.evening.slice(0);
 		}

 		if (typeof compliments === "undefined") {
@@ -117,7 +117,6 @@ Module.register("compliments", {
 		compliments.push.apply(compliments, this.config.compliments.anytime);

 		return compliments;
-
 	},

 	/* complimentFile(callback)
--- a/modules/default/currentweather/README.md
+++ b/modules/default/currentweather/README.md
@@ -40,7 +40,9 @@ The following properties can be configured:
 | `showPeriod`                 | Show the period (am/pm) with 12 hour format <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
 | `showPeriodUpper`	           | Show the period (AM/PM) with 12 hour format as uppercase <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `showWindDirection`          | Show the wind direction next to the wind speed. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
+| `showWindDirectionAsArrow`   | Show the wind direction as an arrow instead of abbreviation <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `showHumidity`               | Show the current humidity <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
+| `showIndoorTemperature`      | If you have another module that emits the INDOOR_TEMPERATURE notification, the indoor temperature will be displayed <br> **Default value:** `false`
 | `onlyTemp`                   | Show only current Temperature and weather icon. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `useBeaufort`                | Pick between using the Beaufort scale for wind speed or using the default units. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
 | `lang`                       | The language of the days. <br><br> **Possible values:** `en`, `nl`, `ru`, etc ... <br> **Default value:** uses value of _config.language_
--- a/modules/default/currentweather/currentweather.css
+++ b/modules/default/currentweather/currentweather.css
@@ -1,4 +1,5 @@
-.currentweather .weathericon {
+.currentweather .weathericon,
+.currentweather .fa-home {
  font-size: 75%;
  line-height: 65px;
  display: inline-block;
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -21,10 +21,12 @@ Module.register("currentweather",{
 		showPeriod: true,
 		showPeriodUpper: false,
 		showWindDirection: true,
+		showWindDirectionAsArrow: false,
 		useBeaufort: true,
 		lang: config.language,
 		showHumidity: false,
 		degreeLabel: false,
+		showIndoorTemperature: false,

 		initialLoadDelay: 0, // 0 seconds delay
 		retryDelay: 2500,
@@ -79,8 +81,8 @@ Module.register("currentweather",{

 	// Define required translations.
 	getTranslations: function() {
-		// The translations for the defaut modules are defined in the core translation files.
-		// Therefor we can just return false. Otherwise we should have returned a dictionairy.
+		// The translations for the default modules are defined in the core translation files.
+		// Therefor we can just return false. Otherwise we should have returned a dictionary.
 		// If you're trying to build yiur own module including translations, check out the documentation.
 		return false;
 	},
@@ -94,9 +96,11 @@ Module.register("currentweather",{

 		this.windSpeed = null;
 		this.windDirection = null;
+		this.windDeg = null;
 		this.sunriseSunsetTime = null;
 		this.sunriseSunsetIcon = null;
 		this.temperature = null;
+		this.indoorTemperature = null;
 		this.weatherType = null;

 		this.loaded = false;
@@ -111,7 +115,6 @@ Module.register("currentweather",{
 		var small = document.createElement("div");
 		small.className = "normal medium";

-
 		var windIcon = document.createElement("span");
 		windIcon.className = "wi wi-strong-wind dimmed";
 		small.appendChild(windIcon);
@@ -122,7 +125,13 @@ Module.register("currentweather",{

 		if (this.config.showWindDirection) {
 			var windDirection = document.createElement("sup");
+			if (this.config.showWindDirectionAsArrow) {
+				if(this.windDeg !== null) {
+					windDirection.innerHTML = " &nbsp;<i class=\"fa fa-long-arrow-down\" style=\"transform:rotate("+this.windDeg+"deg);\"></i>&nbsp;";
+				}
+			} else {
 				windDirection.innerHTML = " " + this.translate(this.windDirection);
+			}
 			small.appendChild(windDirection);
 		}
 		var spacer = document.createElement("span");
@@ -203,6 +212,17 @@ Module.register("currentweather",{
 		temperature.innerHTML = " " + this.temperature + "&deg;" + degreeLabel;
 		large.appendChild(temperature);

+		if (this.config.showIndoorTemperature && this.indoorTemperature) {
+			var indoorIcon = document.createElement("span");
+			indoorIcon.className = "fa fa-home";
+			large.appendChild(indoorIcon);
+
+			var indoorTemperatureElem = document.createElement("span");
+			indoorTemperatureElem.className = "bright";
+			indoorTemperatureElem.innerHTML = " " + this.indoorTemperature + "&deg;" + degreeLabel;
+			large.appendChild(indoorTemperatureElem);
+		}
+
 		wrapper.appendChild(large);
 		return wrapper;
 	},
@@ -226,10 +246,9 @@ Module.register("currentweather",{
 		if (notification === "CALENDAR_EVENTS") {
 			var senderClasses = sender.data.classes.toLowerCase().split(" ");
 			if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
-				var lastEvent =  this.firstEvent;
 				this.firstEvent = false;

-				for (e in payload) {
+				for (var e in payload) {
 					var event = payload[e];
 					if (event.location || event.geo) {
 						this.firstEvent = event;
@@ -239,6 +258,10 @@ Module.register("currentweather",{
 				}
 			}
 		}
+		if (notification === "INDOOR_TEMPERATURE") {
+			this.indoorTemperature = this.roundValue(payload);
+			this.updateDom(self.config.animationSpeed);
+		}
 	},

 	/* updateWeather(compliments)
@@ -327,8 +350,8 @@ Module.register("currentweather",{
 			this.windSpeed = parseFloat(data.wind.speed).toFixed(0);
 		}

-
 		this.windDirection = this.deg2Cardinal(data.wind.deg);
+		this.windDeg = data.wind.deg;
 		this.weatherType = this.config.iconTable[data.weather[0].icon];

 		var now = new Date();
@@ -359,7 +382,6 @@ Module.register("currentweather",{
 		this.sunriseSunsetTime = timeString;
 		this.sunriseSunsetIcon = (sunrise < now && sunset > now) ? "wi-sunset" : "wi-sunrise";

-
 		this.show(this.config.animationSpeed, {lockString:this.identifier});
 		this.loaded = true;
 		this.updateDom(this.config.animationSpeed);
@@ -386,6 +408,10 @@ Module.register("currentweather",{
 	/* ms2Beaufort(ms)
 	 * Converts m2 to beaufort (windspeed).
 	 *
+	 * see:
+	 *  http://www.spc.noaa.gov/faq/tornado/beaufort.html
+	 *  https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale
+	 *
 	 * argument ms number - Windspeed in m/s.
 	 *
 	 * return number - Windspeed in beaufort.
--- a/modules/default/newsfeed/README.md
+++ b/modules/default/newsfeed/README.md
@@ -70,6 +70,8 @@ The following properties can be configured:
 | `updateInterval`  | How often do you want to display a new headline? (Milliseconds) <br><br> **Possible values:**`1000` - `60000` <br> **Default value:** `10000` (10 seconds)
 | `animationSpeed`  | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `2500` (2.5 seconds)
 | `maxNewsItems`    | Total amount of news items to cycle through. (0 for unlimited) <br><br> **Possible values:**`0` - `...` <br> **Default value:** `0`
+| `ignoreOldItems`  | Ignore news items that are outdated. <br><br> **Possible values:**`true` or `false <br> **Default value:** `false`
+| `ignoreOlderThan` | How old should news items be before they are considered outdated? (Milliseconds) <br><br> **Possible values:**`1` - `...` <br> **Default value:** `86400000` (1 day)
 | `removeStartTags` | Some newsfeeds feature tags at the **beginning** of their titles or descriptions, such as _[VIDEO]_. This setting allows for the removal of specified tags from the beginning of an item's description and/or title. <br><br> **Possible values:**`'title'`, `'description'`, `'both'`
 | `startTags`       | List the tags you would like to have removed at the beginning of the feed item <br><br> **Possible values:** `['TAG']` or `['TAG1','TAG2',...]`
 | `removeEndTags`   | Remove specified tags from the **end** of an item's description and/or title. <br><br> **Possible values:**`'title'`, `'description'`, `'both'`
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -28,6 +28,8 @@ Module.register("newsfeed",{
 		updateInterval: 10 * 1000,
 		animationSpeed: 2.5 * 1000,
 		maxNewsItems: 0, // 0 for unlimited
+		ignoreOldItems: false,
+		ignoreOlderThan: 24 * 60 * 60 * 1000, // 1 day
 		removeStartTags: "",
 		removeEndTags: "",
 		startTags: [],
@@ -42,9 +44,9 @@ Module.register("newsfeed",{

 	// Define required translations.
 	getTranslations: function() {
-		// The translations for the defaut modules are defined in the core translation files.
-		// Therefor we can just return false. Otherwise we should have returned a dictionairy.
-		// If you're trying to build yiur own module including translations, check out the documentation.
+		// The translations for the default modules are defined in the core translation files.
+		// Therefor we can just return false. Otherwise we should have returned a dictionary.
+		// If you're trying to build your own module including translations, check out the documentation.
 		return false;
 	},

@@ -202,7 +204,6 @@ Module.register("newsfeed",{
 	/* registerFeeds()
 	 * registers the feeds to be used by the backend.
 	 */
-
 	registerFeeds: function() {
 		for (var f in this.config.feeds) {
 			var feed = this.config.feeds[f];
@@ -213,10 +214,10 @@ Module.register("newsfeed",{
 		}
 	},

-	/* registerFeeds()
+	/* generateFeed()
 	 * Generate an ordered list of items for this configured module.
 	 *
-	 * attribute feeds object - An object with feeds returned by the nod helper.
+	 * attribute feeds object - An object with feeds returned by the node helper.
 	 */
 	generateFeed: function(feeds) {
 		var newsItems = [];
@@ -226,10 +227,12 @@ Module.register("newsfeed",{
 				for (var i in feedItems) {
 					var item = feedItems[i];
 					item.sourceTitle = this.titleForFeed(feed);
+					if (!(this.config.ignoreOldItems && ((Date.now() - new Date(item.pubdate)) > this.config.ignoreOlderThan))) {
 						newsItems.push(item);
 					}
 				}
 			}
+		}
 		newsItems.sort(function(a,b) {
 			var dateA = new Date(a.pubdate);
 			var dateB = new Date(b.pubdate);
@@ -258,7 +261,7 @@ Module.register("newsfeed",{
 		return false;
 	},

-	/* subscribedToFeed(feedUrl)
+	/* titleForFeed(feedUrl)
 	 * Returns title for a specific feed Url.
 	 *
 	 * attribute feedUrl string - Url of the feed to check.
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -24,14 +24,13 @@ module.exports = NodeHelper.create({
 		}
 	},

-	/* createFetcher(url, reloadInterval)
-	 * Creates a fetcher for a new url if it doesn't exist yet.
-	 * Otherwise it reoses the existing one.
+	/* createFetcher(feed, config)
+	 * Creates a fetcher for a new feed if it doesn't exist yet.
+	 * Otherwise it reuses the existing one.
 	 *
-	 * attribute url string - URL of the news feed.
-	 * attribute reloadInterval number - Reload interval in milliseconds.
+	 * attribute feed object - A feed object.
+	 * attribute config object - A configuration object containing reload interval in milliseconds.
 	 */
-
 	createFetcher: function(feed, config) {
 		var self = this;

--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -63,7 +63,7 @@ Module.register("weatherforecast",{
 	firstEvent: false,

 	// create a variable to hold the location name based on the API result.
-	fetchedLocatioName: "",
+	fetchedLocationName: "",

 	// Define required scripts.
 	getScripts: function() {
@@ -77,8 +77,8 @@ Module.register("weatherforecast",{

 	// Define required translations.
 	getTranslations: function() {
-		// The translations for the defaut modules are defined in the core translation files.
-		// Therefor we can just return false. Otherwise we should have returned a dictionairy.
+		// The translations for the default modules are defined in the core translation files.
+		// Therefor we can just return false. Otherwise we should have returned a dictionary.
 		// If you're trying to build yiur own module including translations, check out the documentation.
 		return false;
 	},
@@ -175,7 +175,6 @@ Module.register("weatherforecast",{
 					row.style.opacity = 1 - (1 / steps * currentStep);
 				}
 			}
-
 		}

 		return table;
@@ -184,7 +183,7 @@ Module.register("weatherforecast",{
 	// Override getHeader method.
 	getHeader: function() {
 		if (this.config.appendLocationNameToHeader) {
-			return this.data.header + " " + this.fetchedLocatioName;
+			return this.data.header + " " + this.fetchedLocationName;
 		}

 		return this.data.header;
@@ -200,10 +199,9 @@ Module.register("weatherforecast",{
 		if (notification === "CALENDAR_EVENTS") {
 			var senderClasses = sender.data.classes.toLowerCase().split(" ");
 			if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
-				var lastEvent =  this.firstEvent;
 				this.firstEvent = false;

-				for (e in payload) {
+				for (var e in payload) {
 					var event = payload[e];
 					if (event.location || event.geo) {
 						this.firstEvent = event;
@@ -291,7 +289,7 @@ Module.register("weatherforecast",{
 	 * argument data object - Weather information received form openweather.org.
 	 */
 	processWeather: function(data) {
-		this.fetchedLocatioName = data.city.name + ", " + data.city.country;
+		this.fetchedLocationName = data.city.name + ", " + data.city.country;

 		this.forecast = [];
 		for (var i = 0, count = data.list.length; i < count; i++) {
@@ -335,6 +333,10 @@ Module.register("weatherforecast",{
 	/* ms2Beaufort(ms)
 	 * Converts m2 to beaufort (windspeed).
 	 *
+	 * see:
+	 *  http://www.spc.noaa.gov/faq/tornado/beaufort.html
+	 *  https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale
+	 *
 	 * argument ms number - Windspeed in m/s.
 	 *
 	 * return number - Windspeed in beaufort.
--- a/modules/node_modules/node_helper/index.js
+++ b/modules/node_modules/node_helper/index.js
@@ -20,7 +20,7 @@ NodeHelper = Class.extend({
 	},

 	start: function() {
-		console.log("Staring module helper: " + this.name);
+		console.log("Starting module helper: " + this.name);
 	},

 	/* socketNotificationReceived(notification, payload)
@@ -45,7 +45,7 @@ NodeHelper = Class.extend({
 	/* setPath(path)
 	 * Set the module path.
 	 *
-	 * argument name string - Module name.
+	 * argument path string - Module path.
 	 */
 	setPath: function(path) {
 		this.path = path;
@@ -98,9 +98,10 @@ NodeHelper = Class.extend({

 			// register catch all.
 			socket.on("*", function(notification, payload) {
-				if (notification !== "*")
+				if (notification !== "*") {
 					//console.log('received message in namespace: ' + namespace);
 					self.socketNotificationReceived(notification, payload);
+				}
 			});
 		});

--- a/package.json
+++ b/package.json
@@ -1,15 +1,16 @@
 {
  "name": "magicmirror",
-  "version": "2.1.1",
-  "description": "A modular interface for smart mirrors.",
+  "version": "2.1.3-dev",
+  "description": "The open source modular smart mirror platform.",
  "main": "js/electron.js",
  "scripts": {
    "start": "sh run-start.sh",
    "install": "cd vendor && npm install",
    "postinstall": "sh installers/postinstall/postinstall.sh",
-    "test": "./node_modules/mocha/bin/mocha tests --recursive",
-    "test:unit": "./node_modules/mocha/bin/mocha tests/unit --recursive",
-    "test:e2e": "./node_modules/mocha/bin/mocha tests/e2e --recursive"
+    "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
+    "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
+    "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
+    "config:check": "node tests/configs/check_config.js"
  },
  "repository": {
    "type": "git",
@@ -29,35 +30,39 @@
  "bugs": {
    "url": "https://github.com/MichMich/MagicMirror/issues"
  },
-  "homepage": "https://github.com/MichMich/MagicMirror#readme",
+  "homepage": "https://magicmirror.builders",
  "devDependencies": {
    "chai": "^3.5.0",
    "chai-as-promised": "^6.0.0",
+    "current-week-number": "^1.0.7",
    "grunt": "latest",
    "grunt-eslint": "latest",
    "grunt-jsonlint": "latest",
-    "grunt-markdownlint": "^1.0.13",
+    "grunt-markdownlint": "^1.0.39",
    "grunt-stylelint": "latest",
    "grunt-yamllint": "latest",
    "http-auth": "^3.1.3",
-    "mocha": "^3.2.0",
-    "spectron": "^3.4.1",
+    "jshint": "^2.9.4",
+    "mocha": "^3.4.2",
+    "spectron": "^3.6.4",
+    "stylelint": "^7.11.0",
    "stylelint-config-standard": "latest",
    "time-grunt": "latest"
  },
  "dependencies": {
+    "body-parser": "^1.17.2",
    "colors": "^1.1.2",
-    "electron": "^1.4.7",
-    "express": "^4.14.0",
+    "electron": "^1.6.10",
+    "express": "^4.15.3",
    "express-ipfilter": "latest",
    "feedme": "latest",
-    "helmet": "^3.1.0",
+    "helmet": "^3.6.1",
    "iconv-lite": "latest",
    "moment": "latest",
-    "request": "^2.78.0",
-    "rrule-alt": "^2.2.3",
-    "simple-git": "^1.62.0",
-    "socket.io": "^1.7.3",
+    "request": "^2.81.0",
+    "rrule-alt": "^2.2.5",
+    "simple-git": "^1.73.0",
+    "socket.io": "^2.0.2",
    "valid-url": "latest",
    "walk": "latest"
  }
--- a/tests/configs/check_config.js
+++ b/tests/configs/check_config.js
@@ -0,0 +1,66 @@
+/* Magic Mirror
+ *
+ * Checker configuration file
+ *
+ * By Rodrigo Ramírez Norambuena
+ *    https://rodrigoramirez.com
+ *
+ * MIT Licensed.
+ *
+ */
+
+var v = require("jshint");
+var path = require("path");
+var fs = require("fs");
+var Utils = require(__dirname + "/../../js/utils.js");
+
+if (process.env.NODE_ENV == "test") { return 0 };
+
+/* getConfigFile()
+ * Return string with path of configuration file
+ * Check if set by enviroment variable MM_CONFIG_FILE
+ */
+function getConfigFile() {
+	// FIXME: This function should be in core. Do you want refactor me ;) ?, be good!
+	rootPath = path.resolve(__dirname + "/../../");
+	var configFileName = path.resolve(rootPath + "/config/config.js");
+	if (process.env.MM_CONFIG_FILE) {
+		configFileName = path.resolve(process.env.MM_CONFIG_FILE);
+	}
+	return configFileName;
+}
+
+var configFileName = getConfigFile();
+// Check if file is present
+if (fs.existsSync(configFileName) === false) {
+	console.error(Utils.colors.error("File not found: "), configFileName);
+	return;
+}
+// check permision
+try {
+	fs.accessSync(configFileName, fs.F_OK);
+} catch (e) {
+	console.log(Utils.colors.error(e));
+	return;
+}
+
+// Validate syntax of the configuration file.
+// In case the there errors show messages and
+// return
+console.info(Utils.colors.info("Checking file... ", configFileName));
+// I'm not sure if all ever is utf-8
+fs.readFile(configFileName, "utf-8", function (err, data) {
+	if (err) { throw err; }
+	v.JSHINT(data); // Parser by jshint
+
+	if (v.JSHINT.errors.length == 0) {
+		console.log("Your configuration file don't containt syntax error :)");
+		return true;
+	} else {
+		errors = v.JSHINT.data().errors;
+		for (idx in errors) {
+			error = errors[idx];
+			console.log("Line", error.line, "col", error.character, error.reason);
+		}
+	}
+});
--- a/tests/configs/data/feed_test_rodrigoramirez.xml
+++ b/tests/configs/data/feed_test_rodrigoramirez.xml
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:atom="http://www.w3.org/2005/Atom"
+	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
+	>
+
+<channel>
+	<title>Rodrigo Ramírez Norambuena</title>
+	<atom:link href="https://rodrigoramirez.com/feed/" rel="self" type="application/rss+xml" />
+	<link>https://rodrigoramirez.com</link>
+	<description>Temas sobre Linux, VoIP, Open Source, tecnología y lo relacionado.</description>
+	<lastBuildDate>Fri, 21 Oct 2016 21:30:22 +0000</lastBuildDate>
+	<language>es-ES</language>
+	<sy:updatePeriod>hourly</sy:updatePeriod>
+	<sy:updateFrequency>1</sy:updateFrequency>
+	<generator>https://wordpress.org/?v=4.7.3</generator>
+	<item>
+		<title>QPanel 0.13.0</title>
+		<link>https://rodrigoramirez.com/qpanel-0-13-0/</link>
+		<comments>https://rodrigoramirez.com/qpanel-0-13-0/#comments</comments>
+		<pubDate>Tue, 20 Sep 2016 11:16:08 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Software]]></category>
+		<category><![CDATA[app_queue]]></category>
+		<category><![CDATA[asterisk]]></category>
+		<category><![CDATA[FreeSWITCH]]></category>
+		<category><![CDATA[qpanel]]></category>
+		<category><![CDATA[queue]]></category>
+		<category><![CDATA[spy]]></category>
+		<category><![CDATA[supervision]]></category>
+		<category><![CDATA[templates]]></category>
+		<category><![CDATA[whisper]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1299</guid>
+		<description><![CDATA[<p>Ya está disponible la versión 0.13.0 de QPanel Para instalar esta nueva versión, la debes descargar de https://github.com/roramirez/qpanel/tree/0.13.0 En al README.md puedes encontrar las instrucciones para hacer que funcione en tu sistema. En esta nueva versión cuenta con los siguientes cambios: Se establece un limite para el reciclado del tiempo de conexión a la base [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-13-0/">QPanel 0.13.0</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p><img class="aligncenter" src="https://raw.githubusercontent.com/roramirez/qpanel/e55aa16bbd85b579ee82e56469526270c5afa462/samples/animation.gif" alt="Panel monitor callcenter | Qpanel Monitor Colas" width="685" height="385" />Ya está disponible la versión 0.13.0 de QPanel</p>
+<p>Para instalar esta nueva versión, la debes descargar de</p>
+<ul>
+<li><a href="https://github.com/roramirez/qpanel/tree/0.13.0">https://github.com/roramirez/qpanel/tree/0.13.0</a></li>
+</ul>
+<p>En al README.md puedes encontrar las instrucciones para hacer que funcione en tu sistema.</p>
+<p>En esta nueva versión cuenta con los siguientes cambios:</p>
+<ul>
+<li>Se establece un limite para el reciclado del tiempo de conexión a la base de datos que contenga QueueLog. Esto evita problemas en bases de datos como MySQL que finaliza o da timeout a las conexiones.</li>
+<li>Ahora la py-asterisk va dentro del archivo requirements.txt y no como submodulo del proyecto.</li>
+<li>Se remueven la mayoría de las libs externas para Javascript y CSS para manejarlos desde ahora con <a href="https://bower.io/">Bower</a>.</li>
+<li>Se incluye un script para WSGI que permite su utilización con Apache.</li>
+<li>Actualización para los idiomas Ruso y Portugues.</li>
+</ul>
+<p>Si deseas colaborar con el proyecto puedes agregar nuevas sugerencias mediante un <a href="https://github.com/roramirez/qpanel/issues/new?title=[Feature]">issue</a> ó colaborar mediante <a href="https://github.com/roramirez/qpanel/blob/dd42cf0f534408505f57b0d387dffee2f3688711/README.md#how-to-contribute">mediante un Pull Request.</a></p>
+<p>Ahora si necesitas <a href="https://boxtub.com/qpanel/">soporte comercial para instalaciones, personalizaciones o nuevas características  lo puedes solicitar en https://boxtub.com/qpanel/</a></p>
+<p>&nbsp;</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-13-0/">QPanel 0.13.0</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/qpanel-0-13-0/feed/</wfw:commentRss>
+		<slash:comments>3</slash:comments>
+		</item>
+		<item>
+		<title>Problema VirtualBox &#8220;starting virtual machine&#8221; &#8230;</title>
+		<link>https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/</link>
+		<comments>https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/#respond</comments>
+		<pubDate>Sat, 10 Sep 2016 22:50:13 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Linux]]></category>
+		<category><![CDATA[no arranca]]></category>
+		<category><![CDATA[Problema]]></category>
+		<category><![CDATA[VirtualBox]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1284</guid>
+		<description><![CDATA[<p>Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox.  La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje &#8220;starting virtual machine&#8221;, como el de la imagen de a continuación. [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/">Problema VirtualBox &#8220;starting virtual machine&#8221; &#8230;</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p>Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox.  La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje &#8220;starting virtual machine&#8221;, como el de la imagen de a continuación.</p>
+<p><a href="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-10-19-25-09.png"><img class="aligncenter wp-image-1290 size-full" src="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-10-19-25-09.png" alt="Starting virtual machine ... VirtualBox" width="648" height="554" srcset="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-10-19-25-09.png 648w, https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-10-19-25-09-300x256.png 300w" sizes="(max-width: 648px) 100vw, 648px" /></a></p>
+<p>Ninguna, pero ninguna maquina arrancó, se quedaban en ese mensaje. Fue de esos instantes en que sudas helado &#8230; <img src="https://s.w.org/images/core/emoji/2.2.1/72x72/1f609.png" alt="😉" class="wp-smiley" style="height: 1em; max-height: 1em;" /></p>
+<p>Con un poco de investigación fue a parar al archivo<em> ~/.VirtualBox/VBoxSVC.log </em>que indicaba</p>
+<pre>$ tail -f ~/.VirtualBox/VBoxSVC.log
+ 00:08:32.932717 nspr-7 Failed to open "/dev/vboxdrvu", errno=13, rc=VERR_VM_DRIVER_NOT_ACCESSIBLE
+ 00:08:33.555836 nspr-6 Failed to open "/dev/vboxdrvu", errno=13, rc=VERR_VM_DRIVER_NOT_ACCESSIBLE</pre>
+<p>&nbsp;</p>
+<p>Fui&#8230; algo de donde agarrarse. Mirando un poco mas se trataba de problemas con los permisos al vboxdrvu, mirando indicaba que tenía 0600.</p>
+<p>&nbsp;</p>
+<pre>$ ls -lh /dev/vboxdrvu 
+ crw------- 1 root root 10, 56 Sep 10 12:47 /dev/vboxdrvu</pre>
+<p>&nbsp;</p>
+<p>El tema es que deben estar en 0666,  le cambias los permisos y eso soluciona el problema <img src="https://s.w.org/images/core/emoji/2.2.1/72x72/1f642.png" alt="🙂" class="wp-smiley" style="height: 1em; max-height: 1em;" /></p>
+<pre>
+$ sudo chmod 0666 /dev/vboxdrvu
+$ ls -lh /dev/vboxdrvu
+ crw-rw-rw- 1 root root 10, 56 Sep 10 12:47 /dev/vboxdrvu</pre>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/">Problema VirtualBox &#8220;starting virtual machine&#8221; &#8230;</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/feed/</wfw:commentRss>
+		<slash:comments>0</slash:comments>
+		</item>
+		<item>
+		<title>Mejorando la consola interactiva de Python</title>
+		<link>https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/</link>
+		<comments>https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/#comments</comments>
+		<pubDate>Tue, 06 Sep 2016 04:24:43 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[desarrollo]]></category>
+		<category><![CDATA[Desarrollo]]></category>
+		<category><![CDATA[Python]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1247</guid>
+		<description><![CDATA[<p>Cuando estás desarrollando en Python es muy cool estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente. La consola de Python funciona y cumple su cometido. Solo al tipear  python  te permite entrar en modo interactivo e ir probando cosas. El punto es que a veces [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/">Mejorando la consola interactiva de Python</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p>Cuando estás desarrollando en Python es muy <em>cool</em> estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente.</p>
+<p>La consola de Python funciona y cumple su cometido. Solo al tipear  <em>python  </em>te permite entrar en modo interactivo e ir probando cosas.</p>
+<p>El punto es que a veces uno necesita ir un poco más allá. Como autocomentado de código o resaltado de sintaxis, para eso tengo dos truco que utilizo generalmente.</p>
+<h2>Truco a)</h2>
+<p>Este permite añadirle algunos esteriodes a la consolta, en realidad uno, el autocompletado. Esto es de gran ayuda para ir conociendo los metodo que puede tener un objecto, funciones u operaciones.</p>
+<p>Para esto se ocupo <em>rlcompleter</em> y  <em>readline. </em></p>
+<p>&nbsp;</p>
+<p>Lo que hace que hacer luego de tipear python es agregar lo siguiente dentro de la consola interativa</p>
+<p><em>import rlcompleter, readline</em><br />
+<em>readline.parse_and_bind(&#8216;tab:complete&#8217;)</em></p>
+<p>Ya con esto te permite autocomentar código <img src="https://s.w.org/images/core/emoji/2.2.1/72x72/1f642.png" alt="🙂" class="wp-smiley" style="height: 1em; max-height: 1em;" /></p>
+<p><a href="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-03-01-14-32.png"><img class="aligncenter wp-image-1279 size-full" src="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-03-01-14-32.png" width="689" height="421" srcset="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-03-01-14-32.png 689w, https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-09-03-01-14-32-300x183.png 300w" sizes="(max-width: 689px) 100vw, 689px" /></a></p>
+<p>&nbsp;</p>
+<h2>Truco b)</h2>
+<p>Esto es mejorar un poco más. Es utilizar embed de <a href="https://ipython.org/">IPython,</a>  ya en la consola digita (copias o pegas) lo siguiente</p>
+<p><em>from IPython import embed</em><br />
+<em>embed()</em></p>
+<p>Y el resultado será lo que se ve a continuación&#8230; bueno, no?</p>
+<p>&nbsp;</p>
+<p><a href="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-07-25-15-48-39.png"><img class="aligncenter wp-image-1262 size-full" src="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-07-25-15-48-39.png" width="743" height="293" srcset="https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-07-25-15-48-39.png 743w, https://rodrigoramirez.com/wp-content/uploads/Screenshot-at-2016-07-25-15-48-39-300x118.png 300w" sizes="(max-width: 743px) 100vw, 743px" /></a></p>
+<p>&nbsp;</p>
+<p>Si no quieres estar escribiendo cada vez que entras, agregas estas instrucciones en tu archivo  <em>~/.pythonrc.py </em> y lo hará cada vez que entras en el modo interactivo de la consola de Python. Lo que si, tu archivo pythonrc.py debe estar seteado en variable de entorno PYTHONSTARTUP</p>
+<p>ejemplo</p>
+<p><em>export  PYTHONSTARTUP=~/.pythonrc.py</em></p>
+<p>O lo agregas a un bashrc, zshrc o la shell que ocupes.</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/">Mejorando la consola interactiva de Python</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/feed/</wfw:commentRss>
+		<slash:comments>4</slash:comments>
+		</item>
+		<item>
+		<title>QPanel 0.12.0 con estadísticas</title>
+		<link>https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/</link>
+		<comments>https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/#respond</comments>
+		<pubDate>Mon, 22 Aug 2016 04:19:03 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Software]]></category>
+		<category><![CDATA[app_queue]]></category>
+		<category><![CDATA[asterisk]]></category>
+		<category><![CDATA[FreeSWITCH]]></category>
+		<category><![CDATA[qpanel]]></category>
+		<category><![CDATA[queue]]></category>
+		<category><![CDATA[spy]]></category>
+		<category><![CDATA[supervision]]></category>
+		<category><![CDATA[templates]]></category>
+		<category><![CDATA[whisper]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1268</guid>
+		<description><![CDATA[<p>Ya está disponible una nueva versión de QPanel, esta es la 0.12.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.12.0 En esta nueva versión las funcionalidades agregadas son: Permite remover los agentes de las cola Posibilidad de cancelar llamadas que están en espera de atención Estadísticas por rango de fecha obtenidas desde [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/">QPanel 0.12.0 con estadísticas</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p><img class="aligncenter" src="https://raw.githubusercontent.com/roramirez/qpanel/e55aa16bbd85b579ee82e56469526270c5afa462/samples/animation.gif" alt="Panel monitor callcenter | Qpanel Monitor Colas" width="685" height="385" />Ya está disponible una nueva versión de QPanel, esta es la 0.12.0</p>
+<p>Para instalar esta nueva versión, debes visitar la siguiente URL</p>
+<ul>
+<li><a href="https://github.com/roramirez/qpanel/tree/0.12.0">https://github.com/roramirez/qpanel/tree/0.12.0</a></li>
+</ul>
+<p>En esta nueva versión las funcionalidades agregadas son:</p>
+<ul>
+<li>Permite remover los agentes de las cola</li>
+<li>Posibilidad de cancelar llamadas que están en espera de atención</li>
+<li>Estadísticas por rango de fecha obtenidas desde el queue_log de Asterisk</li>
+<li>Se actualiza a Flask 0.11</li>
+</ul>
+<p>Si deseas colaborar con el proyecto puedes agregar nuevas sugerencias mediante un <a href="https://github.com/roramirez/qpanel/issues/new?title=[Feature]">issue</a> ó colaborar mediante <a href="https://github.com/roramirez/qpanel/blob/dd42cf0f534408505f57b0d387dffee2f3688711/README.md#how-to-contribute">mediante un Pull Request</a></p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/">QPanel 0.12.0 con estadísticas</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/feed/</wfw:commentRss>
+		<slash:comments>0</slash:comments>
+		</item>
+		<item>
+		<title>QPanel 0.11.0 con Spy, Whisper  y mas</title>
+		<link>https://rodrigoramirez.com/qpanel-spy-supervisor/</link>
+		<comments>https://rodrigoramirez.com/qpanel-spy-supervisor/#comments</comments>
+		<pubDate>Thu, 21 Jul 2016 01:53:21 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Software]]></category>
+		<category><![CDATA[app_queue]]></category>
+		<category><![CDATA[asterisk]]></category>
+		<category><![CDATA[FreeSWITCH]]></category>
+		<category><![CDATA[qpanel]]></category>
+		<category><![CDATA[queue]]></category>
+		<category><![CDATA[spy]]></category>
+		<category><![CDATA[supervision]]></category>
+		<category><![CDATA[templates]]></category>
+		<category><![CDATA[whisper]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1245</guid>
+		<description><![CDATA[<p>Ya está disponible una nueva versión de QPanel, esta es la 0.11.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.11.0 Esta versión hemos agregado  algunas funcionalidades que los usuarios  han ido solicitando. Para esta versión es posible realizar Spy, Whisper o Barge a un canal para la supervisión de los miembros que [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-spy-supervisor/">QPanel 0.11.0 con Spy, Whisper  y mas</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p><img class="aligncenter" src="https://raw.githubusercontent.com/roramirez/qpanel/e55aa16bbd85b579ee82e56469526270c5afa462/samples/animation.gif" alt="Panel monitor callcenter | Qpanel Monitor Colas" width="685" height="385" />Ya está disponible una nueva versión de QPanel, esta es la 0.11.0</p>
+<p>Para instalar esta nueva versión, debes visitar la siguiente URL</p>
+<ul>
+<li><a href="https://github.com/roramirez/qpanel/tree/0.11.0">https://github.com/roramirez/qpanel/tree/0.11.0</a></li>
+</ul>
+<p>Esta versión hemos agregado  algunas funcionalidades que los usuarios  han ido solicitando.</p>
+<p>Para esta versión es posible realizar Spy, Whisper o Barge a un canal para la supervisión de los miembros que están en una cola.</p>
+<p>También el sistema de plantillas se hecho una refactorización para eliminar exceso de codigo HTML usando uno de base.</p>
+<p>Se han agregado una suite de tests unitarios que al contar del avance del proyecto deberían ir incrementando.</p>
+<p>Se ha solucionado un bug con la actualización del color del estado del agente cuando es uno nuevo agregado a la cola.</p>
+<p>&nbsp;</p>
+<p>El proyecto siempre está abierto a nuevas sugerencias las cuales puedes agregar mediante un <a href="https://github.com/roramirez/qpanel/issues/new?title=[Feature]">issue</a>.</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-spy-supervisor/">QPanel 0.11.0 con Spy, Whisper  y mas</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/qpanel-spy-supervisor/feed/</wfw:commentRss>
+		<slash:comments>4</slash:comments>
+		</item>
+		<item>
+		<title>Añadir Swap a un sistema</title>
+		<link>https://rodrigoramirez.com/crear-swap/</link>
+		<comments>https://rodrigoramirez.com/crear-swap/#respond</comments>
+		<pubDate>Fri, 15 Jul 2016 05:07:43 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Linux]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1234</guid>
+		<description><![CDATA[<p>Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap. La  memoria swap es un espacio de intercambio en disco para cuando el sistema ya no puede utilizar más memoria RAM. El problema para mi es que algunos sistemas de maquinas virtuales no asignan por defecto [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/crear-swap/">Añadir Swap a un sistema</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p>Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap.</p>
+<p>La  memoria swap es un espacio de intercambio en disco para cuando el sistema ya no puede utilizar más memoria RAM.</p>
+<p>El problema para mi es que algunos sistemas de maquinas virtuales no asignan por defecto un espacio para la Swap, lo que te lleva a que el sistema pueda tener crash durante la ejecución.</p>
+<p>Para comprobar la asignación de memoria, al ejecutar el comando <em>free</em> nos debería mostrar como algo similar a lo siguiente</p>
+<p>&nbsp;</p>
+<pre>$  free -m
+             total       used       free     shared    buffers     cached
+Mem:           494        488          6          1         54         75
+-/+ buffers/cache:        357        136
+Swap:            0          0          0</pre>
+<p>En la zona de swap indica que no asignada, valor 0.</p>
+<p>Para asignar swap al sistema se debe  un archivo en disco para que sea utilizado como espacio de intercambio, en este caso lo vamos  crear uno  de 3GB en la raíz del sistema</p>
+<pre class="code-pre "><code>fallocate -l 3G /swapfile</code></pre>
+<p>Comprobamos que ha sido creado</p>
+<pre>$ ls -lh /swapfile
+-rw-r--r-- 1 root root 3.0G Jul 11 13:10 /swapfile
+</pre>
+<h3>Habilitación del archivo Swap</h3>
+<p>Ahora nos toca habilitar el archivo creado. Para eso le asignaremos los permisos</p>
+<pre>chmod 600 /swapfile</pre>
+<p>Lo siguiente es para convertir el  archivo para swap</p>
+<pre>mkswap /swapfile</pre>
+<p>Para habilitar y asignarla eso como memoria swap al sistema usamos</p>
+<pre>swapon /swapfile</pre>
+<p>Ya con esto podrémos ver en nuestro sistema la memoria asignada para swap</p>
+<pre>$ free -m
+             total       used       free     shared    buffers     cached
+Mem:           494        486          7          1         51         77
+-/+ buffers/cache:        358        136
+Swap:         3071          0       3071</pre>
+<p>&nbsp;</p>
+<p>Para que al reiniciar el sistema esto se mantenga, debemos agregar la siguiente línea al archivo /etc/fstab</p>
+<pre><span class="pl-s">/swapfile none swap sw 0 0</span></pre>
+<p>&nbsp;</p>
+<p>Podemos editar /etc/fstab con algún editor como vim, nano o podemos agregar la linea directamente en la desde la cli de la siguiente manera</p>
+<pre><span class="pl-c1">echo</span> <span class="pl-s"><span class="pl-pds">"</span>/swapfile none swap sw 0 0<span class="pl-pds">"</span></span> <span class="pl-k">&gt;&gt;</span> /etc/fstab</pre>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/crear-swap/">Añadir Swap a un sistema</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/crear-swap/feed/</wfw:commentRss>
+		<slash:comments>0</slash:comments>
+		</item>
+		<item>
+		<title>QPanel 0.10.0 con vista consolidada</title>
+		<link>https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/</link>
+		<comments>https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/#respond</comments>
+		<pubDate>Mon, 20 Jun 2016 19:32:55 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Linux]]></category>
+		<category><![CDATA[app_queue]]></category>
+		<category><![CDATA[asterisk]]></category>
+		<category><![CDATA[FreeSWITCH]]></category>
+		<category><![CDATA[qpanel]]></category>
+		<category><![CDATA[queue]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1227</guid>
+		<description><![CDATA[<p>Ya con la release numero 28 la nueva versión 0.10.0 de QPanel ya está disponible. Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.10.0 Esta versión versión nos preocupamos de realizar mejoras, refactorizaciones y agregamos una nueva funcionalidad. La nueva funcionalidad incluida es  que ahora es posible contar con una vista consolidada para [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/">QPanel 0.10.0 con vista consolidada</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p><img class="alignleft" src="https://raw.githubusercontent.com/roramirez/qpanel/0.10.0/samples/animation.gif" alt="Panel monitor callcenter | Qpanel Monitor Colas" width="403" height="227" />Ya con la release numero 28 la nueva versión 0.10.0 de QPanel ya está disponible.</p>
+<p>Para instalar esta nueva versión, debes visitar la siguiente URL</p>
+<ul>
+<li><a href="https://github.com/roramirez/qpanel/tree/0.10.0">https://github.com/roramirez/qpanel/tree/0.10.0</a></li>
+</ul>
+<p>Esta versión versión nos preocupamos de realizar mejoras, refactorizaciones y agregamos una nueva funcionalidad.</p>
+<p>La nueva funcionalidad incluida es  que ahora es posible contar con una vista consolidada para la información de todas las colas. Que hace tener un mejor control y visualización de lo que está pasando en las colas.</p>
+<p>El proyecto siempre está abierto a nuevas sugerencias las cuales puedes agregar mediante un <a href="https://github.com/roramirez/qpanel/issues/new?title=[Feature]">issue</a>.</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/">QPanel 0.10.0 con vista consolidada</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/feed/</wfw:commentRss>
+		<slash:comments>0</slash:comments>
+		</item>
+		<item>
+		<title>Nerdearla 2016, WebRTC Glue</title>
+		<link>https://rodrigoramirez.com/nerdearla-2016/</link>
+		<comments>https://rodrigoramirez.com/nerdearla-2016/#respond</comments>
+		<pubDate>Wed, 15 Jun 2016 17:55:41 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Linux]]></category>
+		<category><![CDATA[baires]]></category>
+		<category><![CDATA[charla]]></category>
+		<category><![CDATA[Computación]]></category>
+		<category><![CDATA[informatica]]></category>
+		<category><![CDATA[tech]]></category>
+		<category><![CDATA[ti]]></category>
+		<category><![CDATA[webrtc]]></category>
+
+		<guid isPermaLink="false">https://rodrigoramirez.com/?p=1218</guid>
+		<description><![CDATA[<p>Días atrás estuve participando en el evento llamado Nerdearla en Buenos Aires.  El ambiente era genial si eres de esas personas que desde niño sintio curiosidad por ver como funcionan las cosas, donde desarmabas para volver armar lo juguetes. Habían muchas cosas interesantes tanto en las presentaciones, co-working y workshop que se hubieron. Si te [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/nerdearla-2016/">Nerdearla 2016, WebRTC Glue</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p>Días atrás estuve participando en el evento llamado <a href="http://nerdear.la/">Nerdearla</a> en Buenos Aires.  El ambiente era genial si eres de esas personas que desde niño sintio curiosidad por ver como funcionan las cosas, donde desarmabas para volver armar lo juguetes.</p>
+<p>Habían muchas cosas interesantes tanto en las presentaciones, co-working y workshop que se hubieron. Si te lo perdiste te recomiendo que estés pendiente para el proximo año.</p>
+<p>&nbsp;</p>
+<p>Te podias encontrar con una nuestra como esta<a href="https://rodrigoramirez.com/wp-content/uploads/CkhnO83XAAAfaxS.jpg"><img class="aligncenter size-medium wp-image-1221" src="https://rodrigoramirez.com/wp-content/uploads/CkhnO83XAAAfaxS-300x169.jpg" alt="Kaypro II" width="300" height="169" srcset="https://rodrigoramirez.com/wp-content/uploads/CkhnO83XAAAfaxS-300x169.jpg 300w, https://rodrigoramirez.com/wp-content/uploads/CkhnO83XAAAfaxS-768x432.jpg 768w, https://rodrigoramirez.com/wp-content/uploads/CkhnO83XAAAfaxS-1024x576.jpg 1024w, https://rodrigoramirez.com/wp-content/uploads/CkhnO83XAAAfaxS.jpg 1200w" sizes="(max-width: 300px) 100vw, 300px" /></a></p>
+<p>Puedes dar un vistaso a lo registrado por algunos <a href="https://twitter.com/hashtag/nerdearla?f=tweets&amp;vertical=default&amp;src=hash">usuarios en Twitter</a></p>
+<p>El primer día hice un workshop denominado WebRTC Glue, donde muestra como hacer como unificar la experiencia de atención del centro de contacto directamente en la web. Es una presentación práctica donde puedes ver los ejemplos y usarlos como gustes. Están en <a href="https://gitlab.com/roramirez/webrtc-glue">el repositorio en Gitlab</a>. La presentación <a href="/charlas/webrtc-glue/index.html">la puedes ver aquí</a></p>
+<p>&nbsp;</p>
+<p><a href="https://rodrigoramirez.com/wp-content/uploads/CkhxulgWYAAp7fW.jpg"><img class="aligncenter size-medium wp-image-1222" src="https://rodrigoramirez.com/wp-content/uploads/CkhxulgWYAAp7fW-300x169.jpg" alt="WebRTC Glue" width="300" height="169" srcset="https://rodrigoramirez.com/wp-content/uploads/CkhxulgWYAAp7fW-300x169.jpg 300w, https://rodrigoramirez.com/wp-content/uploads/CkhxulgWYAAp7fW-768x432.jpg 768w, https://rodrigoramirez.com/wp-content/uploads/CkhxulgWYAAp7fW-1024x576.jpg 1024w, https://rodrigoramirez.com/wp-content/uploads/CkhxulgWYAAp7fW.jpg 1200w" sizes="(max-width: 300px) 100vw, 300px" /></a></p>
+<p>Haber si nos vemos el próximo año.</p>
+<p>&nbsp;</p>
+<p><strong>Update</strong>: Puedes ver una parte sin la demostración del workshop</p>
+<p><iframe src="https://www.youtube.com/embed/qDreeYk-UK4?list=PLTTdzfRyGY1vQukK8L4QeAfYdbURSzFq5" width="560" height="315" frameborder="0" allowfullscreen="allowfullscreen"></iframe><br />
+&nbsp;</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/nerdearla-2016/">Nerdearla 2016, WebRTC Glue</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/nerdearla-2016/feed/</wfw:commentRss>
+		<slash:comments>0</slash:comments>
+		</item>
+		<item>
+		<title>QPanel 0.9.0</title>
+		<link>https://rodrigoramirez.com/qpanel-0-9-0/</link>
+		<comments>https://rodrigoramirez.com/qpanel-0-9-0/#respond</comments>
+		<pubDate>Mon, 09 May 2016 18:40:23 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Software]]></category>
+		<category><![CDATA[asterisk]]></category>
+		<category><![CDATA[callcenter]]></category>
+		<category><![CDATA[colas]]></category>
+		<category><![CDATA[monitor]]></category>
+		<category><![CDATA[monitoreo]]></category>
+		<category><![CDATA[panel]]></category>
+		<category><![CDATA[qpanel]]></category>
+		<category><![CDATA[queues]]></category>
+
+		<guid isPermaLink="false">http://rodrigoramirez.com/?p=1206</guid>
+		<description><![CDATA[<p>El Panel monitor callcenter para colas de Asterisk ya cuenta con una nueva versión, la 0.9.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.9.0 Esta versión versión nos preocupamos de realizar mejoras y refactorizaciones en el codigo para dar un mejor rendimiento, como también de la compatibilidad con la versión 11 de [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-9-0/">QPanel 0.9.0</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p><img class="alignleft" src="https://raw.githubusercontent.com/roramirez/qpanel/0.9.0/samples/animation.gif" alt="Panel monitor callcenter | Qpanel Monitor Colas" width="403" height="227" />El Panel monitor callcenter para colas de Asterisk ya cuenta con una nueva versión, la 0.9.0</p>
+<p>Para instalar esta nueva versión, debes visitar la siguiente URL</p>
+<ul>
+<li><a href="https://github.com/roramirez/qpanel/tree/0.9.0">https://github.com/roramirez/qpanel/tree/0.9.0</a></li>
+</ul>
+<p>Esta versión versión nos preocupamos de realizar mejoras y refactorizaciones en el codigo para dar un mejor rendimiento, como también de la compatibilidad con la versión 11 de Asterisk.</p>
+<p>Dentro de las cosas que podamos mencionar:</p>
+<ul>
+<li> Actualización del repositorio y versión de py-asterisk, biblioteca para trabajar con Asterisk. Acá la ocupamos principalmente para uso del Manager.</li>
+<li>Portación de parche de funcionalidades como pausa, tiempo, razón de una pausa para Asterisk 11.</li>
+<li>Cambio del comportamiento en el conteo cuando el participante en una cola está ocupado (busy)</li>
+</ul>
+<p>El proyecto siempre está abierto a nuevas sugerencias las cuales puedes agregar mediante un <a href="https://github.com/roramirez/qpanel/issues/new?title=[Feature]">issue</a>.</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/qpanel-0-9-0/">QPanel 0.9.0</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/qpanel-0-9-0/feed/</wfw:commentRss>
+		<slash:comments>0</slash:comments>
+		</item>
+		<item>
+		<title>Mandar un email desde la shell</title>
+		<link>https://rodrigoramirez.com/mandar-un-email-desde-la-shell/</link>
+		<comments>https://rodrigoramirez.com/mandar-un-email-desde-la-shell/#comments</comments>
+		<pubDate>Wed, 13 Apr 2016 13:05:13 +0000</pubDate>
+		<dc:creator><![CDATA[decipher]]></dc:creator>
+				<category><![CDATA[Linux]]></category>
+		<category><![CDATA[mini-tips]]></category>
+		<category><![CDATA[bash]]></category>
+		<category><![CDATA[cli]]></category>
+		<category><![CDATA[Email]]></category>
+		<category><![CDATA[mail]]></category>
+		<category><![CDATA[sh]]></category>
+		<category><![CDATA[shell]]></category>
+
+		<guid isPermaLink="false">http://rodrigoramirez.com/?p=1172</guid>
+		<description><![CDATA[<p>Dejo esto por acá ya que es algo que siempre me olvido como es. El tema es enviar un email mediante el comando mail en un servidor con Linux. Si usas mail a secas te va pidiendo los datos para crear el correo, principalmente el body del correo. Para automatizar esto a través de un [&#8230;]</p>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/mandar-un-email-desde-la-shell/">Mandar un email desde la shell</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></description>
+				<content:encoded><![CDATA[<p>Dejo esto por acá ya que es algo que siempre me olvido como es. El tema es enviar un email mediante el comando <em>mail</em> en un servidor con Linux.</p>
+<p>Si usas mail a secas te va pidiendo los datos para crear el correo, principalmente el body del correo. Para automatizar esto a través de un <em>echo</em> le pasas por pipe a <em>mail</em></p>
+<pre>echo "Cuerpo del mensaje" | mail -s Asunto a@rodrigoramirez.com</pre>
+<p>La entrada <a rel="nofollow" href="https://rodrigoramirez.com/mandar-un-email-desde-la-shell/">Mandar un email desde la shell</a> aparece primero en <a rel="nofollow" href="https://rodrigoramirez.com">Rodrigo Ramírez Norambuena</a>.</p>
+]]></content:encoded>
+			<wfw:commentRss>https://rodrigoramirez.com/mandar-un-email-desde-la-shell/feed/</wfw:commentRss>
+		<slash:comments>4</slash:comments>
+		</item>
+	</channel>
+</rss>
--- a/tests/configs/modules/clock/clock_showWeek.js
+++ b/tests/configs/modules/clock/clock_showWeek.js
@@ -0,0 +1,32 @@
+/* Magic Mirror Test config for default clock module
+ *
+ * By Johan Hammar
+ * MIT Licensed.
+ */
+
+var config = {
+	port: 8080,
+	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+
+	language: "en",
+	timeFormat: 12,
+	units: "metric",
+	electronOptions: {
+		webPreferences: {
+			nodeIntegration: true,
+		},
+	},
+
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				showWeek: true
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {module.exports = config;}
--- a/tests/configs/modules/newsfeed/default.js
+++ b/tests/configs/modules/newsfeed/default.js
@@ -0,0 +1,38 @@
+/* Magic Mirror Test config newsfeed module
+ *
+ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
+ * MIT Licensed.
+ */
+
+var config = {
+	port: 8080,
+	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+
+	language: "en",
+	timeFormat: 12,
+	units: "metric",
+	electronOptions: {
+		webPreferences: {
+			nodeIntegration: true,
+		},
+	},
+
+	modules: [
+		{
+
+			module: "newsfeed",
+			position: "bottom_bar",
+			config: {
+				feeds: [
+					{
+						title: "Rodrigo Ramirez Blog",
+						url: "http://localhost:8080/tests/configs/data/feed_test_rodrigoramirez.xml"
+					},
+				]
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {module.exports = config;}
--- a/tests/configs/modules/positions.js
+++ b/tests/configs/modules/positions.js
@@ -0,0 +1,43 @@
+/* Magic Mirror Test config for position setters module
+ *
+ * For this case is using helloworld module
+ *
+ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
+ * MIT Licensed.
+ */
+
+
+var config = {
+	port: 8080,
+	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+	ipWhitelist: [],
+
+	language: "en",
+	timeFormat: 24,
+	units: "metric",
+	electronOptions: {
+		webPreferences: {
+			nodeIntegration: true,
+		},
+	},
+	modules:
+		// Using exotic content. This is why dont accept go to JSON configuration file
+		(function() {
+			var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third",
+				"middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right",
+				"bottom_bar", "fullscreen_above", "fullscreen_below"];
+			var modules = Array();
+			for (idx in positions) {
+				modules.push({
+					module: "helloworld",
+					position: positions[idx],
+					config: {
+						text: "Text in " + positions[idx]
+					}
+				});
+			}
+			return modules;
+		})(),
+};
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {module.exports = config;}
--- a/tests/configs/port_8090.js
+++ b/tests/configs/port_8090.js
@@ -0,0 +1,25 @@
+/* Magic Mirror Test config sample enviroment set por 8090
+ *
+ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
+ * MIT Licensed.
+ */
+
+var config = {
+	port: 8090,
+	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+
+	language: "en",
+	timeFormat: 24,
+	units: "metric",
+	electronOptions: {
+		webPreferences: {
+			nodeIntegration: true,
+		},
+	},
+
+	modules: [
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {module.exports = config;}
--- a/tests/e2e/dev_console.js
+++ b/tests/e2e/dev_console.js
@@ -1,50 +1,65 @@
-const Application = require("spectron").Application;
+const helpers = require("./global-setup");
 const path = require("path");
-const chai = require("chai");
-const expect = chai.expect;
-const chaiAsPromised = require("chai-as-promised");
+const request = require("request");

-var electronPath = path.join(__dirname, "../../", "node_modules", ".bin", "electron");
+const expect = require("chai").expect;

-if (process.platform === "win32") {
-	electronPath += ".cmd";
-}
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

-var appPath = path.join(__dirname, "../../js/electron.js");
+describe("Development console tests", function() {
+	// This tests fail and crash another tests
+	// Suspect problem with window focus
+	// FIXME
+	return false;

-var app = new Application({
-	path: electronPath
-});
+	helpers.setupTimeout(this);

-global.before(function () {
-	chai.should();
-	chai.use(chaiAsPromised);
-});
-
-describe("Argument 'dev'", function () {
-	this.timeout(20000);
+	var app = null;

 	before(function() {
 		// Set config sample for use in test
 		process.env.MM_CONFIG_FILE = "tests/configs/env.js";
 	});

-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	describe("Without 'dev' commandline argument", function() {
+		before(function() {
+			return helpers
+				.startApplication({
+					args: ["js/electron.js"]
+				})
+				.then(function(startedApp) {
+					app = startedApp;
+				});
+		});
+
+		after(function() {
+			return helpers.stopApplication(app);
 		});

 		it("should not open dev console when absent", function() {
-		app.args = [appPath];
-
-		return app.start().then(function() {
 			return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(false);
 		});
 	});

-	it("should open dev console when provided", function () {
-		app.args = [appPath, "dev"];
+	describe("With 'dev' commandline argument", function() {
+		before(function() {
+			return helpers
+				.startApplication({
+					args: ["js/electron.js", "dev"]
+				})
+				.then(function(startedApp) {
+					app = startedApp;
+				});
+		});

-		return app.start().then(function() {
+		after(function() {
+			return helpers.stopApplication(app);
+		});
+
+		it("should open dev console when provided", function() {
 			return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(true);
 		});
 	});
--- a/tests/e2e/env_spec.js
+++ b/tests/e2e/env_spec.js
@@ -1,33 +1,56 @@
-const globalSetup = require("./global-setup");
-const app = globalSetup.app;
+const helpers = require("./global-setup");
+const path = require("path");
 const request = require("request");
-const chai = require("chai");
-const expect = chai.expect;
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("Electron app environment", function() {
-	this.timeout(20000);
+	helpers.setupTimeout(this);
+
+	var app = null;

 	before(function() {
 		// Set config sample for use in test
 		process.env.MM_CONFIG_FILE = "tests/configs/env.js";
 	});

-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
 	});

-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	afterEach(function() {
+		return helpers.stopApplication(app);
 	});

-	it("is set to open new app window", function () {
-		return app.client.waitUntilWindowLoaded()
-			.getWindowCount().should.eventually.equal(1);
-	});
-
-	it("sets correct window title", function () {
-		return app.client.waitUntilWindowLoaded()
-			.getTitle().should.eventually.equal("Magic Mirror");
+	it("should open a browserwindow", function() {
+		return app.client
+			.waitUntilWindowLoaded()
+			.browserWindow.focus()
+			.getWindowCount()
+			.should.eventually.equal(1)
+			.browserWindow.isMinimized()
+			.should.eventually.be.false.browserWindow.isDevToolsOpened()
+			.should.eventually.be.false.browserWindow.isVisible()
+			.should.eventually.be.true.browserWindow.isFocused()
+			.should.eventually.be.true.browserWindow.getBounds()
+			.should.eventually.have.property("width")
+			.and.be.above(0)
+			.browserWindow.getBounds()
+			.should.eventually.have.property("height")
+			.and.be.above(0)
+			.browserWindow.getTitle()
+			.should.eventually.equal("MagicMirror²");
 	});

 	it("get request from http://localhost:8080 should return 200", function(done) {
@@ -37,4 +60,10 @@ describe("Electron app environment", function () {
 		});
 	});

+	it("get request from http://localhost:8080/nothing should return 404", function(done) {
+		request.get("http://localhost:8080/nothing", function(err, res, body) {
+			expect(res.statusCode).to.equal(404);
+			done();
+		});
+	});
 });
--- a/tests/e2e/global-setup.js
+++ b/tests/e2e/global-setup.js
@@ -9,26 +9,54 @@
 */

 const Application = require("spectron").Application;
-const path = require("path");
+const assert = require("assert");
 const chai = require("chai");
 const chaiAsPromised = require("chai-as-promised");

-var electronPath = path.join(__dirname, "../../", "node_modules", ".bin", "electron");
-
-if (process.platform === "win32") {
-	electronPath += ".cmd";
-}
-
-var appPath = path.join(__dirname, "../../js/electron.js");
-
-var app = new Application({
-	path: electronPath,
-	args: [appPath]
-});
+const path = require("path");

 global.before(function() {
 	chai.should();
 	chai.use(chaiAsPromised);
 });

-exports.app = app;
+exports.getElectronPath = function() {
+	var electronPath = path.join(__dirname, "..", "..", "node_modules", ".bin", "electron");
+	if (process.platform === "win32") {
+		electronPath += ".cmd";
+	}
+	return electronPath;
+};
+
+// Set timeout - if this is run within Travis, increase timeout
+exports.setupTimeout = function(test) {
+	if (process.env.CI) {
+		test.timeout(30000);
+	} else {
+		test.timeout(10000);
+	}
+};
+
+exports.startApplication = function(options) {
+	options.path = exports.getElectronPath();
+	if (process.env.CI) {
+		options.startTimeout = 30000;
+	}
+
+	var app = new Application(options);
+	return app.start().then(function() {
+		assert.equal(app.isRunning(), true);
+		chaiAsPromised.transferPromiseness = app.transferPromiseness;
+		return app;
+	});
+};
+
+exports.stopApplication = function(app) {
+	if (!app || !app.isRunning()) {
+		return;
+	}
+
+	return app.stop().then(function() {
+		assert.equal(app.isRunning(), false);
+	});
+};
--- a/tests/e2e/ipWhistlist_spec.js
+++ b/tests/e2e/ipWhistlist_spec.js
@@ -1,20 +1,27 @@
-const globalSetup = require("./global-setup");
-const app = globalSetup.app;
+const helpers = require("./global-setup");
+const path = require("path");
 const request = require("request");
-const chai = require("chai");
-const expect = chai.expect;

+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("ipWhitelist directive configuration", function () {
+	helpers.setupTimeout(this);

-	this.timeout(20000);
+	var app = null;

-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
+	beforeEach(function () {
+		return helpers.startApplication({
+			args: ["js/electron.js"]
+		}).then(function (startedApp) { app = startedApp; })
 	});

-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	afterEach(function () {
+		return helpers.stopApplication(app);
 	});

 	describe("Set ipWhitelist without access", function () {
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -1,19 +1,32 @@
-const globalSetup = require("../global-setup");
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
 const serverBasicAuth = require("../../servers/basic-auth.js");
-const app = globalSetup.app;
-const chai = require("chai");
-const expect = chai.expect;
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("Calendar module", function() {
+	helpers.setupTimeout(this);

-	this.timeout(20000);
+	var app = null;

-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
 	});

-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	afterEach(function() {
+		return helpers.stopApplication(app);
 	});

 	describe("Default configuration", function() {
@@ -27,7 +40,6 @@ describe("Calendar module", function () {
 		});
 	});

-
 	describe("Basic auth", function() {
 		before(function() {
 			serverBasicAuth.listen(8010);
@@ -35,12 +47,15 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/basic-auth.js";
 		});

+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
 		it("Should return TestEvents", function() {
 			return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 		});
 	});

-
 	describe("Basic auth by default", function() {
 		before(function() {
 			serverBasicAuth.listen(8011);
@@ -48,6 +63,10 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/auth-default.js";
 		});

+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
 		it("Should return TestEvents", function() {
 			return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 		});
@@ -60,6 +79,10 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/old-basic-auth.js";
 		});

+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
 		it("Should return TestEvents", function() {
 			return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 		});
@@ -72,10 +95,12 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/fail-basic-auth.js";
 		});

+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
 		it("Should return No upcoming events", function() {
 			return app.client.waitUntilTextExists(".calendar", "No upcoming events.", 10000);
 		});
 	});
-
-
 });
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -1,8 +1,32 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("Clock set to spanish language module", function() {
-	this.timeout(20000);
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
+	});
+
+	afterEach(function() {
+		return helpers.stopApplication(app);
+	});

 	describe("with default 24hr clock config", function() {
 		before(function() {
@@ -10,24 +34,14 @@ describe("Clock set to spanish language module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_24hr.js";
 		});

-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows date with correct format", function() {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});

 		it("shows time in 24hr format", function() {
-			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});

@@ -37,24 +51,14 @@ describe("Clock set to spanish language module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_12hr.js";
 		});

-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows date with correct format", function() {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});

 		it("shows time in 12hr format", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});

@@ -64,18 +68,9 @@ describe("Clock set to spanish language module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showPeriodUpper.js";
 		});

-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows 12hr time with upper case AM/PM", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
 });
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -1,8 +1,32 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("Clock module", function() {
-	this.timeout(20000);
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
+	});
+
+	afterEach(function() {
+		return helpers.stopApplication(app);
+	});

 	describe("with default 24hr clock config", function() {
 		before(function() {
@@ -10,24 +34,14 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_24hr.js";
 		});

-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows date with correct format", function() {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});

 		it("shows time in 24hr format", function() {
-			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});

@@ -37,24 +51,14 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_12hr.js";
 		});

-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows date with correct format", function() {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});

 		it("shows time in 12hr format", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});

@@ -64,18 +68,9 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showPeriodUpper.js";
 		});

-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows 12hr time with upper case AM/PM", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});

@@ -85,19 +80,29 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_displaySeconds_false.js";
 		});

-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows 12hr time without seconds am/pm", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[ap]m$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});

+	describe("with showWeek config enabled", function() {
+		before(function() {
+			// Set config sample for use in test
+			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showWeek.js";
+		});
+
+		it("shows week with correct format", function() {
+			const weekRegex = /^Week [0-9]{1,2}$/;
+			return app.client.waitUntilWindowLoaded().getText(".clock .week").should.eventually.match(weekRegex);
+		});
+
+		it("shows week with correct number of week of year", function() {
+			it("FIXME: if the day is a sunday this not match");
+			//	const currentWeekNumber = require("current-week-number")();
+			//	const weekToShow = "Week " + currentWeekNumber;
+			//	return app.client.waitUntilWindowLoaded()
+			//		.getText(".clock .week").should.eventually.equal(weekToShow);
+		});
+	});
 });
--- a/tests/e2e/modules/compliments_spec.js
+++ b/tests/e2e/modules/compliments_spec.js
@@ -1,23 +1,34 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
-const chai = require("chai");
-const expect = chai.expect;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("Compliments module", function() {
-	this.timeout(20000);
+	helpers.setupTimeout(this);

+	var app = null;

-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
 	});

-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	afterEach(function() {
+		return helpers.stopApplication(app);
 	});

-
 	describe("parts of days", function() {
-
 		before(function() {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_parts_day.js";
@@ -27,10 +38,9 @@ describe("Compliments module", function () {
 			var hour = new Date().getHours();
 			if (hour >= 3 && hour < 12) {
 				// if morning check
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
 					expect(text).to.be.oneOf(["Hi", "Good Morning", "Morning test"]);
-					})
+				});
 			}
 		});

@@ -38,10 +48,9 @@ describe("Compliments module", function () {
 			var hour = new Date().getHours();
 			if (hour >= 12 && hour < 17) {
 				// if morning check
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
 					expect(text).to.be.oneOf(["Hello", "Good Afternoon", "Afternoon test"]);
-					})
+				});
 			}
 		});

@@ -49,18 +58,14 @@ describe("Compliments module", function () {
 			var hour = new Date().getHours();
 			if (!(hour >= 3 && hour < 12) && !(hour >= 12 && hour < 17)) {
 				// if evening check
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
 					expect(text).to.be.oneOf(["Hello There", "Good Evening", "Evening test"]);
-					})
+				});
 			}
 		});
-
 	});

-
 	describe("Feature anytime in compliments module", function() {
-
 		describe("Set anytime and empty compliments for morning, evening and afternoon ", function() {
 			before(function() {
 				// Set config sample for use in test
@@ -68,10 +73,9 @@ describe("Compliments module", function () {
 			});

 			it("Show anytime because if configure empty parts of day compliments and set anytime compliments", function() {
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
 					expect(text).to.be.oneOf(["Anytime here"]);
-					})
+				});
 			});
 		});

@@ -82,14 +86,10 @@ describe("Compliments module", function () {
 			});

 			it("Show anytime compliments", function() {
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
 					expect(text).to.be.oneOf(["Anytime here"]);
-					})
 				});
 			});
-
-
 		});
-
+	});
 });
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -1,24 +1,39 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("Test helloworld module", function() {
-	this.timeout(20000);
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
+	});

 	before(function() {
 		// Set config sample for use in test
 		process.env.MM_CONFIG_FILE = "tests/configs/modules/helloworld/helloworld.js";
 	});

-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
-	});
-
-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	afterEach(function() {
+		return helpers.stopApplication(app);
 	});

 	it("Test message helloworld module", function() {
-		return app.client.waitUntilWindowLoaded()
-			.getText(".helloworld").should.eventually.equal("Test HelloWorld Module");
+		return app.client.waitUntilWindowLoaded().getText(".helloworld").should.eventually.equal("Test HelloWorld Module");
 	});
 });
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -0,0 +1,40 @@
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
+
+describe("Newsfeed module", function() {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
+	});
+
+	afterEach(function() {
+		return helpers.stopApplication(app);
+	});
+
+	describe("Default configuration", function() {
+		before(function() {
+			process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/default.js";
+		});
+
+		it("show title newsfeed", function() {
+			return app.client.waitUntilTextExists(".newsfeed .small", "Rodrigo Ramirez Blog", 10000).should.be.fulfilled;
+		});
+	});
+});
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -0,0 +1,50 @@
+const helpers = require("./global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
+
+describe("Position of modules", function () {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function () {
+		return helpers.startApplication({
+			args: ["js/electron.js"]
+		}).then(function (startedApp) { app = startedApp; })
+	});
+
+	afterEach(function () {
+		return helpers.stopApplication(app);
+	});
+
+	describe("Using helloworld", function () {
+
+		before(function () {
+			// Set config sample for use in test
+			process.env.MM_CONFIG_FILE = "tests/configs/modules/positions.js";
+		});
+
+		var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third",
+			"middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right",
+			"bottom_bar", "fullscreen_above", "fullscreen_below"];
+
+		var position;
+		var className;
+		for (idx in positions) {
+			position = positions[idx];
+			className = position.replace("_", ".");
+			it("show text in " + position, function () {
+				return app.client.waitUntilWindowLoaded()
+					.getText("." + className).should.eventually.equal("Text in " + position);
+			});
+		}
+	});
+
+});
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -0,0 +1,60 @@
+const helpers = require("./global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
+
+describe("port directive configuration", function () {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function () {
+		return helpers.startApplication({
+			args: ["js/electron.js"]
+		}).then(function (startedApp) { app = startedApp; })
+	});
+
+	afterEach(function () {
+		return helpers.stopApplication(app);
+	});
+
+	describe("Set port 8090", function () {
+		before(function () {
+			// Set config sample for use in this test
+			process.env.MM_CONFIG_FILE = "tests/configs/port_8090.js";
+		});
+
+		it("should return 200", function (done) {
+			request.get("http://localhost:8090", function (err, res, body) {
+				expect(res.statusCode).to.equal(200);
+				done();
+			});
+		});
+	});
+
+	describe("Set port 8100 on enviroment variable MM_PORT", function () {
+		before(function () {
+			process.env.MM_PORT = 8100;
+			// Set config sample for use in this test
+			process.env.MM_CONFIG_FILE = "tests/configs/port_8090.js";
+		});
+
+		after(function () {
+			delete process.env.MM_PORT;
+		});
+
+		it("should return 200", function (done) {
+			request.get("http://localhost:8100", function (err, res, body) {
+				expect(res.statusCode).to.equal(200);
+				done();
+			});
+		});
+	});
+
+});
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -0,0 +1,46 @@
+const helpers = require("./global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const before = global.before;
+const after = global.after;
+
+describe("Vendors", function () {
+
+	return; // Test still getting failed in Travis
+
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	before(function () {
+		return helpers.startApplication({
+			args: ["js/electron.js"]
+		}).then(function (startedApp) { app = startedApp; })
+	});
+
+	after(function () {
+		return helpers.stopApplication(app);
+	});
+
+	describe("Get list vendors", function () {
+
+		before(function () {
+			process.env.MM_CONFIG_FILE = "tests/configs/env.js";
+		});
+
+		var vendors = require(__dirname + "/../../vendor/vendor.js");
+		Object.keys(vendors).forEach(vendor => {
+			it(`should return 200 HTTP code for vendor "${vendor}"`, function () {
+				urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
+				request.get(urlVendor, function (err, res, body) {
+					expect(res.statusCode).to.equal(200);
+				});
+			});
+		});
+	});
+});
--- a/tests/e2e/without_modules.js
+++ b/tests/e2e/without_modules.js
@@ -1,44 +1,34 @@
-const Application = require("spectron").Application;
+const helpers = require("./global-setup");
 const path = require("path");
-const chai = require("chai");
-const chaiAsPromised = require("chai-as-promised");
-
-var electronPath = path.join(__dirname, "../../", "node_modules", ".bin", "electron");
-
-if (process.platform === "win32") {
-	electronPath += ".cmd";
-}
-
-var appPath = path.join(__dirname, "../../js/electron.js");
-
-var app = new Application({
-	path: electronPath,
-	args: [appPath]
-});
-
-global.before(function () {
-	chai.should();
-	chai.use(chaiAsPromised);
-});
+const request = require("request");

+const expect = require("chai").expect;

+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;

 describe("Check configuration without modules", function () {
-	this.timeout(20000);
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function () {
+		return helpers.startApplication({
+			args: ["js/electron.js"]
+		}).then(function (startedApp) { app = startedApp; })
+	});
+
+	afterEach(function () {
+		return helpers.stopApplication(app);
+	});

 	before(function () {
 		// Set config sample for use in test 
 		process.env.MM_CONFIG_FILE = "tests/configs/without_modules.js";
 	});

-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
-	});
-
-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
-	});
-
 	it("Show the message MagicMirror title", function () {
 		return app.client.waitUntilWindowLoaded()
 			.getText("#module_1_helloworld .module-content").should.eventually.equal("Magic Mirror2")
--- a/tests/servers/basic-auth.js
+++ b/tests/servers/basic-auth.js
@@ -1,16 +1,21 @@
 var http = require("http");
 var path = require("path");
 var auth = require("http-auth");
-var express = require("express")
+var express = require("express");
+var app = express();

-var basic = auth.basic({
+var server;
+
+var basic = auth.basic(
+	{
 		realm: "MagicMirror Area restricted."
-}, (username, password, callback) => {
+	},
+	(username, password, callback) => {
 		callback(username === "MagicMirror" && password === "CallMeADog");
-});
+	}
+);

-this.server = express();
-this.server.use(auth.connect(basic));
+app.use(auth.connect(basic));

 // Set directories availables
 var directories = ["/tests/configs"];
@@ -18,13 +23,13 @@ var directory;
 rootPath = path.resolve(__dirname + "/../../");
 for (i in directories) {
 	directory = directories[i];
-	this.server.use(directory, express.static(path.resolve(rootPath + directory)));
+	app.use(directory, express.static(path.resolve(rootPath + directory)));
 }

 exports.listen = function() {
-	this.server.listen.apply(this.server, arguments);
+	server = app.listen.apply(app, arguments);
 };

 exports.close = function(callback) {
-	this.server.close(callback);
+	server.close(callback);
 };
--- a/tests/unit/functions/calendar_spec.js
+++ b/tests/unit/functions/calendar_spec.js
@@ -0,0 +1,75 @@
+var fs = require("fs");
+var path = require("path");
+var chai = require("chai");
+var expect = chai.expect;
+var vm = require("vm");
+
+
+describe("Functions into modules/default/calendar/calendar.js", function() {
+
+	// Fake for use by calendar.js
+	Module = {}
+	Module.definitions = {};
+	Module.register = function (name, moduleDefinition) {
+		Module.definitions[name] = moduleDefinition;
+	};
+
+	before(function() {
+		// load calendar.js
+		require("../../../modules/default/calendar/calendar.js");
+	});
+
+	describe("capFirst", function() {
+		words = {
+			"rodrigo": "Rodrigo",
+			"123m": "123m",
+			"magic mirror": "Magic mirror",
+			",a": ",a",
+			"ñandú": "Ñandú"
+		};
+
+		Object.keys(words).forEach(word => {
+			it(`for '${word}' should return '${words[word]}'`, function() {
+				expect(Module.definitions.calendar.capFirst(word)).to.equal(words[word]);
+			});
+		});
+	});
+
+	describe("shorten", function() {
+		strings = {
+			" String with whitespace at the beginning that needs trimming" : { length: 16, return: "String with whit&hellip;" },
+			"long string that needs shortening": { length: 16, return: "long string that&hellip;" },
+			"short string": { length: 16, return: "short string" },
+			"long string with no maxLength defined": { return: "long string with no maxLength defined" },
+		};
+
+		Object.keys(strings).forEach(string => {
+			it(`for '${string}' should return '${strings[string].return}'`, function() {
+				expect(Module.definitions.calendar.shorten(string, strings[string].length)).to.equal(strings[string].return);
+			});
+		});
+
+		it("should return an empty string if shorten is called with a non-string", function () {
+			expect(Module.definitions.calendar.shorten(100)).to.equal("");
+		});
+
+		it("should not shorten the string if shorten is called with a non-number maxLength", function () {
+			expect(Module.definitions.calendar.shorten("This is a test string", "This is not a number")).to.equal("This is a test string");
+		});
+
+		it("should wrap the string instead of shorten it if shorten is called with wrapEvents = true (with maxLength defined as 20)", function () {
+			expect(Module.definitions.calendar.shorten(
+				"This is a wrapEvent test. Should wrap the string instead of shorten it if called with wrapEvent = true",
+				20,
+				true)).to.equal("This is a <br>wrapEvent test. Should wrap <br>the string instead of <br>shorten it if called with <br>wrapEvent = true");
+		});
+
+		it("should wrap the string instead of shorten it if shorten is called with wrapEvents = true (without maxLength defined, default 25)", function () {
+			expect(Module.definitions.calendar.shorten(
+				"This is a wrapEvent test. Should wrap the string instead of shorten it if called with wrapEvent = true",
+				undefined,
+				true)).to.equal("This is a wrapEvent <br>test. Should wrap the string <br>instead of shorten it if called <br>with wrapEvent = true");
+		});
+	});
+});
+
--- a/tests/unit/functions/newsfeed_spec.js
+++ b/tests/unit/functions/newsfeed_spec.js
@@ -0,0 +1,37 @@
+var fs = require("fs");
+var path = require("path");
+var chai = require("chai");
+var expect = chai.expect;
+var vm = require("vm");
+
+
+describe("Functions into modules/default/newsfeed/newsfeed.js", function() {
+
+	Module = {}
+	Module.definitions = {};
+	Module.register = function (name, moduleDefinition) {
+		Module.definitions[name] = moduleDefinition;
+	};
+
+	// load newsfeed.js
+	require("../../../modules/default/newsfeed/newsfeed.js");
+
+	describe("capitalizeFirstLetter", function() {
+		words = {
+			"rodrigo": "Rodrigo",
+			"123m": "123m",
+			"magic mirror": "Magic mirror",
+			",a": ",a",
+			"ñandú": "Ñandú",
+			".!": ".!"
+		};
+
+		Object.keys(words).forEach(word => {
+			it(`for ${word} should return ${words[word]}`, function() {
+				expect(Module.definitions.newsfeed.capitalizeFirstLetter(word)).to.equal(words[word]);
+			});
+		});
+	});
+
+});
+
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -0,0 +1,66 @@
+var fs = require("fs");
+var path = require("path");
+var chai = require("chai");
+var expect = chai.expect;
+var vm = require("vm");
+
+before(function() {
+	var basedir = path.join(__dirname, "../../..");
+
+	var fileName = "js/app.js";
+	var filePath = path.join(basedir, fileName);
+	var code = fs.readFileSync(filePath);
+
+	this.sandbox = {
+		module: {},
+		__dirname: path.dirname(filePath),
+		global: {},
+		console: {
+			log: function() { /*console.log("console.log(", arguments, ")");*/ }
+		},
+		process: {
+			on: function() { /*console.log("process.on called with: ", arguments);*/ },
+			env: {}
+		}
+	};
+
+	this.sandbox.require = function(filename) {
+		// This modifies the global slightly,
+		// but supplies vm with essential code
+		return require(filename);
+	};
+
+	vm.runInNewContext(code, this.sandbox, fileName);
+});
+
+after(function() {
+	//console.log(global);
+});
+
+describe("Default modules set in modules/default/defaultmodules.js", function() {
+
+	var expectedDefaultModules = [
+		"alert",
+		"calendar",
+		"clock",
+		"compliments",
+		"currentweather",
+		"helloworld",
+		"newsfeed",
+		"weatherforecast",
+		"updatenotification"
+	];
+
+	expectedDefaultModules.forEach(defaultModule => {
+		it(`contains default module "${defaultModule}"`, function() {
+			expect(this.sandbox.defaultModules).to.include(defaultModule);
+		});
+	});
+
+	expectedDefaultModules.forEach(defaultModule => {
+		it(`contains a folder for modules/default/${defaultModule}"`, function() {
+			expect(fs.existsSync(path.join(this.sandbox.global.root_path, "modules/default", defaultModule))).to.equal(true);
+		});
+	});
+
+});
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -63,8 +63,8 @@ describe("'global.root_path' set in js/app.js", function() {
 	});

 	it("should expect the global.version equals package.json file", function() {
-		version_package = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
-		expect(this.sandbox.global.version).to.equal(version_package);
+		versionPackage = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
+		expect(this.sandbox.global.version).to.equal(versionPackage);
 	});

 });
--- a/translations/de.json
+++ b/translations/de.json
@@ -7,6 +7,8 @@
 	"RUNNING": "noch",
 	"EMPTY": "Keine Termine.",

+	"WEEK": "Woche",
+
 	"N": "N",
 	"NNE": "NNO",
 	"NE": "NO",
--- a/translations/en.json
+++ b/translations/en.json
@@ -7,6 +7,8 @@
 	"RUNNING": "Ends in",
 	"EMPTY": "No upcoming events.",

+	"WEEK": "Week",
+
 	"N": "N",
 	"NNE": "NNE",
 	"NE": "NE",
--- a/translations/es.json
+++ b/translations/es.json
@@ -7,6 +7,8 @@
 	"RUNNING": "Termina en",
 	"EMPTY": "No hay eventos programados.",

+	"WEEK": "Semana",
+
 	"N": "N",
 	"NNE": "NNE",
 	"NE": "NE",
--- a/translations/fi.json
+++ b/translations/fi.json
@@ -4,7 +4,7 @@
 	"TODAY": "Tänään",
 	"TOMORROW": "Huomenna",
 	"DAYAFTERTOMORROW": "Ylihuomenna",
-	"RUNNING": "Meneillään",
+	"RUNNING": "Päättyy {timeUntilEnd} päästä",
 	"EMPTY": "Ei tulevia tapahtumia.",

 	"N": "P",
--- a/translations/nb.json
+++ b/translations/nb.json
@@ -7,6 +7,8 @@
 	"RUNNING": "Slutter om",
 	"EMPTY": "Ingen kommende arrangementer.",

+	"WEEK": "Uke",
+
 	"N": "N",
 	"NNE": "NNØ",
 	"NE": "NØ",
@@ -24,7 +26,7 @@
 	"NW": "NV",
 	"NNW": "NNV",

-	"UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengelig.",
+	"UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.",
 	"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen MODULE_NAME.",
 	"UPDATE_INFO": "Nåværende installasjon er COMMIT_COUNT bak BRANCH_NAME grenen."
 }
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -3,9 +3,12 @@

 	"TODAY": "Dziś",
 	"TOMORROW": "Jutro",
+	"DAYAFTERTOMORROW": "Pojutrze",
 	"RUNNING": "Koniec za",
 	"EMPTY": "Brak wydarzeń.",

+	"WEEK": "Tydzień",
+
 	"N": "N",
 	"NNE": "NNE",
 	"NE": "NE",
--- a/translations/ro.json
+++ b/translations/ro.json
@@ -0,0 +1,32 @@
+{
+	"LOADING": "Se încarcă &hellip;",
+
+	"TODAY": "Astăzi",
+	"TOMORROW": "Mâine",
+	"DAYAFTERTOMORROW": "Poimâine",
+	"RUNNING": "Se termină în",
+	"EMPTY": "Nici un eveniment.",
+
+	"WEEK": "Săptămâna",
+
+	"N": "N",
+	"NNE": "NNE",
+	"NE": "NE",
+	"ENE": "ENE",
+	"E": "E",
+	"ESE": "ESE",
+	"SE": "SE",
+	"SSE": "SSE",
+	"S": "S",
+	"SSW": "SSW",
+	"SW": "SW",
+	"WSW": "WSW",
+	"W": "W",
+	"WNW": "WNW",
+	"NW": "NW",
+	"NNW": "NNW",
+
+	"UPDATE_NOTIFICATION": "Un update este disponibil pentru MagicMirror².",
+	"UPDATE_NOTIFICATION_MODULE": "Un update este disponibil pentru modulul MODULE_NAME.",
+	"UPDATE_INFO": "Există COMMIT_COUNT commit-uri noi pe branch-ul BRANCH_NAME."
+}
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -7,6 +7,8 @@
 	"RUNNING": "Заканчивается через",
 	"EMPTY": "Нет предстоящих событий",

+	"WEEK": "Неделя",
+
 	"N": "С",
 	"NNE": "ССВ",
 	"NE": "СВ",
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -7,6 +7,8 @@
 	"RUNNING": "Slutar",
 	"EMPTY": "Inga kommande händelser.",

+	"WEEK": "Vecka",
+
 	"N": "N",
 	"NNE": "NNO",
 	"NE": "NO",
--- a/translations/translations.js
+++ b/translations/translations.js
@@ -33,6 +33,7 @@ var translations = {
 	"is" : "translations/is.json", // Icelandic
 	"et" : "translations/et.json", // Estonian
 	"kr" : "translations/kr.json", // Korean
+	"ro" : "translations/ro.json", // Romanian
 };

 if (typeof module !== "undefined") {module.exports = translations;}
--- a/translations/zh_cn.json
+++ b/translations/zh_cn.json
@@ -3,6 +3,7 @@

 	"TODAY": "今天",
 	"TOMORROW": "明天",
+	"DAYAFTERTOMORROW": "后天",
 	"RUNNING": "结束日期",
 	"EMPTY": "没有更多的活动。",

@@ -21,5 +22,9 @@
 	"W": "西风",
 	"WNW": "西偏北风",
 	"NW": "西北风",
-	"NNW": "北偏西风"
+	"NNW": "北偏西风",
+	
+	"UPDATE_NOTIFICATION": "MagicMirror² 有新的更新",
+	"UPDATE_NOTIFICATION_MODULE": "模块 MODULE_NAME 可更新",
+	"UPDATE_INFO": "当前已安装版本为 COMMIT_COUNT 落后于分支 BRANCH_NAME "
 }
--- a/vendor/vendor.js
+++ b/vendor/vendor.js
@@ -9,8 +9,10 @@

 var vendor = {
 	"moment.js" : "node_modules/moment/min/moment-with-locales.js",
-	"moment-timezone.js" : "node_modules/moment-timezone/moment-timezone.js",
+	"moment-timezone.js" : "node_modules/moment-timezone/builds/moment-timezone-with-data.js",
 	"weather-icons.css": "node_modules/weathericons/css/weather-icons.css",
 	"weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css",
 	"font-awesome.css": "node_modules/font-awesome/css/font-awesome.min.css"
 };
+
+if (typeof module !== "undefined"){module.exports = vendor;}