diff --git a/.gitignore b/.gitignore
index 4a90a2d6..3ce090f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 node_modules/
 testlocales/
-.DS_Store
\ No newline at end of file
+.DS_Store
+.idea
+*.iml
\ No newline at end of file
diff --git a/i18n.js b/i18n.js
index 8eaa6e9e..d4de8828 100644
--- a/i18n.js
+++ b/i18n.js
@@ -9,73 +9,73 @@
 
 // dependencies
 var vsprintf = require("sprintf").vsprintf,
-		fs = require("fs"),
-		path = require("path");
+    fs = require("fs"),
+    path = require("path");
 
 
-function dotNotation (obj, str) {
-	if (obj.hasOwnProperty(str)) {
-		return obj[str];
-	}
+function dotNotation(obj, str) {
+    if (obj.hasOwnProperty(str)) {
+        return obj[str];
+    }
 
-    return str.split(".").reduce(function(o, x) {
-    	return o[x];
+    return str.split(".").reduce(function (o, x) {
+        return o[x];
     }, obj);
 }
 
 var i18n = module.exports = function (opt) {
-	var self = this;
-
-	// Put into dev or production mode
-	this.devMode = process.env.NODE_ENV !== "production";
-
-	// Copy over options
-	for (var prop in opt) {
-		this[prop] = opt[prop];
-	}
-
-	// you may register helpers in global scope, up to you
-	if (typeof this.register === "object") {
-		i18n.resMethods.forEach(function (method) {
-			self.register[method] = self[method].bind(self);
-		});
-	}
-
-	// implicitly read all locales
-	// if it's an array of locale names, read in the data
-	if (opt.locales && opt.locales.forEach) {
-		this.locales = {};
-
-		opt.locales.forEach(function (locale) {
-			self.readFile(locale);
-		});
-
-		this.defaultLocale = opt.locales[0];
-	}
-
-	// Set the locale to the default locale
-	this.setLocale(this.defaultLocale);
-
-	// Check the defaultLocale
-	if (!this.locales[this.defaultLocale]) {
-		console.error("Not a valid default locale.");
-	}
-
-	if (this.request) {
-		if (this.subdomain) {
-			this.setLocaleFromSubdomain(this.request);
-		}
-
-		if (this.query !== false) {
-			this.setLocaleFromQuery(this.request);
-		}
-
-		this.prefLocale = this.preferredLocale();
-
-		if (this.prefLocale !== false && this.prefLocale !== this.locale) {
-			this.setLocale(this.prefLocale);
-		}
-	}
+    var self = this;
+
+    // Put into dev or production mode
+    this.devMode = process.env.NODE_ENV !== "production";
+
+    // Copy over options
+    for (var prop in opt) {
+        this[prop] = opt[prop];
+    }
+
+    // you may register helpers in global scope, up to you
+    if (typeof this.register === "object") {
+        i18n.resMethods.forEach(function (method) {
+            self.register[method] = self[method].bind(self);
+        });
+    }
+
+    // implicitly read all locales
+    // if it's an array of locale names, read in the data
+    if (opt.locales && opt.locales.forEach) {
+        this.locales = {};
+
+        opt.locales.forEach(function (locale) {
+            self.readFile(locale);
+        });
+
+        this.defaultLocale = opt.locales[0];
+    }
+
+    // Set the locale to the default locale
+    this.setLocale(this.defaultLocale);
+
+    // Check the defaultLocale
+    if (!this.locales[this.defaultLocale]) {
+        console.error("Not a valid default locale.");
+    }
+
+    if (this.request) {
+        if (this.subdomain) {
+            this.setLocaleFromSubdomain(this.request);
+        }
+
+        if (this.query !== false) {
+            this.setLocaleFromQuery(this.request);
+        }
+
+        this.prefLocale = this.preferredLocale();
+
+        if (this.prefLocale !== false && this.prefLocale !== this.locale) {
+            this.setLocale(this.prefLocale);
+        }
+    }
 };
 
 i18n.version = "0.4.6";
@@ -84,319 +84,319 @@ i18n.localeCache = {};
 i18n.resMethods = ["__", "__n", "getLocale", "isPreferredLocale"];
 
 i18n.expressBind = function (app, opt) {
-	if (!app) {
-		return;
-	}
-
-	app.use(function (req, res, next) {
-		opt.request = req;
-		req.i18n = new i18n(opt);
-
-		// Express 3
-		if (res.locals) {
-			i18n.registerMethods(res.locals, req)
-		}
-
-		next();
-	});
-
-	// Express 2
-	if (app.dynamicHelpers) {
-		app.dynamicHelpers(i18n.registerMethods({}));
-	}
+    if (!app) {
+        return;
+    }
+
+    app.use(function (req, res, next) {
+        opt.request = req;
+        req.i18n = new i18n(opt);
+
+        // Express 3
+        if (res.locals) {
+            i18n.registerMethods(res.locals, req)
+        }
+
+        next();
+    });
+
+    // Express 2
+    if (app.dynamicHelpers) {
+        app.dynamicHelpers(i18n.registerMethods({}));
+    }
 };
 
 i18n.registerMethods = function (helpers, req) {
-	i18n.resMethods.forEach(function (method) {
-		if (req) {
-			helpers[method] = req.i18n[method].bind(req.i18n);
-		} else {
-			helpers[method] = function (req) {
-				return req.i18n[method].bind(req.i18n);
-			};
-		}
-
-	});
-
-	return helpers;
+    i18n.resMethods.forEach(function (method) {
+        if (req) {
+            helpers[method] = req.i18n[method].bind(req.i18n);
+        } else {
+            helpers[method] = function (req) {
+                return req.i18n[method].bind(req.i18n);
+            };
+        }
+
+    });
+
+    return helpers;
 };
 
 i18n.prototype = {
-	defaultLocale: "en",
-	extension: ".js",
-	directory: "./locales",
-	cookieName: "lang",
+    defaultLocale: "en",
+    extension: ".js",
+    directory: "./locales",
+    cookieName: "lang",
+
+    __: function () {
+        var msg = this.translate(this.locale, arguments[0]);
+
+        if (arguments.length > 1) {
+            msg = vsprintf(msg, Array.prototype.slice.call(arguments, 1));
+        }
+
+        return msg;
+    },
+
+    __n: function (pathOrSingular, countOrPlural, additionalOrCount) {
+        var msg;
+        if (typeof countOrPlural === 'number') {
+            var path = pathOrSingular;
+            var count = countOrPlural;
+            msg = this.translate(this.locale, path);
+            console.log('initial', msg);
+
+            msg = vsprintf(parseInt(count, 10) > 1 ? msg.other : msg.one, Array.prototype.slice.call(arguments, 1));
+        } else {
+            var singular = pathOrSingular;
+            var plural = countOrPlural;
+            var count = additionalOrCount;
+            msg = this.translate(this.locale, singular, plural);
+
+            msg = vsprintf(parseInt(count, 10) > 1 ? msg.other : msg.one, [count]);
+
+            if (arguments.length > 3) {
+                msg = vsprintf(msg, Array.prototype.slice.call(arguments, 3));
+            }
+        }
+
+        return msg;
+    },
+
+    setLocale: function (locale) {
+
+        if (!locale) return;
+
+        if (!this.locales[locale]) {
+            if (this.devMode) {
+                console.warn("Locale (" + locale + ") not found.");
+            }
+
+            locale = this.defaultLocale;
+        }
+
+        return (this.locale = locale);
+    },
+
+    getLocale: function () {
+        return this.locale;
+    },
+
+    isPreferredLocale: function () {
+        return !this.prefLocale ||
+            this.prefLocale === this.getLocale();
+    },
+
+    setLocaleFromSessionVar: function (req) {
+        req = req || this.request;
+
+        var locale = req.session.locale;
+
+        if (this.locales[locale]) {
+            if (this.devMode) {
+                console.log("Overriding locale from query: " + locale);
+            }
+            this.setLocale(locale);
+        }
 
-	__: function () {
-		var msg = this.translate(this.locale, arguments[0]);
+    },
 
-		if (arguments.length > 1) {
-			msg = vsprintf(msg, Array.prototype.slice.call(arguments, 1));
-		}
+    setLocaleFromQuery: function (req) {
+        req = req || this.request;
 
-		return msg;
-	},
+        if (!req || !req.query || !req.query.lang) {
+            return;
+        }
 
-	__n: function (pathOrSingular, countOrPlural, additionalOrCount) {
-		var msg;
-		if (typeof countOrPlural === 'number') {
-			var path = pathOrSingular;
-			var count = countOrPlural;
-			msg = this.translate(this.locale, path);
-			console.log('initial', msg);
+        var locale = req.query.lang.toLowerCase();
 
-			msg = vsprintf(parseInt(count, 10) > 1 ? msg.other : msg.one, Array.prototype.slice.call(arguments, 1));
-		} else {
-			var singular = pathOrSingular;
-			var plural = countOrPlural;
-			var count = additionalOrCount;
-			msg = this.translate(this.locale, singular, plural);
+        if (this.locales[locale]) {
+            if (this.devMode) {
+                console.log("Overriding locale from query: " + locale);
+            }
 
-			msg = vsprintf(parseInt(count, 10) > 1 ? msg.other : msg.one, [count]);
+            this.setLocale(locale);
+        }
+    },
 
-			if (arguments.length > 3) {
-				msg = vsprintf(msg, Array.prototype.slice.call(arguments, 3));
-			}
-		}
+    setLocaleFromSubdomain: function (req) {
+        req = req || this.request;
 
-		return msg;
-	},
+        if (!req || !req.headers || !req.headers.host) {
+            return;
+        }
 
-	setLocale: function (locale) {
+        if (/^([^.]+)/.test(req.headers.host) && this.locales[RegExp.$1]) {
+            if (this.devMode) {
+                console.log("Overriding locale from host: " + RegExp.$1);
+            }
 
-		if (!locale) return;
+            this.setLocale(RegExp.$1);
+        }
+    },
 
-		if (!this.locales[locale]) {
-			if (this.devMode) {
-				console.warn("Locale (" + locale + ") not found.");
-			}
+    setLocaleFromCookie: function (req) {
+        req = req || this.request;
 
-			locale = this.defaultLocale;
-		}
+        if (!req || !req.cookies || !this.cookieName || !req.cookies[this.cookieName]) {
+            return;
+        }
 
-		return (this.locale = locale);
-	},
+        var locale = req.cookies[this.cookieName].toLowerCase();
 
-	getLocale: function () {
-		return this.locale;
-	},
+        if (this.locales[locale]) {
+            if (this.devMode) {
+                console.log("Overriding locale from cookie: " + locale);
+            }
 
-	isPreferredLocale: function () {
-		return !this.prefLocale ||
-				this.prefLocale === this.getLocale();
-	},
+            this.setLocale(locale);
+        }
+    },
 
-	setLocaleFromSessionVar: function (req) {
-		req = req || this.request;
+    preferredLocale: function (req) {
+        req = req || this.request;
 
-		var locale = req.session.locale;
+        if (!req || !req.headers) {
+            return;
+        }
 
-		if (this.locales[locale]) {
-			if (this.devMode) {
-				console.log("Overriding locale from query: " + locale);
-			}
-			this.setLocale(locale);
-		}
+        var accept = req.headers["accept-language"] || "",
+            regExp = /(^|,\s*)([a-z0-9-]+)/gi,
+            self = this,
+            prefLocale;
 
-	},
+        while (!prefLocale && (match = regExp.exec(accept))) {
+            var locale = match[2].toLowerCase();
+            var parts = locale.split("-");
 
-	setLocaleFromQuery: function (req) {
-		req = req || this.request;
+            if (self.locales[locale]) {
+                prefLocale = locale;
+            } else if (parts.length > 1 && self.locales[parts[0]]) {
+                prefLocale = parts[0];
+            }
+        }
 
-		if (!req || !req.query || !req.query.lang) {
-			return;
-		}
+        return prefLocale || this.defaultLocale;
+    },
 
-		var locale = req.query.lang.toLowerCase();
+    // read locale file, translate a msg and write to fs if new
+    translate: function (locale, singular, plural) {
+        if (!locale || !this.locales[locale]) {
+            if (this.devMode) {
+                console.warn("WARN: No locale found. Using the default (" +
+                this.defaultLocale + ") as current locale");
+            }
 
-		if (this.locales[locale]) {
-			if (this.devMode) {
-				console.log("Overriding locale from query: " + locale);
-			}
+            locale = this.defaultLocale;
 
-			this.setLocale(locale);
-		}
-	},
+            this.initLocale(locale, {});
+        }
 
-	setLocaleFromSubdomain: function (req) {
-		req = req || this.request;
+        if (!this.locales[locale][singular]) {
+            if (this.devMode) {
+                this.locales[locale][singular] = plural ? {one: singular, other: plural} : singular;
 
-		if (!req || !req.headers || !req.headers.host) {
-			return;
-		}
+                this.writeFile(locale);
+            } else {
+                locale = this.defaultLocale;
+            }
+        }
 
-		if (/^([^.]+)/.test(req.headers.host) && this.locales[RegExp.$1]) {
-			if (this.devMode) {
-				console.log("Overriding locale from host: " + RegExp.$1);
-			}
+        return dotNotation(this.locales[locale], singular);
+    },
 
-			this.setLocale(RegExp.$1);
-		}
-	},
+    // try reading a file
+    readFile: function (locale) {
+        var file = this.locateFile(locale);
 
-	setLocaleFromCookie: function (req) {
-		req = req || this.request;
+        if (!this.devMode && i18n.localeCache[file]) {
+            this.initLocale(locale, i18n.localeCache[file]);
+            return;
+        }
 
-		if (!req || !req.cookies || !this.cookieName || !req.cookies[this.cookieName]) {
-			return;
-		}
+        try {
+            var localeFile = fs.readFileSync(file);
 
-		var locale = req.cookies[this.cookieName].toLowerCase();
+            try {
+                // parsing filecontents to locales[locale]
+                this.initLocale(locale, JSON.parse(localeFile));
 
-		if (this.locales[locale]) {
-			if (this.devMode) {
-				console.log("Overriding locale from cookie: " + locale);
-			}
+            } catch (e) {
+                console.error('unable to parse locales from file (maybe ' + file +
+                ' is empty or invalid json?): ', e);
+            }
+
+        } catch (e) {
+            // unable to read, so intialize that file
+            // locales[locale] are already set in memory, so no extra read required
+            // or locales[locale] are empty, which initializes an empty locale.json file
+            if (!fs.existsSync(file)) {
+                this.writeFile(locale);
+            }
+        }
+    },
+
+    // try writing a file in a created directory
+    writeFile: function (locale) {
+        // don't write new locale information to disk if we're not in dev mode
+        if (!this.devMode) {
+            // Initialize the locale if didn't exist already
+            this.initLocale(locale, {});
+            return;
+        }
+
+        // creating directory if necessary
+        try {
+            fs.lstatSync(this.directory);
+
+        } catch (e) {
+            if (this.devMode) {
+                console.log('creating locales dir in: ' + this.directory);
+            }
+
+            fs.mkdirSync(this.directory, 0755);
+        }
 
-			this.setLocale(locale);
-		}
-	},
+        // Initialize the locale if didn't exist already
+        this.initLocale(locale, {});
 
-	preferredLocale: function (req) {
-		req = req || this.request;
+        // writing to tmp and rename on success
+        try {
+            var target = this.locateFile(locale),
+                tmp = target + ".tmp";
 
-		if (!req || !req.headers) {
-			return;
-		}
+            fs.writeFileSync(tmp, JSON.stringify(
+                this.locales[locale], null, "\t"), "utf8");
 
-		var accept = req.headers["accept-language"] || "",
-				regExp = /(^|,\s*)([a-z0-9-]+)/gi,
-				self = this,
-				prefLocale;
+            if (fs.statSync(tmp).isFile()) {
+                fs.renameSync(tmp, target);
 
-		while (!prefLocale && (match = regExp.exec(accept))) {
-			var locale = match[2].toLowerCase();
-			var parts = locale.split("-");
+            } else {
+                console.error('unable to write locales to file (either ' + tmp +
+                ' or ' + target + ' are not writeable?): ');
+            }
 
-			if (self.locales[locale]) {
-				prefLocale = locale;
-			} else if (parts.length > 1 && self.locales[parts[0]]) {
-              	prefLocale = parts[0];
+        } catch (e) {
+            console.error('unexpected error writing files (either ' + tmp +
+            ' or ' + target + ' are not writeable?): ', e);
+        }
+    },
+
+    // basic normalization of filepath
+    locateFile: function (locale) {
+        return path.normalize(this.directory + '/' + locale + this.extension);
+    },
+
+    initLocale: function (locale, data) {
+        if (!this.locales[locale]) {
+            this.locales[locale] = data;
+
+            // Only cache the files when we're not in dev mode
+            if (!this.devMode) {
+                var file = this.locateFile(locale);
+                if (!i18n.localeCache[file]) {
+                    i18n.localeCache[file] = data;
+                }
             }
-		}
-
-		return prefLocale || this.defaultLocale;
-	},
-
-	// read locale file, translate a msg and write to fs if new
-	translate: function (locale, singular, plural) {
-		if (!locale || !this.locales[locale]) {
-			if (this.devMode) {
-				console.warn("WARN: No locale found. Using the default (" +
-						this.defaultLocale + ") as current locale");
-			}
-
-			locale = this.defaultLocale;
-
-			this.initLocale(locale, {});
-		}
-
-		if (!this.locales[locale][singular]) {
-			this.locales[locale][singular] = plural ?
-			{ one: singular, other: plural } :
-					singular;
-
-			if (this.devMode) {
-				this.writeFile(locale);
-			}
-		}
-
-		return dotNotation(this.locales[locale], singular);
-	},
-
-	// try reading a file
-	readFile: function (locale) {
-		var file = this.locateFile(locale);
-
-		if (!this.devMode && i18n.localeCache[file]) {
-			this.initLocale(locale, i18n.localeCache[file]);
-			return;
-		}
-
-		try {
-			var localeFile = fs.readFileSync(file);
-
-			try {
-				// parsing filecontents to locales[locale]
-				this.initLocale(locale, JSON.parse(localeFile));
-
-			} catch (e) {
-				console.error('unable to parse locales from file (maybe ' + file +
-						' is empty or invalid json?): ', e);
-			}
-
-		} catch (e) {
-			// unable to read, so intialize that file
-			// locales[locale] are already set in memory, so no extra read required
-			// or locales[locale] are empty, which initializes an empty locale.json file
-			if (!fs.existsSync(file)) {
-				this.writeFile(locale);
-			}
-		}
-	},
-
-	// try writing a file in a created directory
-	writeFile: function (locale) {
-		// don't write new locale information to disk if we're not in dev mode
-		if (!this.devMode) {
-			// Initialize the locale if didn't exist already
-			this.initLocale(locale, {});
-			return;
-		}
-
-		// creating directory if necessary
-		try {
-			fs.lstatSync(this.directory);
-
-		} catch (e) {
-			if (this.devMode) {
-				console.log('creating locales dir in: ' + this.directory);
-			}
-
-			fs.mkdirSync(this.directory, 0755);
-		}
-
-		// Initialize the locale if didn't exist already
-		this.initLocale(locale, {});
-
-		// writing to tmp and rename on success
-		try {
-			var target = this.locateFile(locale),
-					tmp = target + ".tmp";
-
-			fs.writeFileSync(tmp, JSON.stringify(
-					this.locales[locale], null, "\t"), "utf8");
-
-			if (fs.statSync(tmp).isFile()) {
-				fs.renameSync(tmp, target);
-
-			} else {
-				console.error('unable to write locales to file (either ' + tmp +
-						' or ' + target + ' are not writeable?): ');
-			}
-
-		} catch (e) {
-			console.error('unexpected error writing files (either ' + tmp +
-					' or ' + target + ' are not writeable?): ', e);
-		}
-	},
-
-	// basic normalization of filepath
-	locateFile: function (locale) {
-		return path.normalize(this.directory + '/' + locale + this.extension);
-	},
-
-	initLocale: function (locale, data) {
-		if (!this.locales[locale]) {
-			this.locales[locale] = data;
-
-			// Only cache the files when we're not in dev mode
-			if (!this.devMode) {
-				var file = this.locateFile(locale);
-				if (!i18n.localeCache[file]) {
-					i18n.localeCache[file] = data;
-				}
-			}
-		}
-	}
+        }
+    }
 };