Merge pull request #15 from 'fix-hostname-display'