diff --git a/classes/API/ServerAPI.php b/classes/API/ServerAPI.php
index 03948a5ff..5c4127688 100644
--- a/classes/API/ServerAPI.php
+++ b/classes/API/ServerAPI.php
@@ -90,7 +90,7 @@ class ServerAPI extends stdClass{ //Yay! I can add anything to this class in run
 		console("[DEBUG] Loading server.properties...", true, true, 2);
 		$this->parseProperties();
 		define("DEBUG", $this->config["debug"]);
-		$this->server = new PocketMinecraftServer($this->getProperty("server-name"), $this->getProperty("gamemode"), $this->getProperty("seed"), $this->getProperty("protocol"), $this->getProperty("port"), $this->getProperty("server-id"));
+		$this->server = new PocketMinecraftServer($this->getProperty("server-name"), $this->getProperty("gamemode"), $this->getProperty("seed"), CURRENT_PROTOCOL, $this->getProperty("port"), $this->getProperty("server-id"));
 		$this->server->api = $this;
 		if($this->getProperty("last-update") === false or ($this->getProperty("last-update") + 3600) < time()){
 			console("[INFO] Checking for new server version");
@@ -299,11 +299,6 @@ class ServerAPI extends stdClass{ //Yay! I can add anything to this class in run
 						$v = (int) $v;
 					}
 					break;
-				case "protocol":
-					if(trim($v) == "CURRENT"){
-						$v = CURRENT_PROTOCOL;
-						break;
-					}
 				case "gamemode":
 				case "max-players":
 				case "port":
diff --git a/common/default.properties b/common/default.properties
index e5b22bc9d..b59fee473 100644
--- a/common/default.properties
+++ b/common/default.properties
@@ -1,11 +1,10 @@
 #Pocket Minecraft PHP server properties
-server-name=PHP Server
-description=  This is a Work in Progress custom server.
-motd=Welcome to PHP Server
+server-name=A Minecraft Server
+description=Server made using PocketMine-MP
+motd=Welcome @username to this server!
 invisible=false
 port=19132
-protocol=CURRENT
-memory-limit=256M
+memory-limit=512M
 last-update=false
 white-list=false
 debug=2