add hostname
Merge branch 'develop'