Added ability to add a subdirectory as local path
Merge branch 'shredding-autoupload/master'