diff --git a/.gitignore b/.gitignore
index ff72e2d..d222476 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /composer.lock
 /vendor
+/*.phar
diff --git a/bin/pharlite b/bin/pharlite
index 404ba8a..53299b9 100755
--- a/bin/pharlite
+++ b/bin/pharlite
@@ -1,7 +1,12 @@
 #!/usr/bin/env php
 <?php
 
-require_once __DIR__."/../vendor/autoload.php";
+if (file_exists(__DIR__."/../vendor"))
+  require_once __DIR__."/../vendor/autoload.php";
+elseif (file_exists(__DIR__."/../../../vendor"))
+  require_once __DIR__."/../../../vendor/autoload.php";
+else
+  die("Could not locate composer vendor/autoload.php");
 
 define("PHARLITE_VERSION", "0.1.x");
 
@@ -80,4 +85,4 @@ if (false === parse_opts()) {
 $path = getcwd();
 
 $builder = new PharLite\Builder($path, $opts);
-$builder->build();
\ No newline at end of file
+$builder->build();
diff --git a/src/Builder.php b/src/Builder.php
index e957317..5d44103 100644
--- a/src/Builder.php
+++ b/src/Builder.php
@@ -150,6 +150,9 @@ class Builder
                 $phar->addFromString($bin, $str);
             }
         } else {
+            if (count($bins)) {
+                $index = array_shift($bins);
+            }
             $indexFile = file_get_contents($index);
             $indexFile = $this->stripShebang($indexFile);
             $index = "bootstrap.php";