cleanup
Moved parallell http setting to correct tab
Merge remote-tracking branch 'origin/master'