Removed hard-coded host
Spelling
Not sure how this $SERVICE_NAME worked before at all
Merge branch 'master' into worldmanager