new branch
Merge remote-tracking branch 'origin/master'
comments and some code to deal with uploading speed