diff --git a/src/Connection/HttpRequest.php b/src/Connection/HttpRequest.php
index 01176c8..ce2f13b 100644
--- a/src/Connection/HttpRequest.php
+++ b/src/Connection/HttpRequest.php
@@ -99,18 +99,9 @@ class Connection_HttpRequest
     static function getJSON($url, $data) {
         $query = http_build_query($data);
         $q = $url . '?' . $query;
-        /*$c = new Connection_HttpRequest();
-        $c->http_version = "HTTP/1.0";
 
-
-        $c->setUrl($q);
-        $page = $c->getPage();
-
-        $response = new Connection_HttpResponse($page);
-        $data = $response->getData();
-        */
-        $data = file_get_contents($q);
-        return json_decode((string) preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/', '', $data), true);
+        $content = File::getContents($q);
+        return json_decode((string) preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/', '', $content), true);
     }
 }
 
diff --git a/src/Setup.php b/src/Setup.php
index 61de243..52a5a0f 100644
--- a/src/Setup.php
+++ b/src/Setup.php
@@ -17,7 +17,9 @@ class Setup
     protected $stack = array();
     
     public $zip;
+
     public $target;
+    public $source;
 
     public function __construct($file)
     {
@@ -25,6 +27,7 @@ class Setup
         $this->node = simplexml_load_file($file);
 
         $this->target = '';
+        $this->source = '';
         $this->zip = new ZipArchive();
         $this->zip->open(strtr($file, array('.xml' => '.zip')));