Using host name instead of address as ID
Merged with master
Merge pull request #571 from dswd/hostname

Using host name instead of address as ID