Hostname and number fix
Merge branch 'hotfix/hostname'