Put back sudo
Merge branch 'develop' into working