diff --git a/include/advertiser.h b/include/advertiser.h
index 39d7b1c..205ee9b 100644
--- a/include/advertiser.h
+++ b/include/advertiser.h
@@ -20,6 +20,7 @@ signals:
 public slots:
     void readData();
     void socketConnected();
+    void socketDisconnected();
 
 private:
     QString ip;
diff --git a/include/akashimain.h b/include/akashimain.h
index 1d56f2a..ade0a7f 100644
--- a/include/akashimain.h
+++ b/include/akashimain.h
@@ -30,5 +30,6 @@ public:
     void updateConfig(int current_version);
 private:
     Ui::AkashiMain *ui;
+    Advertiser *advertiser;
 };
 #endif // AKASHIMAIN_H
diff --git a/src/advertiser.cpp b/src/advertiser.cpp
index 3275bfc..05b29a1 100644
--- a/src/advertiser.cpp
+++ b/src/advertiser.cpp
@@ -14,19 +14,16 @@ void Advertiser::contactMasterServer() {
     socket = new QTcpSocket(this);
     connect(socket, SIGNAL(readyRead()), this, SLOT(readData()));
     connect(socket, SIGNAL(connected()), this, SLOT(socketConnected()));
+    connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
 
+    socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
     socket->connectToHost(ip, port);
-
-    if(socket->waitForConnected(1000)) {
-        qDebug("Connected to master server");
-    } else {
-        qDebug() << "Master server socket error: " << socket->errorString();
-    }
 }
 
 void Advertiser::readData() {
     // The master server should never really send data back to us
     // But we handle it anyways, just in case this ever ends up being implemented
+    qDebug() << socket->readAll();
 }
 
 void Advertiser::socketConnected() {
@@ -43,3 +40,7 @@ void Advertiser::socketConnected() {
     socket->flush();
     qDebug("Advertisement sent to master server");
 }
+
+void Advertiser::socketDisconnected() {
+    qDebug("Socket disconnected");
+}
diff --git a/src/akashimain.cpp b/src/akashimain.cpp
index 65fa55e..4eff801 100644
--- a/src/akashimain.cpp
+++ b/src/akashimain.cpp
@@ -29,8 +29,8 @@ AkashiMain::AkashiMain(QWidget *parent)
         } else {
             if(config.value("advertise", "true").toString() != "true")
                 ws_port = -1;
-            Advertiser advertiser(ms_ip, port, ws_port, local_port, name, description);
-            advertiser.contactMasterServer();
+            advertiser = new Advertiser(ms_ip, port, ws_port, local_port, name, description);
+            advertiser->contactMasterServer();
         }
     }
 }