added hostname.
Merge branch 'test' into dev