diff --git a/src/command-line/start.js b/src/command-line/start.js
index 83393bb0..edeee23e 100644
--- a/src/command-line/start.js
+++ b/src/command-line/start.js
@@ -1,23 +1,23 @@
-var config = require("../../config.json");
-var ClientManager = new require("../clientManager");
-var program = require("commander");
-var shout = require("../server");
-
-program
-	.option("-h, --host <ip>")
-	.option("-p, --port <port>")
-	.command("start")
-	.description("Start the server")
-	.action(function() {
-		var users = new ClientManager().getUsers();
-		if (!config.public && !users.length) {
-			console.log("");
-			console.log("No users found!");
-			console.log("Create a new user with 'shout add <name>'.")
-			console.log("");
-		} else {
-			var host = program.host || config.host;
-			var port = program.port || config.port;
-			shout(port, host, config.public);
-		}
-	});
+var config = require("../../config.json");
+var ClientManager = new require("../clientManager");
+var program = require("commander");
+var shout = require("../server");
+
+program
+	.option("-h, --host <ip>")
+	.option("-p, --port <port>")
+	.command("start")
+	.description("Start the server")
+	.action(function() {
+		var users = new ClientManager().getUsers();
+		if (!config.public && !users.length) {
+			console.log("");
+			console.log("No users found!");
+			console.log("Create a new user with 'shout add <name>'.")
+			console.log("");
+		} else {
+			var host = program.host || process.env.IP || config.host;
+			var port = program.port || process.env.PORT || config.port;
+			shout(port, host, config.public);
+		}
+	});