descriptors when uploading file added
code cleanup
Merge branches 'descriptors' and 'master'