added autoUpload options, small fixes
Merge pull request #2 from arius86/master

added autoUpload options, small fixes