diff --git a/phpQuery/phpQuery/DOMDocumentWrapper.php b/phpQuery/phpQuery/DOMDocumentWrapper.php
index 47ce35c..10e5fe5 100644
--- a/phpQuery/phpQuery/DOMDocumentWrapper.php
+++ b/phpQuery/phpQuery/DOMDocumentWrapper.php
@@ -164,7 +164,7 @@ protected function loadMarkupHTML($markup, $requestedCharset = null) {
 			// Document Encoding Conversion
 			// http://code.google.com/p/phpquery/issues/detail?id=86
 			if (function_exists('mb_detect_encoding')) {
-				$possibleCharsets = array($documentCharset, $requestedCharset, 'AUTO');
+				$possibleCharsets = array($requestedCharset, $documentCharset, 'AUTO');
 				$docEncoding = mb_detect_encoding($markup, implode(', ', $possibleCharsets));
 				if (! $docEncoding)
 					$docEncoding = $documentCharset; // ok trust the document
@@ -194,9 +194,25 @@ protected function loadMarkupHTML($markup, $requestedCharset = null) {
 			}
 			phpQuery::debug("Full markup load (HTML), documentCreate('$charset')");
 			$this->documentCreate($charset);
+			if ($charset === 'utf-8') {
+				// Hack to load HTML as UTF-8
+				$markup = '<?xml encoding="UTF-8">' . $markup;
+			}
 			$return = phpQuery::$debug === 2
 				? $this->document->loadHTML($markup)
 				: @$this->document->loadHTML($markup);
+			if ($charset === 'utf-8') {
+				// Remove hack
+				foreach ($this->document->childNodes as $item) {
+					if ($item->nodeType == XML_PI_NODE) {
+						// remove hack
+						$this->document->removeChild($item);
+					}
+				}
+				// insert proper
+				$this->document->encoding = 'UTF-8';
+				// End hack
+			}
 			if ($return)
 				$this->root = $this->document;
 		}
diff --git a/phpQuery/phpQuery/Zend/Json/Decoder.php b/phpQuery/phpQuery/Zend/Json/Decoder.php
index b9bf8ba..c5f1f25 100644
--- a/phpQuery/phpQuery/Zend/Json/Decoder.php
+++ b/phpQuery/phpQuery/Zend/Json/Decoder.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * @see Zend_Json
+ * @see Zend_Json
  */
 require_once 'Zend/Json.php';
 
diff --git a/test-cases/run.php b/test-cases/run.php
index 240fdea..eb33fa0 100644
--- a/test-cases/run.php
+++ b/test-cases/run.php
@@ -1,11 +1,11 @@
-<?php
+<?php
 // TODO move them into directory
-include 'test_1.php';
-include 'test_2.php';
+include 'test_1.php';
+include 'test_2.php';
 include 'test_3.php';
 include 'test_4.php';
 include 'test_5.php';
 include 'test_wrap.php';
 include 'test_replace.php';
-include 'test_multidoc.php';
+include 'test_multidoc.php';
 ?>
\ No newline at end of file
diff --git a/test-cases/test_2.php b/test-cases/test_2.php
index 4b82993..f1e2ec4 100644
--- a/test-cases/test_2.php
+++ b/test-cases/test_2.php
@@ -1,20 +1,20 @@
 <?php
-require_once('../phpQuery/phpQuery.php');
+require_once('../phpQuery/phpQuery.php');
 phpQuery::$debug = true;
 
-
-$testName = 'Filter with pseudoclass';
+
+$testName = 'Filter with pseudoclass';
 $testResult = array(
 	'p.body',
-);
-$result = phpQuery::newDocumentFile('test.html');
-$result = $result->find('p')
-	->filter('.body:gt(1)');
-if ( $result->whois() == $testResult )
-	print "Test '{$testName}' PASSED :)";
-else
+);
+$result = phpQuery::newDocumentFile('test.html');
+$result = $result->find('p')
+	->filter('.body:gt(1)');
+if ( $result->whois() == $testResult )
+	print "Test '{$testName}' PASSED :)";
+else
 	print "Test '{$testName}' <strong>FAILED</strong> !!! ";
-print_r($result->whois());
+print_r($result->whois());
 print "\n";
 
 
diff --git a/test-cases/test_document.php b/test-cases/test_document.php
index 24c2cc5..901b902 100644
--- a/test-cases/test_document.php
+++ b/test-cases/test_document.php
@@ -1,6 +1,6 @@
 <?php
 //error_reporting(E_ALL);
-require_once('../phpQuery/phpQuery.php');
+require_once('../phpQuery/phpQuery.php');
 phpQuery::$debug = true;
 
 
@@ -8,13 +8,13 @@
 $doc = phpQuery::newDocumentFile('test.html');
 print $doc->find('li:first')->html('foo <p>bar</p> foo <b><i>foo</i</b>')->html();
 die();
-$testResult = 10;
-if ($doc->script('example', 'p')->length == $testResult)
-	print "Test '$testName' PASSED :)";
-else {
+$testResult = 10;
+if ($doc->script('example', 'p')->length == $testResult)
+	print "Test '$testName' PASSED :)";
+else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
-	var_dump($doc->whois());
+	var_dump($doc->whois());
 	print "</pre>\n";
 }
 print "\n";
\ No newline at end of file
diff --git a/test-cases/test_scripts.php b/test-cases/test_scripts.php
index 490e309..c87c9c7 100644
--- a/test-cases/test_scripts.php
+++ b/test-cases/test_scripts.php
@@ -1,19 +1,19 @@
 <?php
 //error_reporting(E_ALL);
