set host, to resolve production error
Merge remote-tracking branch 'despo/master'