diff --git a/lib/video.js b/lib/video.js
index 903efdb..f5130b1 100644
--- a/lib/video.js
+++ b/lib/video.js
@@ -59,7 +59,7 @@ module.exports = function (filePath, settings, infoConfiguration, infoFile) {
 	 * Set the output path
 	 */
 	var setOutput = function (path) {
-		output = path;
+		output = utils.addQuotes(path);
 	}
 
 	/*********************/
@@ -551,12 +551,8 @@ module.exports = function (filePath, settings, infoConfiguration, infoFile) {
 		var onlyDestinationFile = folder != undefined ? false : true;
 		// Building the value for return value. Check if the callback is not a function. In this case will created a new instance of the deferred class
 		var deferred = typeof callback != 'function' ? when.defer() : { promise : null };
-        // Deal with input paths that have spaces in them, by quoting them
-		for (i=0; i<inputs.length; i++) {
-		    inputs[i] = '\'' + inputs[i] + '\'';
-		}
 		// Create a copy of the commands list
-		var finalCommands = ['ffmpeg -i']
+		var finalCommands = [ffmpeg.bin, '-i']
 			.concat(inputs.map(utils.addQuotes).join(' -i '))
 			.concat(commands.join(' '))
 			.concat(filtersComlpex.length > 0 ? ['-filter_complex "'].concat(filtersComlpex.join(', ')).join('') + '"' : [])