Add function to change hostname
Merge branch 'master' into work-env