Added option for hostname handling