diff --git a/data/index.html b/data/index.html
index 8b1c53f..b4decb4 100644
--- a/data/index.html
+++ b/data/index.html
@@ -151,6 +151,7 @@
 						<h6>Actions</h6>
 						<button type="button" class="btn btn-danger btn-lg btn-block" id="button_reset_vs1053">Reset VS1053 chip</button>
 						<button type="button" class="btn btn-danger btn-lg btn-block" id="button_reboot">Reboot ESMP3</button>
+						<button type="button" class="btn btn-danger btn-lg btn-block" id="button_update">Check for and install update</button>
 					</div>
 					
 					<div class="modal-footer">
@@ -288,6 +289,7 @@ $(function() {
 	$('#button_settings').click(function(e) { $('#settingsModal').modal('show'); });
 	$('#button_reset_vs1053').click(function(e) { ws.send("reset_vs1053"); $('#settingsModal').modal('hide'); });
 	$('#button_reboot').click(function(e) { ws.send("reboot"); $('#settingsModal').modal('hide'); });
+	$('#button_update').click(function(e) { ws.send("update"); $('#settingsModal').modal('hide'); });
 	$('#button_url_open').click(function(e) { ws.send("play " + $('#input_url').val()); $('#openModal').modal('hide');});
 	$('#button_add_mapping').click(function(e) {
 		$('#settingsModal').modal('hide');
diff --git a/src/controller.cpp b/src/controller.cpp
index 9994cd2..18e702d 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -259,13 +259,8 @@ bool Controller::process_message(String cmd) {
 	if (cmd.startsWith("play ")) {
 		Playlist* p = pm->get_playlist_for_folder(cmd.substring(5));
 		player->play(p);
-	//} else if (cmd.equals("ls")) {
-	//	_execute_command_ls("/");
-	//} else if (cmd.startsWith("ls ")) {
-	//	_execute_command_ls(cmd.substring(3));
 	} else if (cmd.equals("play")) {
 		player->play();
-	
 	} else if (cmd.equals("stop")) {
 		player->stop();
 	} else if (cmd.equals("help")) {
@@ -298,6 +293,10 @@ bool Controller::process_message(String cmd) {
 		String folder = rest.substring(idx + 1);
 		pm->add_mapping(id, folder);
 		send_playlist_manager_status();
+	#ifdef OTA_UPDATE_URL
+	} else if (cmd.equals("update")) {
+		Updater::run();
+	#endif
 	} else {
 		ERROR("Unknown command: %s\n", cmd.c_str());
 		return false;
diff --git a/src/http_server.cpp b/src/http_server.cpp
index 4d8ac1b..2687913 100644
--- a/src/http_server.cpp
+++ b/src/http_server.cpp
@@ -11,14 +11,37 @@ HTTPServer::HTTPServer(Player* p, Controller* c) {
 	_server->addHandler(ws);
 	ws->onEvent([&](AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){this->_onEvent(server, client, type, arg, data, len);});
 	
-	_server->on("/", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(SPIFFS, "/index.html", "text/html");});
-	_server->on("/upload", HTTP_POST, [](AsyncWebServerRequest* req) {req->send(200); }, ([&](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){this->_handle_upload(request, filename, index, data, len, final);}));
-	_server->on("/_mapping.txt", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "text/plain", _controller->pm->create_mapping_txt());});
-	_server->on("/player.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->player->json());});
-	_server->on("/playlist_manager.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->pm->json());});
-	_server->on("/controller.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->json());});
-	_server->on("/position.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->player->position_json());});
-	_server->on("/cmd", HTTP_POST, [&](AsyncWebServerRequest *req) {req->send(200); }, NULL, [&](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {_controller->queue_command((char*)data);});
+	_server->on("/", HTTP_GET, [&](AsyncWebServerRequest* req) {
+		req->send(SPIFFS, "/index.html", "text/html");
+	});
+	_server->on("/upload", HTTP_POST, [](AsyncWebServerRequest* req) {
+		req->send(200); 
+	}, [&](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+		this->_handle_upload(request, filename, index, data, len, final);
+	});
+	_server->on("/_mapping.txt", HTTP_GET, [&](AsyncWebServerRequest* req) {
+		req->send(200, "text/plain", _controller->pm->create_mapping_txt());
+	});
+	_server->on("/player.json", HTTP_GET, [&](AsyncWebServerRequest* req) {
+		req->send(200, "application/json", _controller->player->json());
+	});
+	_server->on("/playlist_manager.json", HTTP_GET, [&](AsyncWebServerRequest* req) {
+		req->send(200, "application/json", _controller->pm->json());
+	});
+	_server->on("/controller.json", HTTP_GET, [&](AsyncWebServerRequest* req) {
+		req->send(200, "application/json", _controller->json());
+	});
+	_server->on("/position.json", HTTP_GET, [&](AsyncWebServerRequest* req) {
+		req->send(200, "application/json", _controller->player->position_json());
+	});
+	_server->on("/cmd", HTTP_POST, [&](AsyncWebServerRequest *req) {
+		if (req->hasParam("cmd", true)) {
+			_controller->queue_command(req->getParam("cmd", true)->value());
+			req->send(200);
+		} else {
+			req->send(400);
+		}
+	});
 	_server->begin();
 	MDNS.addService("http", "tcp", 80);
 }