add another host
merge with heroku version
merge