Merge pull request #1 from apardo/master

fix hostname
Merge pull request #2 from apardo/master

fix host
already taken