diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
index d7bb62d3..d88a5562 100644
--- a/app/controllers/dmsf_upload_controller.rb
+++ b/app/controllers/dmsf_upload_controller.rb
@@ -26,7 +26,7 @@ class DmsfUploadController < ApplicationController
   
   before_filter :find_project
   before_filter :authorize
-  before_filter :find_folder, :except => [:upload_file, :upload]
+  before_filter :find_folder, :except => [:upload_file, :upload, :commit]
   
   helper :all
   helper :dmsf_workflows
@@ -118,9 +118,11 @@ class DmsfUploadController < ApplicationController
   
   # REST API file commit
   def commit
-    uploaded_files = params[:attachments]    
-    if uploaded_files && uploaded_files.is_a?(Hash)
+    attachments = params[:attachments]    
+    if attachments && attachments.is_a?(Hash)
+      @folder = DmsfFolder.visible.find_by_id attachments[:folder_id].to_i if attachments[:folder_id].present?
       # standard file input uploads
+      uploaded_files = attachments.select { |key, value| key == 'uploaded_file'}
       uploaded_files.each_value do |uploaded_file|        
         upload = DmsfUpload.create_from_uploaded_attachment(@project, @folder, uploaded_file)
         uploaded_file[:disk_filename] = upload.disk_filename
@@ -133,7 +135,7 @@ class DmsfUploadController < ApplicationController
   
   def commit_files_internal(commited_files)
     if commited_files && commited_files.is_a?(Hash)
-      files = []
+      @files = []
       failed_uploads = []
       commited_files.each_value do |commited_file|
         name = commited_file[:name]
@@ -216,18 +218,18 @@ class DmsfUploadController < ApplicationController
           new_revision.assign_workflow(commited_file[:dmsf_workflow_id])                              
           FileUtils.mv(commited_disk_filepath, new_revision.disk_file)
           file.set_last_revision new_revision
-          files.push(file)
+          @files.push(file)
         else
           failed_uploads.push(commited_file)
         end
       end
-      unless files.empty?        
-        files.each { |file| log_activity(file, 'uploaded') if file }        
+      unless @files.empty?        
+        @files.each { |file| log_activity(file, 'uploaded') if file }        
         if (@folder && @folder.notification?) || (!@folder && @project.dmsf_notification?)
           begin
-            recipients = DmsfMailer.get_notify_users(@project, files)
+            recipients = DmsfMailer.get_notify_users(@project, @files)
             recipients.each do |u|
-              DmsfMailer.files_updated(u, @project, files).deliver
+              DmsfMailer.files_updated(u, @project, @files).deliver
             end          
             if Setting.plugin_redmine_dmsf[:dmsf_display_notified_recipients] == '1'
               unless recipients.empty?
@@ -247,7 +249,9 @@ class DmsfUploadController < ApplicationController
     end
     respond_to do |format|
       format.js
-      format.api  { render_validation_errors(failed_uploads) }
+      format.api  {         
+          render_validation_errors(failed_uploads) unless failed_uploads.empty?        
+      }
       format.html { redirect_to dmsf_folder_path(:id => @project, :folder_id => @folder) }
     end
     
diff --git a/app/views/dmsf_upload/commit.api.rsb b/app/views/dmsf_upload/commit.api.rsb
new file mode 100644
index 00000000..e5e85426
--- /dev/null
+++ b/app/views/dmsf_upload/commit.api.rsb
@@ -0,0 +1,8 @@
+api.array :dmsf_files, api_meta(:total_count => @files.size) do
+  @files.each do |file|
+    api.file do
+      api.id file.id
+      api.name file.name      
+    end
+  end
+end
\ No newline at end of file
diff --git a/extra/api/file.xml b/extra/api/file.xml
index 289c3586..f1c19385 100644
--- a/extra/api/file.xml
+++ b/extra/api/file.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <attachments>
+  <folder_id>6118</folder_id>
   <uploaded_file>
     <disk_filename>cat.gif</disk_filename>
     <name>cat.gif</name>
@@ -7,6 +8,6 @@
     <description>REST API</description>
     <comment>From API</comment>
     <version/>
-    <token>15843.c49f68ff81b552d315927df2e27df506</token>
+    <token>15838.c49f68ff81b552d315927df2e27df506</token>
   </uploaded_file>
 </attachments>