Improve hostname/IP Handling
Mentioned in
#8 (closed)