Merge pull request #179 from viru-tech/set-host

Merge pull request #179 from viru-tech/set-host #441