hostname in progress
Merge pull request #30 from alanandrade/master

hostname in progress