Merging multithreaded-upload-devel into master (solves #4)