Updated isSameHost method to match by host and host:port
Merge branch '45-sameHost'