uploader
fixed problems with optional arguments
new tests...
updated version
Merge remote-tracking branch 'origin/uploader'