Merge pull request #1 from seznam/uploader

Uploader
a few simplifications and one bugfix (bug with hardcoded input name)
Merge pull request #70 from ethanius/uploader

Uploader