Making sure the connection is shutdown cleanly
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
You can specify where to store gui settings now
Added a verbose option for the uploader
Merge remote-tracking branch 'origin/master'