added hoster
fixed merge