Merge pull request #54 from galstrom21/master

using builtin hostname_for_host()
almost there with the hostnames