new uploader
Merge pull request #1 from krisrybak/newUploader

new uploader