diff --git a/lib/Unirest/HttpMethod.php b/lib/Unirest/HttpMethod.php
index d2352d2..d6b9c99 100644
--- a/lib/Unirest/HttpMethod.php
+++ b/lib/Unirest/HttpMethod.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Unirest;
 class HttpMethod
 {
 	const DELETE = "DELETE";
@@ -6,4 +6,4 @@ class HttpMethod
 	const POST = "POST";
 	const PUT = "PUT";
 	const PATCH = "PATCH";
-}
\ No newline at end of file
+}
diff --git a/lib/Unirest/HttpResponse.php b/lib/Unirest/HttpResponse.php
index 5ca737d..c076b7c 100644
--- a/lib/Unirest/HttpResponse.php
+++ b/lib/Unirest/HttpResponse.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Unirest;
 class HttpResponse
 {	
 	private $code;
@@ -62,13 +62,13 @@ class HttpResponse
 	 */
 	private function get_headers_from_curl_response($headers)
 	{
-		foreach (explode("\r\n", $headers) as $i => $line) {
-			if ($i !== 0) {
-				if (!empty($key) && substr($key, 0, 4) != "HTTP") {
-					$result[$key] = $value;
-				} else {
-					list ($key, $value) = explode(': ', $line);
-				}
+		$headers = explode("\r\n", $headers);
+		array_shift($headers);
+
+		foreach ($headers as $line) {
+			if (strstr($line, ': ')) {
+				list ($key, $value) = explode(': ', $line);
+				$result[$key] = $value;
 			}	
 		}
 
diff --git a/lib/Unirest/Unirest.php b/lib/Unirest/Unirest.php
index 5b12841..4b952b2 100644
--- a/lib/Unirest/Unirest.php
+++ b/lib/Unirest/Unirest.php
@@ -1,4 +1,8 @@
 <?php
+
+use Unirest\HttpMethod;
+use Unirest\HttpResponse;
+
 class Unirest
 {
 	/**