Added ability to change to a custom host