diff --git a/.gitattributes b/.gitattributes
index 176a458f..484960de 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,9 @@
 * text=auto
+/build/ export-ignore
+/tests/ export-ignore
+/travis/ export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/CHANGELOG.md export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b03dc7..06134ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.0.0 - 2015-08-04
+
+- Classes were renamed and namespaced ([#243](https://github.com/phpseclib/phpseclib/issues/243))
+- The use of an autoloader is now required (e.g. Composer)
+
 ## 1.0.0 - 2015-08-02
 
 - OpenSSL support for symmetric ciphers ([#507](https://github.com/phpseclib/phpseclib/pull/507))
@@ -102,4 +107,4 @@
 = add support for AES-128-CBC and DES-EDE3-CFB encrypted RSA private keys
 - add Net_SFTP::stat(), Net_SFTP::lstat() and Net_SFTP::rawlist()
 - logging was added to Net_SSH1
-- the license was changed to the less restrictive MIT license
\ No newline at end of file
+- the license was changed to the less restrictive MIT license
diff --git a/phpseclib/System/SSH/Agent.php b/phpseclib/System/SSH/Agent.php
index 17b52ad8..54f09545 100644
--- a/phpseclib/System/SSH/Agent.php
+++ b/phpseclib/System/SSH/Agent.php
@@ -172,7 +172,9 @@ class Agent
             $length = current(unpack('N', fread($this->fsock, 4)));
             $key_blob = fread($this->fsock, $length);
             $length = current(unpack('N', fread($this->fsock, 4)));
-            $key_comment = fread($this->fsock, $length);
+            if ($length) {
+                $key_comment = fread($this->fsock, $length);
+            }
             $length = current(unpack('N', substr($key_blob, 0, 4)));
             $key_type = substr($key_blob, 4, $length);
             switch ($key_type) {