Commit on 25-09-2014 with file upload testing