diff --git a/lib/wraith.js b/lib/wraith.js
index 64e82d2..7faa5cb 100644
--- a/lib/wraith.js
+++ b/lib/wraith.js
@@ -51,6 +51,7 @@ Wraith.prototype.config = function(config) {
 	self.sizes          = [];
 	self.dirs           = [];
 	self.quiet          = config.quiet || false;
+	self.gallery        = config.hasOwnProperty('gallery') ? config.gallery : true;
 	self.server         = {};
 	self.server.start   = config.server.start || false;
 	self.server.port    = config.server.port || 9090;
@@ -239,6 +240,7 @@ Wraith.prototype.compareScreenshots = function() {
 	}
 
 	self.compareQueue = [];
+	self.maxMismatch = 0;
 
 	for(var url in self.urls) {
 		var dir = self.urls[url].substring(1).replace(/\/+$/,'') + '/';
@@ -277,6 +279,7 @@ Wraith.prototype.compareScreenshots = function() {
 	async.eachLimit(self.compareQueue, self.maxConnections, function(task, callback) {
 		resemble('./' + task.base).compareTo('./' + task.compare).ignoreAntialiasing().onComplete(function(data) {
 			data.getDiffImage().pack().pipe(fs.createWriteStream(task.output));
+			self.maxMismatch = data.misMatchPercentage > self.maxMismatch ? data.misMatchPercentage : self.maxMismatch;
 			fs.writeFile('./' + task.diff, data.misMatchPercentage, function(err) {
 				if(err) { log.error(err); }
 				if(bar) {
@@ -293,7 +296,13 @@ Wraith.prototype.compareScreenshots = function() {
 			return self;
 		} else {
 			log.success('Image comparison done');
-			self.generateGallery();
+			if (self.gallery || self.server.start) {
+				self.generateGallery();
+			} else {
+				helpers.emptyFolder(self.outputFolder, function() {
+					self.cb(self.maxMismatch);
+				});
+			}
 			return self;
 		}
 	});