Add hostname option to master