Added regexp to hostname recognition