Merge branch 'r1'
Merge branch 'r1'
Update sudo method
Merge branch 'conky'