Fix fqdn setting issues
Merge pull request #47 from cikl/fix_hostname

Fix fqdn setting issues