diff --git a/lib/filehandler.js b/lib/filehandler.js
index bab6f89..0fad294 100644
--- a/lib/filehandler.js
+++ b/lib/filehandler.js
@@ -16,7 +16,7 @@ module.exports = function (middleware, options) {
                         ? 'application/json'
                         : 'text/plain'
                 });
-                res.json(200, result);
+                res.json(result);
             }
         });
 
diff --git a/lib/uploadhandler.js b/lib/uploadhandler.js
index ece4b55..09f1a5d 100644
--- a/lib/uploadhandler.js
+++ b/lib/uploadhandler.js
@@ -103,11 +103,15 @@ module.exports = function (options) {
 
                                 counter++;
                                 var opts = options.imageVersions[version];
+                                var dstName = fileInfo.name;
+                                if (opts.extension) {
+                                    dstName = path.basename(dstName, path.extname(dstName)) + '.' + opts.extension;
+                                }
                                 imageMagick.resize({
                                     width: opts.width,
                                     height: opts.height,
                                     srcPath: options.uploadDir() + '/' + fileInfo.name,
-                                    dstPath: options.uploadDir() + '/' + version + '/' + fileInfo.name,
+                                    dstPath: options.uploadDir() + '/' + version + '/' + dstName,
                                     customArgs: opts.imageArgs || ['-auto-orient']
                                 }, finish);
                             });