Merge pull request #55 from galstrom21/master

almost there with the hostnames