added sudo to certain commands
Merge remote-tracking branch 'upstream/master'
merged from upstream