optional hostname
Merge pull request #1 from c-castillo/master

update from original