Added suport for hostnames
Format, license headers