Added option to disable hostname check