diff --git a/.travis.yml b/.travis.yml
index 5625a26..7604e9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 
 before_script:
   - curl -s http://getcomposer.org/installer | php
diff --git a/README.md b/README.md
index 8de8cc1..a9cefad 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Build up your application through simple interfaces and re-use your application
 ##WebSocket Compliance
 
 * Supports the RFC6455, HyBi-10+, and Hixie76 protocol versions (at the same time)
-* Tested on Chrome 13 - 27, Firefox 6 - 21, Safari 5.0.1 - 6, iOS 4.2 - 6
+* Tested on Chrome 13 - 28, Firefox 6 - 22, Safari 5.0.1 - 6, iOS 4.2 - 7
 * Ratchet [passes](http://socketo.me/reports/ab/) the [Autobahn Testsuite](http://autobahn.ws/testsuite) (non-binary messages)
 
 ##Requirements
diff --git a/src/Ratchet/Http/HttpServer.php b/src/Ratchet/Http/HttpServer.php
index 5788807..f1b8f69 100644
--- a/src/Ratchet/Http/HttpServer.php
+++ b/src/Ratchet/Http/HttpServer.php
@@ -4,9 +4,6 @@ use Ratchet\MessageComponentInterface;
 use Ratchet\ConnectionInterface;
 use Guzzle\Http\Message\Response;
 
-/**
- * @todo Detect HTTP proxy header IP, re-map remoteAddress
- */
 class HttpServer implements MessageComponentInterface {
     /**
      * Buffers incoming HTTP requests returning a Guzzle Request when coalesced