Updated master
Updated uploader dependencies