fixes
Merge branch 'master' of github.com:mrtopf/sf-uploader