-require_once('../phpQuery/phpQuery.php');
+require_once('../phpQuery/phpQuery.php');
 phpQuery::$debug = true;
 phpQuery::plugin('Scripts');
 
 
 $testName = 'Scripts/example';
 $doc = phpQuery::newDocumentFile('test.html');
-$testResult = 10;
-if ($doc->script('example', 'p')->length == $testResult)
-	print "Test '$testName' PASSED :)";
-else {
+$testResult = 10;
+if ($doc->script('example', 'p')->length == $testResult)
+	print "Test '$testName' PASSED :)";
+else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
-	var_dump($doc->whois());
+	var_dump($doc->whois());
 	print "</pre>\n";
 }
 print "\n";
@@ -34,5 +34,5 @@
 	var_dump($doc->whois());
 	print "</pre>\n";
 }
-print "\n";
+print "\n";
 ?>
\ No newline at end of file
diff --git a/test-cases/test_selectors.php b/test-cases/test_selectors.php
index 2332d1a..1aad964 100644
--- a/test-cases/test_selectors.php
+++ b/test-cases/test_selectors.php
@@ -1,91 +1,91 @@
 <?php
-require_once('../phpQuery/phpQuery.php');
-phpQuery::$debug = true;
-$testName = 'Selectors';
-$tests = array(
-	array(
-		'div:first',
-		array(
-			'div.articles',
-		)
-	),
-	array(
-		"p:contains('title')",
-		array(
-			'p.title',
-			'p.title',
-			'p.noTitle',
-		)
-	),
-	array(
-		"p:contains('title 2')",
-		array(
-			'p.title',
-		)
-	),
-	array(
-		'li:eq(1)',
-		array(
-			'li#testID',
-		)
-	),
-	array(
-		'li:eq(1) p:eq(1)',
-		array(
-			'p.title',
-		)
-	),
-	array(
-		'*[rel="test"]',
-		array(
-			'p',
-			'p'
-		)
-	),
-	array(
-		'#testID p:first',
-		array(
-			'p'
-		)
-	),
-	array(
-		"p:not('.title'):not('.body')",
-		array(
-			'p',
-			'p',
-			'p',
-			'p.noTitle',
-			'p.after',
-		)
-	),
-	array(
-		"[content*=html]",
-		array(
-			'meta'
-		)
-	),
-	array(
-		"li#testID, div.articles",
-		array(
-			'li#testID',
-			'div.articles'
-		)
-	),
-	array(
-		"script[src]:not([src^=<?php])",
-		array(
-			'script'
-		)
-	),
-//	array(
-//		'li:not([ul/li])',
-//		array(
-//			'li',
-//			'li#testID',
-//			'li',
-//			'li.nested',
-//			'li.second',
-//		)
+require_once('../phpQuery/phpQuery.php');
+phpQuery::$debug = true;
+$testName = 'Selectors';
+$tests = array(
+	array(
+		'div:first',
+		array(
+			'div.articles',
+		)
+	),
+	array(
+		"p:contains('title')",
+		array(
+			'p.title',
+			'p.title',
+			'p.noTitle',
+		)
+	),
+	array(
+		"p:contains('title 2')",
+		array(
+			'p.title',
+		)
+	),
+	array(
+		'li:eq(1)',
+		array(
+			'li#testID',
+		)
+	),
+	array(
+		'li:eq(1) p:eq(1)',
+		array(
+			'p.title',
+		)
+	),
+	array(
+		'*[rel="test"]',
+		array(
+			'p',
+			'p'
+		)
+	),
+	array(
+		'#testID p:first',
+		array(
+			'p'
+		)
+	),
+	array(
+		"p:not('.title'):not('.body')",
+		array(
+			'p',
+			'p',
+			'p',
+			'p.noTitle',
+			'p.after',
+		)
+	),
+	array(
+		"[content*=html]",
+		array(
+			'meta'
+		)
+	),
+	array(
+		"li#testID, div.articles",
+		array(
+			'li#testID',
+			'div.articles'
+		)
+	),
+	array(
+		"script[src]:not([src^=<?php])",
+		array(
+			'script'
+		)
+	),
+//	array(
+//		'li:not([ul/li])',
+//		array(
+//			'li',
+//			'li#testID',
+//			'li',
+//			'li.nested',
+//			'li.second',
+//		)
 //	),
 	array(
 		'li:has(ul)',
@@ -270,21 +270,21 @@
 //		array(
 //			'',
 //		)
-//	),
-);
-
-phpQuery::newDocumentFile('test.html');
-foreach( $tests as $k => $test ) {
-	$tests[ $k ][2] = pq( $test[0] )->whois();
-}
-foreach( $tests as $test ) {
-	if ( $test[1] == $test[2] )
-		print "Test '{$test[0]}' PASSED :)";
-	else {
-		print "Test '{$test[0]}' <strong>FAILED</strong> !!!";
-		print_r($test[2]);
-	}
-	print "<br /><br />";
+//	),
+);
+
+phpQuery::newDocumentFile('test.html');
+foreach( $tests as $k => $test ) {
+	$tests[ $k ][2] = pq( $test[0] )->whois();
+}
+foreach( $tests as $test ) {
+	if ( $test[1] == $test[2] )
+		print "Test '{$test[0]}' PASSED :)";
+	else {
+		print "Test '{$test[0]}' <strong>FAILED</strong> !!!";
+		print_r($test[2]);
+	}
+	print "<br /><br />";
 }
 
 //
@@ -298,5 +298,5 @@
 else
 	print "Test '{$testName}' <strong>FAILED</strong> !!! ";
 $result->dump();
-print "\n";
+print "\n";
 ?>
\ No newline at end of file