diff --git a/src/Ratchet/App.php b/src/Ratchet/App.php
index b7d0e55..da144ec 100644
--- a/src/Ratchet/App.php
+++ b/src/Ratchet/App.php
@@ -113,6 +113,10 @@ class App {
             $decorated = $controller;
         }
 
+        if ($decorated instanceof WsServer) {
+            $decorated->enableKeepAlive($this->_server->loop, 30);
+        }
+
         if ($httpHost === null) {
             $httpHost = $this->httpHost;
         }
diff --git a/src/Ratchet/WebSocket/WsConnection.php b/src/Ratchet/WebSocket/WsConnection.php
index 175f152..d2d04ef 100644
--- a/src/Ratchet/WebSocket/WsConnection.php
+++ b/src/Ratchet/WebSocket/WsConnection.php
@@ -25,7 +25,7 @@ class WsConnection extends AbstractConnectionDecorator {
     }
 
     /**
-     * @param int|\Ratchet\RFC6455\Messaging\Protocol\DataInterface
+     * @param int|\Ratchet\RFC6455\Messaging\DataInterface
      */
     public function close($code = 1000) {
         if ($this->WebSocket->closing) {
diff --git a/src/Ratchet/WebSocket/WsServer.php b/src/Ratchet/WebSocket/WsServer.php
index e9d2e7c..9878495 100644
--- a/src/Ratchet/WebSocket/WsServer.php
+++ b/src/Ratchet/WebSocket/WsServer.php
@@ -38,7 +38,7 @@ class WsServer implements HttpServerInterface {
     private $closeFrameChecker;
 
     /**
-     * @var \Ratchet\RFC6455\Handshake\Negotiator
+     * @var \Ratchet\RFC6455\Handshake\ServerNegotiator
      */
     private $handshakeNegotiator;