diff --git a/bin/generate.js b/bin/generate.js
deleted file mode 100644
index e69de29..0000000
diff --git a/bin/thumbsup.js b/bin/thumbsup.js
new file mode 100755
index 0000000..88e183b
--- /dev/null
+++ b/bin/thumbsup.js
@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+
+var program = require('commander');
+var index = require('../src/index');
+
+program
+  .version('0.0.1')
+  .option('-i, --input [path]', 'Path to the folder with all photos/videos')
+  .option('-o, --output [path]', 'Output path for the static website')
+  .option('-p, --media-prefix [url]', 'URL prefix for all media')
+  .option('-s, --size [pixels]', 'Thumbnail size in pixels (square)', '100')
+  .parse(process.argv);
+
+index.build({
+  input: program.input,
+  output: program.output,
+  mediaPrefix: program.prefix,
+  size: program.size
+});
diff --git a/package.json b/package.json
index af13116..92f6b2e 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "example": "node example/build.js"
   },
   "bin": {
-    "static-gallery": "./bin/generate.js"
+    "thumbsup": "./bin/thumbsup.js"
   },
   "dependencies": {
     "gulp": "~3.6.0",
@@ -31,6 +31,7 @@
     "fs-extra": "~0.8.1",
     "gulp-rename": "~1.2.0",
     "exec-sync": "~0.1.6",
-    "gm": "~1.14.2"
+    "gm": "~1.14.2",
+    "commander": "~2.2.0"
   }
 }
diff --git a/src/index.js b/src/index.js
index 99c6c57..d141c2c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -68,7 +68,7 @@ exports.build = function(opts) {
   gulp.task('public', function() {
     var dest = opts.output + '/public';
     gulp
-    .src('public/**')
+    .src(path.join(__dirname, '..', 'public', '**'))
     .pipe(newer(dest))
     .pipe(gulp.dest(dest));
   });
diff --git a/src/render.js b/src/render.js
index 06844ea..7be79c8 100644
--- a/src/render.js
+++ b/src/render.js
@@ -3,7 +3,7 @@ var path        = require('path');
 var handlebars  = require('handlebars');
 
 function compileTemplate(hbsFile) {
-  var src = fs.readFileSync(path.join('templates', hbsFile));
+  var src = fs.readFileSync(path.join(__dirname, '..', 'templates', hbsFile));
   return handlebars.compile(src.toString());
 }