Added support for host other than localhost